Merge lp:~evarlast/serverguide/typo into lp:~ubuntu-core-doc/serverguide/quantal

[Jay R. Wren]

its just a typo. The squid page says 192.168.42.0/42 instead of 192.168.42.0/24

[lp:~evarlast/serverguide/typo]

84. By Jay R. Wren on 2012-07-25

update postgresql 8.4 docs to 9.1. I also changed the restart command from /etc/init.d/postgresql to service postgresql restart

85. By Jay R. Wren on 2012-07-25

i missed a few 8.4 to 9.1 changes in the doc section. oops.

86. By Jay R. Wren on 2012-07-27

add WordPress section to LAMP Applications.

[Jeremy Bícha (jbicha)]

This looks great. Thanks for contributing! Sorry we didn't see this merge proposal sooner.

review: Approve

=== modified file 'serverguide/C/web-servers.xml'
--- serverguide/C/web-servers.xml	2012-04-06 20:16:46 +0000
+++ serverguide/C/web-servers.xml	2012-07-25 14:29:02 +0000
@@ -904,7 +904,7 @@
                   <para>
                      Using the excellent access control features of Squid, you may configure use of Internet services proxied by Squid
                      to be available only during normal business hours.  For example, we'll illustrate access by employees of a business
-                     which is operating between 9:00AM and 5:00PM, Monday through Friday, and which uses the 10.1.42.0/42 subnetwork:
+                     which is operating between 9:00AM and 5:00PM, Monday through Friday, and which uses the 10.1.42.0/24 subnetwork:
                   </para>
                   <para>
                      Add the following to the <emphasis role="bold">bottom</emphasis> of the ACL section of your <filename>/etc/squid/squid.conf</filename> file: