From af3a6b9524b1be4506b0eaa73cf472e9d0f286b0 Mon Sep 17 00:00:00 2001 From: Ken Coar Date: Sun, 6 Jul 1997 14:54:49 +0000 Subject: [PATCH] Numerous HTML cleanups, largely courtesy of weblint (thanx, Marc!). Also brought core.html into some H2 naming consistency, and cleaned up man-template.html. Much, much more to come.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@78542 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/developer/API.html | 24 ++++---- docs/manual/misc/API.html | 24 ++++---- docs/manual/misc/FAQ.html | 4 +- docs/manual/mod/core.html | 109 ++++++++++++++++----------------- 4 files changed, 79 insertions(+), 82 deletions(-) diff --git a/docs/manual/developer/API.html b/docs/manual/developer/API.html index ad539e2abb..b81c20ec7a 100644 --- a/docs/manual/developer/API.html +++ b/docs/manual/developer/API.html @@ -561,7 +561,7 @@ int my_handler(request_rec *r) struct my_structure *foo; ... - foo = (foo *)palloc (r->pool, sizeof(my_structure)); + foo = (foo *)palloc (r->pool, sizeof(my_structure)); } @@ -598,7 +598,7 @@ at least two char * arguments, the last of which must be of the strings, as a unit; for instance: 
-     pstrcat (r->pool, "foo", "/", "bar", NULL);
+     pstrcat (r->pool, "foo", "/", "bar", NULL);
returns a pointer to 8 bytes worth of memory, initialized to @@ -614,7 +614,7 @@ the same as the typical arguments to fopen, e.g., 
      ...
-     FILE *f = pfopen (r->pool, r->filename, "r");
+     FILE *f = pfopen (r->pool, r->filename, "r");
 
      if (f == NULL) { ... } else { ... }
@@ -933,22 +933,22 @@ the get_module_config function. int find_ct(request_rec *r) { int i; - char *fn = pstrdup (r->pool, r->filename); + char *fn = pstrdup (r->pool, r->filename); mime_dir_config *conf = (mime_dir_config *) - get_module_config(r->per_dir_config, &mime_module); + get_module_config(r->per_dir_config, &mime_module); char *type; - if (S_ISDIR(r->finfo.st_mode)) { - r->content_type = DIR_MAGIC_TYPE; + if (S_ISDIR(r->finfo.st_mode)) { + r->content_type = DIR_MAGIC_TYPE; return OK; } if((i=rind(fn,'.')) < 0) return DECLINED; ++i; - if ((type = table_get (conf->encoding_types, &fn[i]))) + if ((type = table_get (conf->encoding_types, &fn[i]))) { - r->content_encoding = type; + r->content_encoding = type; /* go back to previous extension to try to use it as a type */ @@ -957,9 +957,9 @@ int find_ct(request_rec *r) ++i; } - if ((type = table_get (conf->forced_types, &fn[i]))) + if ((type = table_get (conf->forced_types, &fn[i]))) { - r->content_type = type; + r->content_type = type; } return OK; @@ -989,7 +989,7 @@ per-directory config data): 
 char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url)
 {
-    server_rec *s = cmd->server;
+    server_rec *s = cmd->server;
     alias_server_conf *conf = (alias_server_conf *)
             get_module_config(s->module_config,&alias_module);
     alias_entry *new = push_array (conf->redirects);
diff --git a/docs/manual/misc/API.html b/docs/manual/misc/API.html
index ad539e2abb..b81c20ec7a 100644
--- a/docs/manual/misc/API.html
+++ b/docs/manual/misc/API.html
@@ -561,7 +561,7 @@ int my_handler(request_rec *r)
     struct my_structure *foo;
     ...
 
-    foo = (foo *)palloc (r->pool, sizeof(my_structure));
+    foo = (foo *)palloc (r->pool, sizeof(my_structure));
 }
