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

[Jay R. Wren]

[lp:~evarlast/serverguide/postgresql91]

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

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

[Jeremy Bicha (jbicha)]

Thanks you for helping to make the docs better!

review: Approve

=== modified file 'serverguide/C/databases.xml'
--- serverguide/C/databases.xml	2012-04-06 20:16:46 +0000
+++ serverguide/C/databases.xml	2012-07-25 17:37:19 +0000
@@ -324,25 +324,25 @@
             <para>By default, connection via TCP/IP is disabled.
             PostgreSQL supports multiple client authentication methods.
             IDENT authentication method is used for <application>postgres</application> and local users, unless otherwise configured.  
-	    Please refer <ulink url="http://www.postgresql.org/docs/8.4/static/admin.html">
+	    Please refer <ulink url="http://www.postgresql.org/docs/9.1/static/admin.html">
 	    the PostgreSQL Administrator's Guide if you would like to configure alternatives like Kerberos</ulink>.
 	    </para>
             <para>The following discussion assumes that you wish to enable 
             TCP/IP connections and use the MD5 method for client 
             authentication. PostgreSQL configuration files are stored in the
             <filename>/etc/postgresql/&lt;version&gt;/main</filename>
-            directory. For example, if you install PostgreSQL 8.4, the
+            directory. For example, if you install PostgreSQL 9.1, the
             configuration files are stored in the
-            <filename>/etc/postgresql/8.4/main</filename> directory.
+            <filename>/etc/postgresql/9.1/main</filename> directory.
             </para>
             <tip>
             <para>
              To configure <emphasis>ident</emphasis>
-             authentication, add entries to the <filename>/etc/postgresql/8.4/main/pg_ident.conf</filename>
+             authentication, add entries to the <filename>/etc/postgresql/9.1/main/pg_ident.conf</filename>
              file.  There are detailed comments in the file to guide you.
             </para>
             </tip>
-            <para>To enable TCP/IP connections, edit the file <filename>/etc/postgresql/8.4/main/postgresql.conf</filename></para>
+            <para>To enable TCP/IP connections, edit the file <filename>/etc/postgresql/9.1/main/postgresql.conf</filename></para>
             <para>
 	    Locate the line <emphasis>#listen_addresses = 'localhost'</emphasis> and change it to:
 	    </para>
@@ -381,7 +381,7 @@
 </screen>
             <para>
 	    After configuring the password, edit the file
-            <filename>/etc/postgresql/8.4/main/pg_hba.conf</filename> to use
+            <filename>/etc/postgresql/9.1/main/pg_hba.conf</filename> to use
             <emphasis>MD5</emphasis> authentication with the <emphasis>postgres</emphasis> user:
             </para>
 
@@ -395,12 +395,12 @@
 	    restart <application>PostgreSQL</application>:
             </para>
 <screen>
-<command>sudo /etc/init.d/postgresql-8.4 restart</command>
+<command>sudo service postgresql restart</command>
 </screen>
             <warning>
             <para>
              The above configuration is not complete by any means. Please
-             refer <ulink url="http://www.postgresql.org/docs/8.4/static/admin.html">
+             refer <ulink url="http://www.postgresql.org/docs/9.1/static/admin.html">
 			 the PostgreSQL Administrator's Guide</ulink> to configure more parameters.
             </para>
             </warning>
@@ -410,15 +410,15 @@
           <itemizedlist>
 	    <listitem>
               <para>
-  	      As mentioned above the <ulink url="http://www.postgresql.org/docs/8.4/static/admin.html">Administrator's Guide</ulink>
-	      is an excellent resource.  The guide is also available in the <application>postgresql-doc-8.4</application> package.
+  	      As mentioned above the <ulink url="http://www.postgresql.org/docs/9.1/static/admin.html">Administrator's Guide</ulink>
+	      is an excellent resource.  The guide is also available in the <application>postgresql-doc-9.1</application> package.
 	      Execute the following in a terminal to install the package:
               </para>
 <screen>
-<command>sudo apt-get install postgresql-doc-8.4</command>
+<command>sudo apt-get install postgresql-doc-9.1</command>
 </screen>
               <para>
-	      To view the guide enter <command>file:///usr/share/doc/postgresql-doc-8.4/html/index.html</command> into the address
+	      To view the guide enter <command>file:///usr/share/doc/postgresql-doc-9.1/html/index.html</command> into the address
 	      bar of your browser. 
               </para>
 	    </listitem>

=== 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 17:37:19 +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: