From: Joshua Slive
Date: Wed, 21 Sep 2005 19:41:48 +0000 (+0000)
Subject: Add APR to the glossary and link it in where appropriate.
X-Git-Tag: 2.3.0~2960
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c988b688c275e08270fa5bfeb1b456afa09e1bf6;p=thirdparty%2Fapache%2Fhttpd.git
Add APR to the glossary and link it in where appropriate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290801 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml
index c939818e46b..981d2fa2873 100644
--- a/docs/manual/bind.xml
+++ b/docs/manual/bind.xml
@@ -95,9 +95,10 @@
Special IPv6 Considerations
- A growing number of platforms implement IPv6, and APR supports
- IPv6 on most of these platforms, allowing Apache to allocate IPv6
- sockets and handle requests which were sent over IPv6.
+ A growing number of platforms implement IPv6, and
+ APR supports IPv6 on most of these platforms,
+ allowing Apache to allocate IPv6 sockets and handle requests which
+ were sent over IPv6.
One complicating factor for Apache administrators is whether or
not an IPv6 socket can handle both IPv4 connections and IPv6
diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml
index dca77df92eb..c25623114b8 100644
--- a/docs/manual/glossary.xml
+++ b/docs/manual/glossary.xml
@@ -56,6 +56,16 @@
See: Manual Page: apxs
+
Apache Portable Runtime (APR)
+ A set of libraries providing many of the basic interfaces
+ between the server and the operating system. APR is developed
+ parallel to the Apache HTTP Server as an independent project.
+ See: Apache Portable Runtime
+ Project
+
+
Authentication
The positive identification of a network entity such as a server, a
client, or a user.
diff --git a/docs/manual/mod/event.xml b/docs/manual/mod/event.xml
index 20dc8158ed1..715e77d9e48 100644
--- a/docs/manual/mod/event.xml
+++ b/docs/manual/mod/event.xml
@@ -38,14 +38,15 @@ MPM
--with-mpm=event
to the configure
script's arguments when building the httpd.
- This MPM depends on APR's atomic compare-and-swap operations for
- thread synchronization. If you are compiling for an x86 target
- and you don't need to support 386s, or you are compiling for a
- SPARC and you don't need to run on pre-UltraSPARC chips, add
+
This MPM depends on APR's atomic
+ compare-and-swap operations for thread synchronization. If you are
+ compiling for an x86 target and you don't need to support 386s, or
+ you are compiling for a SPARC and you don't need to run on
+ pre-UltraSPARC chips, add
--enable-nonportable-atomics=yes
to the
configure script's arguments. This will cause
- APR to implement atomic operations
- using efficient opcodes not available in older CPUs.
+ APR to implement atomic operations using efficient opcodes not
+ available in older CPUs.
AcceptMutex
diff --git a/docs/manual/mod/mod_charset_lite.xml b/docs/manual/mod/mod_charset_lite.xml
index db8c7eec277..fe7cc7b3b78 100644
--- a/docs/manual/mod/mod_charset_lite.xml
+++ b/docs/manual/mod/mod_charset_lite.xml
@@ -60,12 +60,13 @@
The character set name parameters of CharsetSourceEnc and
CharsetDefault
- must be acceptable to the translation mechanism used by APR on the
- system where mod_charset_lite is deployed. These
- character set names are not standardized and are usually not the
- same as the corresponding values used in http headers. Currently,
- APR can only use iconv(3), so you can easily test your character
- set names using the iconv(1) program, as follows:
+ must be acceptable to the translation mechanism used by
+ APR on the system where
+ mod_charset_lite is deployed. These character
+ set names are not standardized and are usually not the same as
+ the corresponding values used in http headers. Currently, APR
+ can only use iconv(3), so you can easily test your character set
+ names using the iconv(1) program, as follows:
iconv -f charsetsourceenc-value -t charsetdefault-value
@@ -105,8 +106,8 @@
The value of the charset argument must be accepted
as a valid character set name by the character set support in
- APR. Generally, this means that it must be supported by
- iconv.
+ APR. Generally, this means that it must be
+ supported by iconv.
Example
<Directory /export/home/trawick/apacheinst/htdocs/convert>
@@ -139,8 +140,8 @@
The value of the charset argument must be accepted
as a valid character set name by the character set support in
- APR. Generally, this means that it must be supported by
- iconv.
+ APR. Generally, this means that it must be
+ supported by iconv.
Example
<Directory /export/home/trawick/apacheinst/htdocs/convert>
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index f0d3fde7972..a432341de14 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -43,7 +43,7 @@ by other LDAP modules
Apache.
SSL/TLS support is dependant on which LDAP toolkit has been
- linked to APR. As of this writing, APR-util supports:
+ linked to APR. As of this writing, APR-util supports:
OpenLDAP SDK (2.x or later),
Novell LDAP
SDK,
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index f97a5584dc1..011510455d6 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -238,29 +238,29 @@ The following Mutex types are available:
This is an elegant Mutex variant where a Posix Semaphore is used when possible.
It is only available when the underlying platform
- and APR supports it.
+ and APR supports it.
sysvsem
This is a somewhat elegant Mutex variant where a SystemV IPC Semaphore is used when
possible. It is possible to "leak" SysV semaphores if processes crash before
the semaphore is removed. It is only available when the underlying platform
- and APR supports it.
+ and APR supports it.
sem
This directive tells the SSL Module to pick the "best" semaphore implementation
available to it, choosing between Posix and SystemV IPC, in that order. It is only
- available when the underlying platform and APR supports at least one of the 2.
+ available when the underlying platform and APR supports at least one of the 2.
pthread
This directive tells the SSL Module to use Posix thread mutexes. It is only available
- if the underlying platform and APR supports it.
+ if the underlying platform and APR supports it.
fcntl:/path/to/mutex
This is a portable Mutex variant where a physical (lock-)file and the fcntl()
fucntion are used as the Mutex.
Always use a local disk filesystem for /path/to/mutex
and never a file
residing on a NFS- or AFS-filesystem. It is only available when the underlying platform
- and APR supports it. Note: Internally, the Process ID (PID) of the
+ and APR supports it. Note: Internally, the Process ID (PID) of the
Apache parent process is automatically appended to
/path/to/mutex
to make it unique, so you don't have to worry
about conflicts yourself. Notice that this type of mutex is not available
@@ -271,17 +271,17 @@ The following Mutex types are available:
This is similar to the fcntl:/path/to/mutex
method with the
exception that the flock()
function is used to provide file
locking. It is only available when the underlying platform
- and APR supports it.
+ and APR supports it.
file:/path/to/mutex
This directive tells the SSL Module to pick the "best" file locking implementation
available to it, choosing between fcntl
and flock
,
- in that order. It is only available when the underlying platform and APR supports
+ in that order. It is only available when the underlying platform and APR supports
at least one of the 2.
default | yes
This directive tells the SSL Module to pick the default locking implementation
- as determined by the platform and APR.
+ as determined by the platform and APR.
Example
SSLMutex file:/usr/local/apache/logs/ssl_mutex
diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml
index 510e66b2de3..9e151659566 100644
--- a/docs/manual/new_features_2_2.xml
+++ b/docs/manual/new_features_2_2.xml
@@ -138,7 +138,7 @@
Module Developer Changes
- - APR 1.0 API
+ - APR 1.0 API
- Apache 2.2 uses the APR 1.0 API. All deprecated functions and
symbols have been removed from
APR
and
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index 08d62791fb6..cf59786a7a8 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -743,7 +743,8 @@
Specific packages
--with-apr=DIR|FILE
- - The Apache Portable Runtime (APR) is part of the httpd
+
- The Apache Portable Runtime (APR)
+ is part of the httpd
source distribution and will automatically be build together with the
HTTP server. If you want to use an already installed APR instead you
have to tell
configure
the path to the
diff --git a/docs/manual/programs/httxt2dbm.xml b/docs/manual/programs/httxt2dbm.xml
index 582957d041d..08d8a8bdabc 100644
--- a/docs/manual/programs/httxt2dbm.xml
+++ b/docs/manual/programs/httxt2dbm.xml
@@ -49,7 +49,7 @@
-f
- Specify the DBM type to be used for the output. If not specified, will
- use the APR Default. Available types are:
+ use the APR Default. Available types are:
GDBM
for GDBM files
SDBM
for SDBM files
DB
for berkeley DB files