Backport:

  Mention what type of regex we use, and reference the glossary.

  PR: 29732

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

diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 3af7982a89ac7431d676624377785f1f00256bb9..caecbe3b959ae8e87fabc5b68f1d3f5c4f531bf9 100644 (file)
--- a/docs/manual/mod/directive-dict.html.en
+++ b/docs/manual/mod/directive-dict.html.en
@@ -99,9 +99,9 @@
 
       <dt><em>regex</em></dt>
 
-      <dd>A regular expression, which is a way of describing a
-      pattern to match in text. The directive definition will
-      specify what the <em>regex</em> is matching against.</dd>
+      <dd>A Perl-compatible <a href="../glossary.html#regex">regular
+      expression</a>. The directive definition will specify what the
+      <em>regex</em> is matching against.</dd>
 
       <dt><em>extension</em></dt>
 
@@ -292,4 +292,4 @@
 </div><div id="footer">
 <p class="apache">Copyright 1999-2004 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>

diff --git a/docs/manual/mod/directive-dict.xml b/docs/manual/mod/directive-dict.xml
index 39c0d1814e00769102934d1f4e9b3632f26bd21b..950183af55c3e24e8406457bb54f0f52a6414919 100644 (file)
--- a/docs/manual/mod/directive-dict.xml
+++ b/docs/manual/mod/directive-dict.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- $Revision: 1.2.2.5 $ -->
+<!-- $Revision: 1.2.2.6 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -91,9 +91,9 @@
 
       <dt><em>regex</em></dt>
 
-      <dd>A regular expression, which is a way of describing a
-      pattern to match in text. The directive definition will
-      specify what the <em>regex</em> is matching against.</dd>
+      <dd>A Perl-compatible <a href="../glossary.html#regex">regular
+      expression</a>. The directive definition will specify what the
+      <em>regex</em> is matching against.</dd>
 
       <dt><em>extension</em></dt>