@@ -598,7 +598,7 @@ at least two char * arguments, the last of which must be of the strings, as a unit; for instance: 
-     pstrcat (r->pool, "foo", "/", "bar", NULL);
+     pstrcat (r->pool, "foo", "/", "bar", NULL);
returns a pointer to 8 bytes worth of memory, initialized to @@ -614,7 +614,7 @@ the same as the typical arguments to fopen, e.g., 
      ...
-     FILE *f = pfopen (r->pool, r->filename, "r");
+     FILE *f = pfopen (r->pool, r->filename, "r");
 
      if (f == NULL) { ... } else { ... }
@@ -933,22 +933,22 @@ the get_module_config function. int find_ct(request_rec *r) { int i; - char *fn = pstrdup (r->pool, r->filename); + char *fn = pstrdup (r->pool, r->filename); mime_dir_config *conf = (mime_dir_config *) - get_module_config(r->per_dir_config, &mime_module); + get_module_config(r->per_dir_config, &mime_module); char *type; - if (S_ISDIR(r->finfo.st_mode)) { - r->content_type = DIR_MAGIC_TYPE; + if (S_ISDIR(r->finfo.st_mode)) { + r->content_type = DIR_MAGIC_TYPE; return OK; } if((i=rind(fn,'.')) < 0) return DECLINED; ++i; - if ((type = table_get (conf->encoding_types, &fn[i]))) + if ((type = table_get (conf->encoding_types, &fn[i]))) { - r->content_encoding = type; + r->content_encoding = type; /* go back to previous extension to try to use it as a type */ @@ -957,9 +957,9 @@ int find_ct(request_rec *r) ++i; } - if ((type = table_get (conf->forced_types, &fn[i]))) + if ((type = table_get (conf->forced_types, &fn[i]))) { - r->content_type = type; + r->content_type = type; } return OK; @@ -989,7 +989,7 @@ per-directory config data): 
 char *add_redirect(cmd_parms *cmd, void *dummy, char *f, char *url)
 {
-    server_rec *s = cmd->server;
+    server_rec *s = cmd->server;
     alias_server_conf *conf = (alias_server_conf *)
             get_module_config(s->module_config,&alias_module);
     alias_entry *new = push_array (conf->redirects);
diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html
index 5525499f60..070ab0d1ac 100644
--- a/docs/manual/misc/FAQ.html
+++ b/docs/manual/misc/FAQ.html
@@ -15,7 +15,7 @@
   
   
Apache Server Frequently Asked Questions

   

-  $Revision: 1.80 $ ($Date: 1997/07/05 17:33:34 $)
+  $Revision: 1.81 $ ($Date: 1997/07/06 14:54:47 $)
   

   

   The latest version of this FAQ is always available from the main
@@ -227,8 +227,6 @@
 

 
   
The Answers

-  

-  

   

    Background
   

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 6e4d5f0ced..34e49f476e 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -15,11 +15,11 @@
 
 
 
Apache Core Features

-
+

 These configuration parameters control the core Apache features, and are
 always available.
-
-
+

+
Directives

 
 

 
-
AccessConfig directive

+
AccessConfig directive

 
 Syntax: AccessConfig filename

 Default: AccessConfig conf/access.conf

@@ -92,7 +92,7 @@ Historically, this file only contained
 contain any server directive allowed in the server config context.
 

 
-
AccessFileName directive

+
AccessFileName directive

 
 Syntax: AccessFileName filename

 Default: AccessFileName .htaccess

@@ -113,7 +113,7 @@ for directives, unless they have been disabled with
 AllowOverride None

 </Directory>

 
-
AddModule directive

+
AddModule directive

 
 Syntax: AddModule module module ...

 Context: server config 

@@ -126,7 +126,7 @@ server comes with a pre-loaded list of active modules; this list can
 be cleared with the ClearModuleList
 directive.

 
-
AllowOverride directive

+
AllowOverride directive

 
 Syntax: AllowOverride override override ...

 Default: AllowOverride All

@@ -188,7 +188,7 @@ Allow use of the directives controlling specific directory features
 XBitHack).
 

 
-
AuthName directive

+
AuthName directive

 
 Syntax: AuthName auth-domain

 Context: directory, .htaccess

@@ -203,7 +203,7 @@ It must be accompanied by AuthType and
 AuthUserFile and
 AuthGroupFile to work.

 
-
AuthType directive

+
AuthType directive

 
 Syntax: AuthType type

 Context: directory, .htaccess

@@ -218,7 +218,7 @@ It must be accompanied by AuthName and
 AuthUserFile and
 AuthGroupFile to work.

 
-
BindAddress directive

+
BindAddress directive

 
 Syntax: BindAddress saddr

 Default: BindAddress *

@@ -249,7 +249,7 @@ This option can be used as an alternative method for supporting
 
 

 
-
ClearModuleList directive

+
ClearModuleList directive

 
 Syntax: ClearModuleList

 Context: server config

@@ -260,7 +260,7 @@ The server comes with a built-in list of active modules.  This
 directive clears the list.  It is assumed that the list will then be
 re-populated using the AddModule directive.

 
-
DefaultType directive

+
DefaultType directive

 
 Syntax: DefaultType mime-type

 Default: DefaultType text/html

@@ -278,7 +278,7 @@ example:
 would be appropriate for a directory which contained many gif images
 with filenames missing the .gif extension.

 
-
<Directory> directive

+
<Directory> directive

 
 Syntax: <Directory directory> ... </Directory> 

 Context: server config, virtual host

@@ -356,7 +356,7 @@ may appear in any configuration file. <Directory> directives cannot
 nest, and cannot appear in a <Limit> section.
 

 
-
DocumentRoot directive

+
DocumentRoot directive

 
 Syntax: DocumentRoot directory-filename

 Default: DocumentRoot
@@ -378,7 +378,7 @@ please avoid that.
 
 

 
-
ErrorDocument directive

+
ErrorDocument directive

 
 Syntax: ErrorDocument error-code document

 Context server config, virtual host, directory, .htaccess

@@ -427,7 +427,7 @@ from the nature of the HTTP basic authentication scheme.
 
See Also: documentation of customizable
 responses.

 
-
ErrorLog directive

+
ErrorLog directive

 
 Syntax: ErrorLog filename

 Default: ErrorLog logs/error_log

@@ -448,7 +448,7 @@ than the user that starts the server.
 
 

 
-
<Files>

+
<Files> directive

 Syntax: <Files filename>
 ... </Files>

 Context: server config, virtual host, htaccess

@@ -489,7 +489,7 @@ the directory being applied will be prefixed automatically.
 
 
 

 
-
Group directive

+
Group directive

 
 Syntax: Group unix-group

 Default: Group #-1

@@ -523,7 +523,7 @@ as the group specified in the main Group directive.

 SECURITY: See User for a discussion of the security
 considerations.

 
-
HostNameLookups directive

+
HostNameLookups directive

 
 Syntax: HostNameLookups boolean

 Default: HostNameLookups on

@@ -539,7 +539,7 @@ lookups can take considerable amounts of time. The utility logresolve,
 provided in the /support directory, can be used to look up host names
 from logged IP addresses offline.

 
-
IdentityCheck directive

+
IdentityCheck directive

 
 Syntax: IdentityCheck boolean

 Default: IdentityCheck off

@@ -561,7 +561,7 @@ of latency to each hit.  So in general this is not very useful on public
 servers accessible from the Internet.
 

 
-
<IfModule>

+
<IfModule> directive

 Syntax: <IfModule [!]module-name> ...
 </IfModule>

 Default: None

@@ -601,7 +601,7 @@ simple multiple-module tests.
 
 
 

 
-
KeepAlive

+
KeepAlive directive

 Syntax: (Apache 1.1) KeepAlive max-requests

 Default: (Apache 1.1) KeepAlive 5

 Syntax: (Apache 1.2) KeepAlive on/off

@@ -624,7 +624,7 @@ server resources. Set this to 0 to disable support.
 persistent connections, "Off" to disable. See also the MaxKeepAliveRequests directive.

 
-
KeepAliveTimeout

+
KeepAliveTimeout directive

 Syntax: KeepAliveTimeout seconds

 Default: KeepAliveTimeout 15

 Context: server config

@@ -639,7 +639,7 @@ href="#timeout">Timeout directive
 applies.
 

 
-
Listen

+
Listen directive

 Syntax:
 Listen [IP address:]port number

 Context: server config

@@ -660,7 +660,7 @@ directive.

 Known Bugs

 

 
-
ListenBacklog

+
ListenBacklog directive

 Syntax: ListenBacklog backlog

 Default: ListenBacklog 511

 Context: server config

@@ -673,7 +673,7 @@ tuning is needed or desired, however on some systems it is desirable
 to increase this when under a TCP SYN flood attack.  See 
 the backlog parameter to the listen(2) system call.
 
-
<Limit> directive

+
<Limit> directive

 
 Syntax:
  <Limit method method ... > ... </Limit>

@@ -693,7 +693,7 @@ require valid-user

 If an access control directive appears outside a <Limit> directive,
 then it applies to all access methods.

 
-
<Location>

+
<Location> directive

 
 Syntax: <Location URL>
 ... </Location>

@@ -747,7 +747,7 @@ from browsers at foo.com, you might use:
-

LockFile

 +

LockFile directive

Syntax: LockFile filename
Default: LockFile logs/accept.lock
Context: server config
@@ -763,7 +763,7 @@ server process is automatically appended to the filename.

-

MaxClients

 +

MaxClients directive

Syntax: MaxClients number
Default: MaxClients 256
@@ -774,7 +774,7 @@ The MaxClients directive sets the limit on the number of simultaneous requests that can be supported; not more than this number of child server processes will be created.

-

MaxKeepAliveRequests

 +

MaxKeepAliveRequests directive

Syntax: MaxKeepAliveRequests number
Default: MaxKeepAliveRequests 100
Context: server config
@@ -788,7 +788,7 @@ on. If it is set to "0", unlimited requests will be allowed. We recommend that this setting be kept to a high value for maximum server performance. -

MaxRequestsPerChild directive

 +

MaxRequestsPerChild directive

Syntax: MaxRequestsPerChild number
Default: MaxRequestsPerChild 0
@@ -808,7 +808,7 @@ memory leakage; number of processes when the server load reduces.

-

MaxSpareServers directive

 +

MaxSpareServers directive

Syntax: MaxSpareServers number
Default: MaxSpareServers 10
@@ -826,7 +826,7 @@ Setting this parameter to a large number is almost always a bad idea.

See also MinSpareServers and StartServers.

-

MinSpareServers directive

 +

MinSpareServers directive

Syntax: MinSpareServers number
Default: MinSpareServers 5
@@ -844,7 +844,7 @@ Setting this parameter to a large number is almost always a bad idea.

See also MaxSpareServers and StartServers.

-

Options directive

 +

Options directive

Syntax: Options [+|-]option [+|-]option ...
Context: server config, virtual host, directory, .htaccess
@@ -931,7 +931,7 @@ then the options FollowSymLinks and Includes are set for the /web/docs/spec directory.
-

PidFile directive

 +

PidFile directive

Syntax: PidFile filename
Default: PidFile logs/httpd.pid
@@ -953,7 +953,7 @@ The PidFile is subject to the same warnings about log file placement and

-

Port directive

 +

Port directive

Syntax: Port number
Default: Port 80
@@ -1009,7 +1009,7 @@ not to set User to root. If you run the server as root whilst handling connections, your site may be open to a major security attack.

-

require directive

 +

require directive

Syntax: require entity-name entity entity...
Context: directory, .htaccess
@@ -1046,7 +1046,7 @@ Require must be accompanied by AuthName and AuthGroupFile (to define users and groups) in order to work correctly.

-

ResourceConfig directive

 +

ResourceConfig directive

Syntax: ResourceConfig filename
Default: ResourceConfig conf/srm.conf
@@ -1065,8 +1065,7 @@ sections; in fact it can now contain any server directive allowed in the See also AccessConfig.

- -

RLimitCPU directive

 +

RLimitCPU directive

Syntax: RLimitCPU # or 'max' [# or 'max']
Default: Unset uses operating system defaults
@@ -1085,7 +1084,7 @@ CPU resource limits are expressed in seconds per process.

See also RLimitMEM or RLimitNPROC.

-

RLimitMEM directive

 +

RLimitMEM directive

Syntax: RLimitMEM # or 'max' [# or 'max']
Default: Unset uses operating system defaults
@@ -1104,7 +1103,7 @@ Memory resource limits are expressed in bytes per process.

See also RLimitCPU or RLimitNPROC.

-

RLimitNPROC directive

 +

RLimitNPROC directive

Syntax: RLimitNPROC # or 'max' [# or 'max']
Default: Unset uses operating system defaults
@@ -1130,7 +1129,7 @@ See also RLimitMEM or RLimitCPU
-

Satisfy

 +

Satisfy directive

Syntax: Satisfy 'any' or 'all'
Default: Satisfy all
@@ -1152,7 +1151,7 @@ clients from particular addresses in without prompting for a password.

-

ScoreBoardFile directive

 +

ScoreBoardFile directive

Syntax: ScoreBoardFile filename
Default: ScoreBoardFile logs/apache_status
@@ -1189,7 +1188,7 @@ release.

-

SendBufferSize directive

 +

SendBufferSize directive

Syntax: SendBufferSize bytes
Context: server config
@@ -1201,7 +1200,7 @@ speed high latency (i.e. 100ms or so, such as transcontinental fast pipes)

-

ServerAdmin directive

 +

ServerAdmin directive

Syntax: ServerAdmin email-address
Context: server config, virtual host
@@ -1214,7 +1213,7 @@ It may be worth setting up a dedicated address for this, e.g.
ServerAdmin www-admin@foo.bar.com
as users do not always mention that they are talking about the server!

-

ServerAlias directive

 +

ServerAlias directive

Syntax: ServerAlias host1 host2 ...
Context: virtual host
@@ -1230,7 +1229,7 @@ with
-

ServerName directive

 +

ServerName directive

Syntax: ServerName fully-qualified domain name
Context: server config, virtual host
@@ -1247,7 +1246,7 @@ were monster.wibble.com.

DNS Issues

-

ServerPath directive

 +

ServerPath directive

Syntax: ServerPath pathname
Context: virtual host
@@ -1261,7 +1260,7 @@ use with Host-header based virtual hosts. In-depth description of Virtual Host matching

-

ServerRoot directive

 +

ServerRoot directive

Syntax: ServerRoot directory-filename
Default: ServerRoot /usr/local/etc/httpd
@@ -1274,7 +1273,7 @@ Typically it will contain the subdirectories conf/ and as relative to this directory.
See also the -d option to httpd.

-

ServerType directive

 +

ServerType directive

Syntax: ServerType type
Default: ServerType standalone
@@ -1308,7 +1307,7 @@ SECURITY: if you are paranoid about security, run in inetd mode. Security cannot be guaranteed in either, but whilst most people are happy to use standalone, inetd is probably least prone to attack.

-

StartServers directive

 +

StartServers directive

Syntax: StartServers number
Default: StartServers 5
@@ -1322,7 +1321,7 @@ on the load, there is usually little reason to adjust this parameter.

See also MinSpareServers and MaxSpareServers.

-

TimeOut directive

 +

TimeOut directive

Syntax: TimeOut number
Default: TimeOut 300
@@ -1349,7 +1348,7 @@ a packet is sent.

-

User directive

 +

User directive

Syntax: User unix-userid
Default: User #-1
@@ -1388,7 +1387,7 @@ SECURITY: Don't set User (or Group) to root unless you know exactly what you are doing, and what the dangers are.

-

<VirtualHost> directive

 +

<VirtualHost> directive

Syntax: <VirtualHost addr[:port] ...> ... </VirtualHost>
-- 2.50.1