*** httpd.conf.ORIG	Tue Apr 21 13:32:20 2009
--- httpd.conf	Tue Apr 21 13:45:54 2009
***************
*** 78,84 ****
  # identification number when it starts.
  #
  <IfModule !mpm_netware.c>
! PidFile /var/logs/httpd.pid
  </IfModule>
  
  #
--- 78,84 ----
  # identification number when it starts.
  #
  <IfModule !mpm_netware.c>
! PidFile /var/run/httpd.pid
  </IfModule>
  
  #
***************
*** 255,263 ****
  LoadModule proxy_connect_module /opt/freeware/lib/httpd/modules/mod_proxy_connect.so
  LoadModule proxy_ftp_module /opt/freeware/lib/httpd/modules/mod_proxy_ftp.so
  LoadModule proxy_http_module /opt/freeware/lib/httpd/modules/mod_proxy_http.so
- <IfDefine SSL>
- LoadModule ssl_module /opt/freeware/lib/httpd/modules/mod_ssl.so
- </IfDefine>
  LoadModule mime_module /opt/freeware/lib/httpd/modules/mod_mime.so
  LoadModule dav_module /opt/freeware/lib/httpd/modules/mod_dav.so
  LoadModule status_module /opt/freeware/lib/httpd/modules/mod_status.so
--- 255,260 ----
***************
*** 310,317 ****
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
! User nobody
! Group #-1
  </IfModule>
  </IfModule>
  
--- 307,314 ----
  #  when the value of (unsigned)Group is above 60000; 
  #  don't use Group #-1 on these systems!
  #
! User apache
! Group apache
  </IfModule>
  </IfModule>
  
***************
*** 320,326 ****
  # e-mailed.  This address appears on some server-generated pages, such
  # as error documents.  e.g. admin@your-domain.com
  #
! ServerAdmin you@example.com
  
  #
  # ServerName gives the name and port that the server uses to identify itself.
--- 317,323 ----
  # e-mailed.  This address appears on some server-generated pages, such
  # as error documents.  e.g. admin@your-domain.com
  #
! ServerAdmin root@localhost
  
  #
  # ServerName gives the name and port that the server uses to identify itself.
***************
*** 517,523 ****
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
! ErrorLog /var/logs/error_log
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
--- 514,520 ----
  # logged here.  If you *do* define an error logfile for a <VirtualHost>
  # container, that host's errors will be logged there and not here.
  #
! ErrorLog /var/log/httpd/error_log
  
  #
  # LogLevel: Control the number of messages logged to the error_log.
***************
*** 536,542 ****
  LogFormat "%{User-agent}i" agent
  
  # You need to enable mod_logio.c to use %I and %O
! #LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
  
  #
  # The location and format of the access logfile (Common Logfile Format).
--- 533,539 ----
  LogFormat "%{User-agent}i" agent
  
  # You need to enable mod_logio.c to use %I and %O
! LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
  
  #
  # The location and format of the access logfile (Common Logfile Format).
***************
*** 545,551 ****
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
! CustomLog /var/logs/access_log common
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
--- 542,548 ----
  # define per-<VirtualHost> access logfiles, transactions will be
  # logged therein and *not* in this file.
  #
! CustomLog /var/log/httpd/access_log common
  
  #
  # If you would like to have agent and referer logfiles, uncomment the
***************
*** 603,629 ****
  </Directory>
  
  #
- # This should be changed to the ServerRoot/manual/.  The alias provides
- # the manual, even if you choose to move your DocumentRoot.  You may comment
- # this out if you do not care for the documentation.
- #
- AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1"
- 
- <Directory "/var/www/manual">
-     Options Indexes
-     AllowOverride None
-     Order allow,deny
-     Allow from all
- 
-     <Files *.html>
-         SetHandler type-map
-     </Files>
- 
-     SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|ru)/ prefer-language=$1
-     RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
- </Directory>
- 
- #
  # ScriptAlias: This controls which directories contain server scripts.
  # ScriptAliases are essentially the same as Aliases, except that
  # documents in the realname directory are treated as applications and
--- 600,605 ----
***************
*** 638,644 ****
  # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
  # for setting UNIX socket for communicating with cgid.
  #
! #Scriptsock            /var/logs/cgisock
  </IfModule>
  
  #
--- 614,620 ----
  # Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
  # for setting UNIX socket for communicating with cgid.
  #
! Scriptsock            /var/log/httpd/cgisock
  </IfModule>
  
  #
***************
*** 1043,1052 ****
  # Bring in additional module-specific configurations
  #
  <IfModule mod_ssl.c>
!     Include conf/ssl.conf
  </IfModule>
  
- 
  ### Section 3: Virtual Hosts
  #
  # VirtualHost: If you want to maintain multiple domains/hostnames on your
--- 1019,1027 ----
  # Bring in additional module-specific configurations
  #
  <IfModule mod_ssl.c>
! #Include conf/ssl.conf
  </IfModule>
  
  ### Section 3: Virtual Hosts
  #
  # VirtualHost: If you want to maintain multiple domains/hostnames on your
***************
*** 1079,1081 ****
--- 1054,1060 ----
  #    ErrorLog /var/logs/dummy-host.example.com-error_log
  #    CustomLog /var/logs/dummy-host.example.com-access_log common
  #</VirtualHost>
+ 
+ # Local access to the Apache HTTP Server Manual
+ #Include conf/httpd-manual.conf
+