serverguide: errors in the web-servers document

[Gabor Kelemen]

Binary package hint: ubuntu-docs

I found the following problematic string in the web-servers document:

https://help.ubuntu.com/9.04/serverguide/C/httpd.html
#: serverguide/C/web-servers.xml:63(para)
The configuration files are separated between the
following files and directories:

I'm not sure, how one can separate "configuration files" between *files* and directories. Is this string ok, or it should say "configuration directives"?

#: serverguide/C/web-servers.xml:77(para)
<emphasis>conf.d:</emphasis> contains configuration files which apply <emphasis>globally</emphasis> to Apache. Other packages that use Apache2 to serve content may add files, or symlinks, to this directory.

Is it ok to call it one time Apache, another time Apache2? In the php5 document, it is even called "Apache 2". There are several occurrences of this inconsistency... I don't think it's necessary to emphasize that it is the second generation (why not Apache2.2 then? :P) of the software, but I'm certainly not a web guru, so I might be wrong here.

#: serverguide/C/web-servers.xml:119(para)
<emphasis>sites-enabled:</emphasis> like mods-enabled, <filename role=\"directory\">sites-enabled</filename> contains symlinks to the <filename>/
etc/apache2/sites-available</filename> directory. Similarly when a configuration file in sites-available is symlinked it will be active once Apache is restarted.

Perhaps it would be clearer, if this would say:
Similarly when a configuration file in sites-available is symlinked, the site configured by it will be active once Apache is restarted.

#: serverguide/C/web-servers.xml:311(para)
The default value, found in <filename>/etc/apache2/
apache2.conf</filename> is \" index.html index.cgi index.pl index.php index.xhtml\".

This is no longer true, on Jaunty and on Karmic, I see this:
$ grep -r DirectoryIndex /etc/apache2/
/etc/apache2/mods-available/dir.conf: DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm
/etc/apache2/mods-enabled/dir.conf: DirectoryIndex index.html index.cgi index.pl index.php index.xhtml index.htm

#: serverguide/C/web-servers.xml:311(para)
If it does not find any of these files and if Options Indexes is set for that directory, the server will generate and return a list, in HTML format, of the subdirectories and files in the directory.

The "Options Indexes" part should be emphasized, as these are directive names.

https://help.ubuntu.com/9.04/serverguide/C/squid.html
#: serverguide/C/web-servers.xml:855(para)
Again, Using Squid's access control, you may configure use of Internet
services proxied by Squid to be available only users with certain Internet
Protocol (IP) addresses. For example, we will illustrate access by users of
the 192.168.42.0/24 subnetwork only:

The Again word is not necessary, as this is the first time in this document, when we do something awesome with Squid's access control :).

[Connor Imes (ckimes)]

Thanks for your report, Gabor, these adjustments have been committed to the Lucid dev branch, rev 413.

[Launchpad Janitor (janitor)]

This bug was fixed in the package ubuntu-docs - 10.04.1

---------------
ubuntu-docs (10.04.1) lucid; urgency=low

  * First upload for lucid
  * General:
    - Refresh pot files
    - Changed 'Text Editor' to 'gedit Text Editor' LP: #442417 (Connor Imes)
  * Advanced-topics:
    - Added link in advanced-topics to a description about Users and Groups in
      Debian systems. LP: #145055 (Connor Imes)
  * Hardware:
    - Added mention of ext4 to hardware.xml and changed the mentioning of the
      default filesystem in Ubuntu from ext3 to ext4 LP #449667 (Connor Imes)
    - Removed subsection in hardware about quirk-checker script - link was
      broken, script is outdated LP: #461158 (Connor Imes)
  * Keeping-safe:
    - Updating instructions for automatic login for new GDM LP: #442676
     (Dean Sas)
    - String adjustment (period inside of a quote tag), Scott Shields,
      LP: #496885
  * Internet:
    - Changes remaining mention of flashplugin-nonfree to flashplugin-installer
      in web-apps.xml LP: #444546 (Connor Imes)
    - Change some <guimenu> tags to <guimenuitem> tags in web-apps.xml to show
      arrows in HTML documentation instead of + signs LP: #453512 (Connor Imes)
    - Removed reference to network-manager radio buttons, as radio buttons
      aren't used in this version of NM for wired networks (Jim Campbell)
    - Aligned similar strings in 'internet' section to benefit translators;
      some small adjustments. LP: #460360 (Connor Imes)
  * Musicvideophotos:
    - Fixed apturl for mtp-tools package in music.xml LP #452262 (Connor Imes)
    - Improve ipod section, patch by Michael Fitzhugh. LP: #370085
  * Printing:
    - Updated printer setup directions in printing section LP: #435510
      (Connor Imes)
    - Fix scanning typo. Patch by Shane Fagan LP: #447250
  * Programming:
    - Removed entire programming section LP: #414035 (Connor Imes)
  * Serverguide:
    - Adjusted wording in serverguide package-management file to more
      clearly describe apticron. LP: #473280 (Connor Imes)
    - Updated LDAP section for changes to the Jaunty package.
      Fixes LP: #475492, LP: #459403, LP: #463684 (Adam Sommer)
    - In OpenSSH section, .ssh/authorized_keys permissions should be
      600, not 644 LP: #491159 (Connor Imes)
    - Replaced description of ebox Log Observer in serverguide with a real
      description of the event's purpose LP: #405926 (Connor Imes)
    - Fixed IP example in serverguide's postfix configuration section
      LP: #495202 (Connor Imes)
    - Include 'auto eth1' in interfaces file for static IP configuration
      LP: #441802 (Connor Imes)
    - Fix for disabling Control-Alt-Delete in serverguide. Scott Shields,
      LP: #496465
    - Typo fix, Scott Shields, LP: #497867
    - PostgreSQL setup fix for config file pg_hba.conf, Scott Shields,
      LP: #492286
    - Misc fixes in windows-networking section. Vikram Dhillon, LP: #462607
    - Changes to RAID installation section LP: #428036, LP: #462719
      (Connor Imes)
    - Fixes and adjustments to web-servers LP: #462621 (Connor Imes)
  * Switching:
    - Replaced Pidgin with Empathy in applications-equivalents
      LP: #490980 (Connor Ime...