added pep_file_url_template setting; corrected PEP urls (removed .html); restored warning comment to HTML output

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@4445 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

5 files changed, 11 insertions, 11 deletions

diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index 53ffe2908..d1911dfdf 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -175,7 +175,7 @@ inline markup is also possible (although exceedingly ugly!) in <em>re</em><tt cl
 (generated by processing errors; this one is intentional).  Here is a
 reference to the <a class="reference" href="#doctitle">doctitle</a> and the <a class="reference" href="#subtitle">subtitle</a>.</p>
 <p>The default role for interpreted text is <cite>Title Reference</cite>.  Here are
-some explicit interpreted text roles: a PEP reference (<a class="reference" href="http://www.python.org/dev/peps/pep-0287.html">PEP 287</a>); an
+some explicit interpreted text roles: a PEP reference (<a class="reference" href="http://www.python.org/dev/peps/pep-0287">PEP 287</a>); an
 RFC reference (<a class="reference" href="http://www.faqs.org/rfcs/rfc2822.html">RFC 2822</a>); a <sub>subscript</sub>; a <sup>superscript</sup>;
 and explicit roles for <em>standard</em> <strong>inline</strong>
 <tt class="docutils literal"><span class="pre">markup</span></tt>.</p>
diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex
index 433b8d400..4e3b7d020 100644
--- a/docutils/test/functional/expected/standalone_rst_latex.tex
+++ b/docutils/test/functional/expected/standalone_rst_latex.tex
@@ -312,7 +312,7 @@ inline markup is also possible (although exceedingly ugly!) in \emph{re}\texttt{
 reference to the \href{\#doctitle}{doctitle} and the \href{\#subtitle}{subtitle}.
 
 The default role for interpreted text is \titlereference{Title Reference}.  Here are
-some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/dev/peps/pep-0287.html}{PEP 287}); an
+some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/dev/peps/pep-0287}{PEP 287}); an
 RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); a $_{subscript}$; a $^{superscript}$;
 and explicit roles for \emph{standard} \textbf{inline}
 \texttt{markup}.
diff --git a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
index ed4562462..2dfef4b27 100644
--- a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
+++ b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt
@@ -470,7 +470,7 @@
                         Title Reference
                     .  Here are
                     some explicit interpreted text roles: a PEP reference (
-                    <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+                    <reference refuri="http://www.python.org/dev/peps/pep-0287">
                         PEP 287
                     ); an
                     RFC reference (
diff --git a/docutils/test/test_parsers/test_rst/test_interpreted.py b/docutils/test/test_parsers/test_rst/test_interpreted.py
index aa342d573..95763868e 100755
--- a/docutils/test/test_parsers/test_rst/test_interpreted.py
+++ b/docutils/test/test_parsers/test_rst/test_interpreted.py
@@ -182,7 +182,7 @@ totest['references'] = [
 """\
 <document source="test data">
     <paragraph>
-        <reference refuri="http://www.python.org/dev/peps/pep-0000.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0000">
             PEP 0
 """],
 ["""\
diff --git a/docutils/test/test_readers/test_pep/test_inline_markup.py b/docutils/test/test_readers/test_pep/test_inline_markup.py
index 80b100593..6dd2ab87b 100755
--- a/docutils/test/test_readers/test_pep/test_inline_markup.py
+++ b/docutils/test/test_readers/test_pep/test_inline_markup.py
@@ -30,10 +30,10 @@ and RFC 2822 (which obsoletes RFC822 and RFC-733).
 <document source="test data">
     <paragraph>
         See \n\
-        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287">
             PEP 287
          (
-        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287">
             pep-0287.txt
         ),
         and \n\
@@ -61,7 +61,7 @@ RFC
     <paragraph>
         References split across lines:
     <paragraph>
-        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287">
             PEP
             287
     <paragraph>
@@ -72,18 +72,18 @@ RFC
 ["""\
 Test PEP-specific implicit references before a URL:
 
-PEP 287 (http://www.python.org/dev/peps/pep-0287.html), RFC 2822.
+PEP 287 (http://www.python.org/dev/peps/pep-0287), RFC 2822.
 """,
 """\
 <document source="test data">
     <paragraph>
         Test PEP-specific implicit references before a URL:
     <paragraph>
-        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287">
             PEP 287
          (
-        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
-            http://www.python.org/dev/peps/pep-0287.html
+        <reference refuri="http://www.python.org/dev/peps/pep-0287">
+            http://www.python.org/dev/peps/pep-0287
         ), \n\
         <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
             RFC 2822