From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 10 May 2014 05:49:43 +0000 (+0000)
Subject: - Add missing links
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89c804e0ab570cd2918fe3ef10cea6ee4f894a30;p=thirdparty%2Fapache%2Fhttpd.git

- Add missing links
- Fix extra ] spotted in online doc by emigas.
- Remove another ] introduced in Hearder syntax in r1588244
- s/variable/varname/ to match the text below it.
- Turn the syntax of both Header and RequestHeader to be:
   header [value [replacement [early|env=[!]variable|expr=expression]]]
in order to match the code.
This removes the ambiguity of expr=<something> which can now be used in 2 different places in the syntax.
- Also remove the space in 'expr= value' in compatibility note, to help distinguish between the two

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1593665 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index ddeec40b71c..37bbda1a862 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -74,7 +74,8 @@ RequestHeader unset MirrorID
     configuration is traversed, early headers can only be set in a
     main server or virtual host context.  Early directives cannot depend
     on a request path, so they will fail in contexts such as
-    <code>&lt;Directory&gt;</code> or <code>&lt;Location&gt;</code>.</p>
+    <directive type="section" module="core">Directory</directive> or
+    <directive type="section" module="core">Location</directive>.</p>
 </section>
 
 <section id="examples"><title>Examples</title>
@@ -200,13 +201,13 @@ Header merge Cache-Control no-store env=NO_STORE
 <name>RequestHeader</name>
 <description>Configure HTTP request headers</description>
 <syntax>RequestHeader add|append|edit|edit*|merge|set|setifempty|unset
-<var>header</var> [[expr=]<var>value</var>] [<var>replacement</var>]
-[early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
+<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>
+[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]]
 </syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>SetIfEmpty available in 2.4.7 and later, expr= value 
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value 
 available in 2.4.10 and later</compatibility>
 
 <usage>
@@ -311,13 +312,13 @@ available in 2.4.10 and later</compatibility>
 <name>Header</name>
 <description>Configure HTTP response headers</description>
 <syntax>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
-<var>header</var> [[expr=]<var>value]</var>] [<var>replacement</var>]
-[early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
+<var>header</var> [[expr=]<var>value</var> [<var>replacement</var>
+[early|env=[!]<var>varname</var>|expr=<var>expression</var>]]]
 </syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>SetIfEmpty available in 2.4.7 and later, expr= value 
+<compatibility>SetIfEmpty available in 2.4.7 and later, expr=value 
 available in 2.4.10 and later</compatibility>
 
 <usage>