diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index 9f42048c62..c8c6e3ba4c 100644
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -88,7 +88,7 @@ logged in as the root user; or
of Apache or some other web server already bound to the same Port.
For further trouble-shooting instructions, consult the Apache FAQ.
+href="faq/">FAQ.
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index 9f42048c62..c8c6e3ba4c 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -88,7 +88,7 @@ logged in as the root user; or
of Apache or some other web server already bound to the same Port.
For further trouble-shooting instructions, consult the Apache FAQ.
+href="faq/">FAQ.
diff --git a/docs/manual/misc/index.html b/docs/manual/misc/index.html
index 99e53c089a..cb4ee732a6 100644
--- a/docs/manual/misc/index.html
+++ b/docs/manual/misc/index.html
@@ -26,12 +26,6 @@
Description of Apache's Application Programming Interface.
- FAQ
-
- Frequently-Asked Questions concerning the Apache project and server.
-
How to use XSSI and Negotiation
for custom ErrorDocuments
diff --git a/docs/manual/mod/directive-dict.html b/docs/manual/mod/directive-dict.html
index 07e8c68fd9..60458af690 100644
--- a/docs/manual/mod/directive-dict.html
+++ b/docs/manual/mod/directive-dict.html
@@ -146,10 +146,9 @@ the root directory as in
regex
-A regular expression, which
-is a way of describing a pattern to match in text. The directive
-definition will specify what the regex is matching
-against.
+A regular expression, which is a way of describing a pattern to
+match in text. The directive definition will specify what the
+regex is matching against.
extension
diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 07e8c68fd9..60458af690 100644
--- a/docs/manual/mod/directive-dict.html.en
+++ b/docs/manual/mod/directive-dict.html.en
@@ -146,10 +146,9 @@ the root directory as in
regex
-A regular expression, which
-is a way of describing a pattern to match in text. The directive
-definition will specify what the regex is matching
-against.
+A regular expression, which is a way of describing a pattern to
+match in text. The directive definition will specify what the
+regex is matching against.
extension
diff --git a/docs/manual/mod/mod_setenvif.html b/docs/manual/mod/mod_setenvif.html
index ec5d78cb38..6190d7f968 100644
--- a/docs/manual/mod/mod_setenvif.html
+++ b/docs/manual/mod/mod_setenvif.html
@@ -42,10 +42,10 @@ REL="Help"
Summary
The mod_setenvif module allows you to set environment
- variables according to whether different aspects of the request match
- regular expressions
- you specify. These environment variables can be used by
- other parts of the server to make decisions about actions to be taken.
+ variables according to whether different aspects of the request
+ match regular expressions you specify. These environment variables
+ can be used by other parts of the server to make decisions about
+ actions to be taken.
The directives are considered in the order they appear in the
configuration files. So more complex sequences can be used, such
diff --git a/docs/manual/urlmapping.html b/docs/manual/urlmapping.html
index c32406139b..4f26c80629 100755
--- a/docs/manual/urlmapping.html
+++ b/docs/manual/urlmapping.html
@@ -104,8 +104,7 @@ the target path is treated as CGI scripts.
For situations where you require additional flexibility, you can
use the AliasMatch and ScriptAliasMatch
-directives to do powerful regular-expression based matching and
+directives to do powerful regular-expression based matching and
substitution. For example,
ScriptAliasMatch ^/~([^/]*)/cgi-bin/(.*)
diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en
index c32406139b..4f26c80629 100755
--- a/docs/manual/urlmapping.html.en
+++ b/docs/manual/urlmapping.html.en
@@ -104,8 +104,7 @@ the target path is treated as CGI scripts.
For situations where you require additional flexibility, you can
use the AliasMatch and ScriptAliasMatch
-directives to do powerful regular-expression based matching and
+directives to do powerful regular-expression based matching and
substitution. For example,
ScriptAliasMatch ^/~([^/]*)/cgi-bin/(.*)
|