updated

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

9 files changed, 15 insertions, 14 deletions

diff --git a/docutils/docs/dev/pysource.dtd b/docutils/docs/dev/pysource.dtd
index 79a074cec..fb8af4091 100644
--- a/docutils/docs/dev/pysource.dtd
+++ b/docutils/docs/dev/pysource.dtd
@@ -14,7 +14,8 @@ below).
 
 More information about this DTD and the Docutils project can be found
 at http://docutils.sourceforge.net/.  The latest version of this DTD
-is available from http://docutils.sourceforge.net/spec/pysource.dtd.
+is available from
+http://docutils.sourceforge.net/docs/dev/pysource.dtd.
 
 The formal public identifier for this DTD is::
 
@@ -45,7 +46,7 @@ The formal public identifier for this DTD is::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This DTD extends the Docutils Generic DTD, available from
-http://docutils.sourceforge.net/spec/docutils.dtd.
+http://docutils.sourceforge.net/docs/ref/docutils.dtd.
 -->
 
 <!ENTITY % docutils PUBLIC
diff --git a/docutils/docs/dev/pysource.txt b/docutils/docs/dev/pysource.txt
index 2336ebd54..6f173a709 100644
--- a/docutils/docs/dev/pysource.txt
+++ b/docutils/docs/dev/pysource.txt
@@ -40,7 +40,7 @@ goes something like this:
    - merge hyperlinks
    - merge namespaces
    - create various sections like "Module Attributes", "Functions",
-     "Classes", "Class Attributes", etc.; see spec/ppdi.dtd
+     "Classes", "Class Attributes", etc.; see pysource.dtd_
    - convert the above special sections to ordinary doctree nodes
 
 4. Run transforms on the combined doctree.  Examples: resolving
diff --git a/docutils/docs/ref/docutils.dtd b/docutils/docs/ref/docutils.dtd
index 5087d23d7..e4a1c27aa 100644
--- a/docutils/docs/ref/docutils.dtd
+++ b/docutils/docs/ref/docutils.dtd
@@ -12,7 +12,7 @@
 More information about this DTD (document type definition) and the
 Docutils project can be found at http://docutils.sourceforge.net/.
 The latest version of this DTD is available from
-http://docutils.sourceforge.net/spec/docutils.dtd.
+http://docutils.sourceforge.net/docs/ref/docutils.dtd.
 
 The formal public identifier for this DTD is::
 
diff --git a/docutils/docs/user/rst/quickstart.txt b/docutils/docs/user/rst/quickstart.txt
index f17ff8803..bf6b21275 100644
--- a/docutils/docs/user/rst/quickstart.txt
+++ b/docutils/docs/user/rst/quickstart.txt
@@ -360,10 +360,10 @@ you wish to supply additional information, you may::
      :scale: 50
      :alt: alternate text
 
-See the full image directive documentation__ for more info.
+See the full `image directive documentation`__ for more info.
 
-__ ../../spec/rst/directives.html
-__ ../../spec/rst/directives.html#images
+__ ../../ref/rst/directives.html
+__ ../../ref/rst/directives.html#images
 
 
 What Next?
diff --git a/docutils/docutils/nodes.py b/docutils/docutils/nodes.py
index c5ccbadf8..10c93eded 100644
--- a/docutils/docutils/nodes.py
+++ b/docutils/docutils/nodes.py
@@ -18,7 +18,7 @@ is represented by abstract base classes (`Root`, `Structural`, `Body`,
 ``isinstance(node, base_class)`` to determine the position of the node in the
 hierarchy.
 
-.. _DTD: http://docutils.sourceforge.net/spec/docutils.dtd
+.. _DTD: http://docutils.sourceforge.net/docs/ref/docutils.dtd
 """
 
 __docformat__ = 'reStructuredText'
diff --git a/docutils/docutils/parsers/rst/directives/__init__.py b/docutils/docutils/parsers/rst/directives/__init__.py
index c2a1b5210..74ecc9984 100644
--- a/docutils/docutils/parsers/rst/directives/__init__.py
+++ b/docutils/docutils/parsers/rst/directives/__init__.py
@@ -74,7 +74,7 @@ empty list).
 See `Creating reStructuredText Directives`_ for more information.
 
 .. _Creating reStructuredText Directives:
-   http://docutils.sourceforge.net/spec/howto/rst-directives.html
+   http://docutils.sourceforge.net/docs/howto/rst-directives.html
 """
 
 __docformat__ = 'reStructuredText'
diff --git a/docutils/docutils/writers/docutils_xml.py b/docutils/docutils/writers/docutils_xml.py
index cc730d873..1b1164977 100644
--- a/docutils/docutils/writers/docutils_xml.py
+++ b/docutils/docutils/writers/docutils_xml.py
@@ -50,7 +50,7 @@ class Writer(writers.Writer):
     doctype = (
         '<!DOCTYPE document PUBLIC'
         ' "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML"'
-        ' "http://docutils.sourceforge.net/spec/docutils.dtd">\n')
+        ' "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
     generator = '<!-- Generated by Docutils %s -->\n'
 
     def translate(self):
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 eb18ebe8b..f38193c10 100644
--- a/docutils/test/test_readers/test_pep/test_inline_markup.py
+++ b/docutils/test/test_readers/test_pep/test_inline_markup.py
@@ -96,7 +96,7 @@ totest['miscellaneous'] = [
 For *completeness*, _`let's` ``test`` **other** forms_
 |of| `inline markup` [*]_.
 
-.. [*] See http://docutils.sf.net/spec/rst/reStructuredText.html.
+.. [*] See http://docutils.sf.net/docs/ref/rst/restructuredtext.html.
 """,
 """\
 <document source="test data">
@@ -128,8 +128,8 @@ For *completeness*, _`let's` ``test`` **other** forms_
     <footnote auto="*" id="id2">
         <paragraph>
             See \n\
-            <reference refuri="http://docutils.sf.net/spec/rst/reStructuredText.html">
-                http://docutils.sf.net/spec/rst/reStructuredText.html
+            <reference refuri="http://docutils.sf.net/docs/ref/rst/restructuredtext.html">
+                http://docutils.sf.net/docs/ref/rst/restructuredtext.html
             .
 """],
 ]
diff --git a/docutils/test/test_writers/test_docutils_xml.py b/docutils/test/test_writers/test_docutils_xml.py
index 277ceaccc..08219dc05 100644
--- a/docutils/test/test_writers/test_docutils_xml.py
+++ b/docutils/test/test_writers/test_docutils_xml.py
@@ -20,7 +20,7 @@ class DocutilsXMLTestCase(unittest.TestCase, docutils.SettingsSpec):
 
     input = 'Test\n====\n\nSubsection\n----------\n\nTest\n\n----------\n\nTest.'
     xmldecl = '<?xml version="1.0" encoding="iso-8859-1"?>\n'
-    doctypedecl = '<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/spec/docutils.dtd">\n'
+    doctypedecl = '<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n'
     generatedby = '<!-- Generated by Docutils %s -->\n' % docutils.__version__
     bodynormal = '<document id="test" name="test" source="&lt;string&gt;"><title>Test</title><subtitle id="subsection" name="subsection">Subsection</subtitle><paragraph>Test</paragraph><transition/><paragraph>Test.</paragraph></document>'
     bodynormal = '<document id="test" name="test" source="&lt;string&gt;"><title>Test</title><subtitle id="subsection" name="subsection">Subsection</subtitle><paragraph>Test</paragraph><transition/><paragraph>Test.</paragraph></document>'