From d78c998c6a23a703722fefbf74b7a26537032925 Mon Sep 17 00:00:00 2001
From: Rich Bowen When Apache starts, it connects to some port and address on
diff --git a/docs/manual/cgi_path.html.en b/docs/manual/cgi_path.html.en
index 4ed74ade20a..b019173b90d 100644
--- a/docs/manual/cgi_path.html.en
+++ b/docs/manual/cgi_path.html.en
@@ -13,7 +13,7 @@
vlink="#000080" alink="#FF0000">
- Apache is configured by placing directives in plain text
+ This document describes the files used to configure the Apache
+HTTP server. Apache is configured by placing directives in plain text
configuration files. The main configuration file is usually
called Setting which addresses and ports Apache
+
Setting which addresses and ports Apache
uses
PATH_INFO Changes in the CGI
+
PATH_INFO Changes in the CGI
Environment
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index f0b3e2e47fc..2d03fd5af81 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -1,62 +1,21 @@
-
-
-
-
-
-
- Configuration Files
-
-
-
-
-
- Main Configuration Files
-
-
-
-
-
-
- Related Modules
-
-
-
- mod_mime
- Related Directives
-
-
- <IfDefine>
- Include
- TypesConfig
- Apache HTTP Server Version 2.0
Apache Module
+ Configuration Files
+Main Configuration Files
+
+
+
+ Related Modules mod_mime
Related Directives <IfDefine>
Include
TypesConfig
httpd.conf
. The location of this file is
set at compile-time, but may be overridden with the
-f
command line flag. In addition, other
- configuration files may be added using the Include
directive. Any
+ configuration files may be added using the Include
directive. Any
directive may be placed in any of these configuration files.
Changes to the main configuration files are only recognized by
Apache when it is started or restarted.
The server also reads a file containing mime document types;
- the filename is set by the TypesConfig directive,
+ the filename is set by the TypesConfig
directive,
and is mime.types
by default.
Apache configuration files contain one directive per line.
The back-slash "\" may be used as the last character on a line
@@ -98,83 +54,35 @@
without starting the server by using apachectl
configtest
or the -t
command line
option.
Related Modules - - mod_so - |
-
- Related Directives - - AddModule - ClearModuleList - <IfModule> - LoadModule - |
-
Related Modulesmod_so | Related DirectivesAddModule ClearModuleList <IfModule> LoadModule |
Apache is a modular server. This implies that only the most
basic functionality is included in the core server. Extended
- features are available through modules which can be loaded
- into Apache. By default, a base set of modules is
+ features are available through modules which can be loaded
+ into Apache. By default, a base set of modules is
included in the server at compile-time. If the server is
compiled to use dynamically loaded
modules, then modules can be compiled separately and added at
- any time using the LoadModule directive.
+ any time using the LoadModule
+ directive.
Otherwise, Apache must be recompiled to add or remove modules.
Configuration directives may be included conditional on a
- presence of a particular module by enclosing them in an <IfModule> block.
<IfModule>
block.
To see which modules are currently compiled into the server,
you can use the -l
command line option.
Related Directives - - <Directory> - <DirectoryMatch> - <Files> - <FilesMatch> - <Location> - <LocationMatch> - <VirtualHost> - |
-
Related Modules | Related Directives<Directory> <DirectoryMatch> <Files> <FilesMatch> <Location> <LocationMatch> <VirtualHost> |
Directives placed in the main configuration files apply to
the entire server. If you wish to change the configuration for
only a part of the server, you can scope your directives by
- placing them in <Directory>, <DirectoryMatch>,
- <Files>, <FilesMatch>, <Location>,
and
- <LocationMatch>
+ placing them in <Directory>
, <DirectoryMatch>
, <Files>
, <FilesMatch>
, <Location>
, and <LocationMatch>
sections. These sections limit the application of the
directives which they enclose to particular filesystem
locations or URLs. They can also be nested, allowing for very
@@ -183,8 +91,7 @@
Apache has the capability to serve many different websites
simultaneously. This is called Virtual
Hosting. Directives can also be scoped by placing them
- inside <VirtualHost>
+ inside <VirtualHost>
sections, so that they will only apply to requests for a
particular website.
Related Directives - - AccessFileName - AllowOverride - |
-
Related Modules | Related DirectivesAccessFileName AllowOverride |
Apache allows for decentralized management of configuration
via special files placed inside the web tree. The special files
are usually called .htaccess
, but any name can be
- specified in the AccessFileName
+ specified in the AccessFileName
directive. Directives placed in .htaccess
files
apply to the directory where you place the file, and all
sub-directories. The .htaccess
files follow the
@@ -226,19 +119,13 @@
made in these files take immediate effect.
To find which directives can be placed in
- .htaccess
files, check the Context of the
+ .htaccess
files, check the Context of the
directive. The server administrator further controls what
directives may be placed in .htaccess
files by
- configuring the AllowOverride
+ configuring the AllowOverride
directive in the main configuration files.
For more information on .htaccess
files, see
- Ken Coar's tutorial on
+ Ken Coar's tutorial on
Using .htaccess Files with Apache.
Apache's supports content negotiation as described in the HTTP/1.1 specification. It can choose the best @@ -606,7 +606,7 @@ CacheNegotiatedDocs can be used to allow caching of responses which were subject to negotiation. This directive can be given in the server config or virtual host, and takes no - arguments. It has no effect on requests from HTTP/1.1 clients. + arguments. It has no effect on requests from HTTP/1.1 clients.
The allocation mechanism's within APR have a number of diff --git a/docs/manual/developer/documenting.html b/docs/manual/developer/documenting.html index a342a62afe5..77199bcddc8 100644 --- a/docs/manual/developer/documenting.html +++ b/docs/manual/developer/documenting.html @@ -61,13 +61,12 @@ At the top of the header file, always include: * @package Name of library header */ -
+ScanDoc uses a new html file for each package. The html files are named {Name_of_library_header}.html, so try to be concise with your names. - -+