merged rev. 3094:3101 and 3102:HEAD from branches/multiple-ids to trunk

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

2 files changed, 6 insertions, 6 deletions

diff --git a/test/test_writers/test_docutils_xml.py b/test/test_writers/test_docutils_xml.py
index 08219dc05..26c842761 100755
--- a/test/test_writers/test_docutils_xml.py
+++ b/test/test_writers/test_docutils_xml.py
@@ -22,10 +22,10 @@ class DocutilsXMLTestCase(unittest.TestCase, docutils.SettingsSpec):
     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/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>'
-    bodynewlines = '<document id="test" name="test" source="&lt;string&gt;">\n<title>\nTest\n</title>\n<subtitle id="subsection" name="subsection">\nSubsection\n</subtitle>\n<paragraph>\nTest\n</paragraph>\n<transition/>\n<paragraph>\nTest.\n</paragraph>\n</document>\n'
-    bodyindents = '<document id="test" name="test" source="&lt;string&gt;">\n    <title>\n        Test\n    </title>\n    <subtitle id="subsection" name="subsection">\n        Subsection\n    </subtitle>\n    <paragraph>\n        Test\n    </paragraph>\n    <transition/>\n    <paragraph>\n        Test.\n    </paragraph>\n</document>\n'
+    bodynormal = '<document ids="test" names="test" source="&lt;string&gt;"><title>Test</title><subtitle ids="subsection" names="subsection">Subsection</subtitle><paragraph>Test</paragraph><transition/><paragraph>Test.</paragraph></document>'
+    bodynormal = '<document ids="test" names="test" source="&lt;string&gt;"><title>Test</title><subtitle ids="subsection" names="subsection">Subsection</subtitle><paragraph>Test</paragraph><transition/><paragraph>Test.</paragraph></document>'
+    bodynewlines = '<document ids="test" names="test" source="&lt;string&gt;">\n<title>\nTest\n</title>\n<subtitle ids="subsection" names="subsection">\nSubsection\n</subtitle>\n<paragraph>\nTest\n</paragraph>\n<transition/>\n<paragraph>\nTest.\n</paragraph>\n</document>\n'
+    bodyindents = '<document ids="test" names="test" source="&lt;string&gt;">\n    <title>\n        Test\n    </title>\n    <subtitle ids="subsection" names="subsection">\n        Subsection\n    </subtitle>\n    <paragraph>\n        Test\n    </paragraph>\n    <transition/>\n    <paragraph>\n        Test.\n    </paragraph>\n</document>\n'
 
     settings_default_overrides = {'_disable_config': 1}
 
diff --git a/test/test_writers/test_pseudoxml.py b/test/test_writers/test_pseudoxml.py
index c9679a1c6..66bfef480 100755
--- a/test/test_writers/test_pseudoxml.py
+++ b/test/test_writers/test_pseudoxml.py
@@ -38,7 +38,7 @@ Foo.
 """,
 # output
 """\
-<document id="this-is-the-title" name="this is the title" source="<string>">
+<document ids="this-is-the-title" names="this is the title" source="<string>">
     <title>
         This is the title
     <paragraph>
@@ -46,7 +46,7 @@ Foo.
     <transition>
     <paragraph>
         This is another paragraph.
-    <section id="a-subsection" name="a subsection">
+    <section ids="a-subsection" names="a subsection">
         <title>
             A subsection
         <paragraph>