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

Proposed by Jay R. Wren
Status: Merged
Merged at revision: 83
Proposed branch: lp:~evarlast/serverguide/typo
Merge into: lp:~ubuntu-core-doc/serverguide/quantal
Diff against target: 12 lines (+1/-1)
1 file modified
serverguide/C/web-servers.xml (+1/-1)
To merge this branch: bzr merge lp:~evarlast/serverguide/typo
Reviewer Review Type Date Requested Status
Jeremy Bicha Approve
Review via email: mp+116660@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~evarlast/serverguide/typo updated
84. By Jay R. Wren

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

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

86. By Jay R. Wren

add WordPress section to LAMP Applications.

Revision history for this message
Jeremy Bicha (jbicha) wrote :

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

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches