summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2005-03-26 16:19:01 +0000
committerwiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2005-03-26 16:19:01 +0000
commitafbe093a2c1cd7235f78b9209add4155b22501b1 (patch)
tree45d68d227be2ecae344bcad6e3cd5185a6cfce30
parent46909fe0a13b5ae1a97e58c56a32153adda76202 (diff)
downloaddocutils-multiple-ids.tar.gz
updated documentation, renaming id to ids and name to namesmultiple-ids
git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/multiple-ids@3128 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/BUGS.txt24
-rw-r--r--docutils/docs/dev/rst/alternatives.txt8
-rw-r--r--docutils/docs/ref/doctree.txt44
-rw-r--r--docutils/docutils/transforms/frontmatter.py8
-rw-r--r--docutils/docutils/transforms/references.py8
5 files changed, 46 insertions, 46 deletions
diff --git a/docutils/BUGS.txt b/docutils/BUGS.txt
index b1e6dbb5c..2f036d24b 100644
--- a/docutils/BUGS.txt
+++ b/docutils/BUGS.txt
@@ -189,34 +189,34 @@ Also see the `SourceForge Bug Tracker`_.
> EOF
<document source="<stdin>">
<paragraph>
- ref
- <footnote_reference auto="1" id="id1" refid="abc">
+ ref
+ <footnote_reference auto="1" ids="id1" refid="abc">
2
-
- <footnote_reference auto="1" id="id2" refid="id5">
+
+ <footnote_reference auto="1" ids="id2" refid="id5">
3
-
- <footnote_reference id="id3" refid="id6">
+
+ <footnote_reference ids="id3" refid="id6">
1
-
- <footnote_reference auto="1" id="id4" refid="id7">
+
+ <footnote_reference auto="1" ids="id4" refid="id7">
5
- <footnote auto="1" backrefs="id1" id="abc" name="abc">
+ <footnote auto="1" backrefs="id1" ids="abc" names="abc">
<label>
2
<paragraph>
footnote
- <footnote auto="1" backrefs="id2" id="id5" name="3">
+ <footnote auto="1" backrefs="id2" ids="id5" names="3">
<label>
3
<paragraph>
two
- <footnote backrefs="id3" id="id6" name="1">
+ <footnote backrefs="id3" ids="id6" names="1">
<label>
1
<paragraph>
one
- <footnote auto="1" backrefs="id4" id="id7" name="4">
+ <footnote auto="1" backrefs="id4" ids="id7" names="4">
<label>
5
<paragraph>
diff --git a/docutils/docs/dev/rst/alternatives.txt b/docutils/docs/dev/rst/alternatives.txt
index 08ef5297b..014a2458c 100644
--- a/docutils/docs/dev/rst/alternatives.txt
+++ b/docutils/docs/dev/rst/alternatives.txt
@@ -1165,7 +1165,7 @@ start of a new "division". Before implementation, the parsed document
tree would be::
<document>
- <section name="document">
+ <section names="document">
<title>
Document
<paragraph>
@@ -1181,7 +1181,7 @@ There are several possibilities for the implementation:
try at an implementation looked like this::
<document>
- <section name="document">
+ <section names="document">
<title>
Document
<paragraph>
@@ -1199,7 +1199,7 @@ There are several possibilities for the implementation:
possibility::
<document>
- <section name="document">
+ <section names="document">
<title>
Document
<division>
@@ -1220,7 +1220,7 @@ There are several possibilities for the implementation:
3. Implement them as "transitions", empty elements::
<document>
- <section name="document">
+ <section names="document">
<title>
Document
<paragraph>
diff --git a/docutils/docs/ref/doctree.txt b/docutils/docs/ref/doctree.txt
index 43ce91d33..dc19bdff3 100644
--- a/docutils/docs/ref/doctree.txt
+++ b/docutils/docs/ref/doctree.txt
@@ -264,7 +264,7 @@ following subsections:
- Real XML::
<document>
- <section id="a-title" name="a title">
+ <section ids="a-title" names="a title">
<title>A Title</title>
<paragraph>A paragraph.</paragraph>
</section>
@@ -273,7 +273,7 @@ following subsections:
- Pseudo-XML::
<document>
- <section id="a-title" name="a title">
+ <section ids="a-title" names="a title">
<title>
A Title
<paragraph>
@@ -359,7 +359,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -559,7 +559,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -625,7 +625,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -1016,7 +1016,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -1082,7 +1082,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -1210,7 +1210,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -1617,7 +1617,7 @@ into a ``docinfo`` element and its children by a transform. Source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="docinfo-example" name="docinfo example">
+ <document ids="docinfo-example" names="docinfo example">
<title>
Docinfo Example
<docinfo>
@@ -1794,7 +1794,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result from simple parsing::
<document>
- <section id="a-title" name="a title">
+ <section ids="a-title" names="a title">
<title>
A Title
<paragraph>
@@ -1803,7 +1803,7 @@ Complete pseudo-XML_ result from simple parsing::
After applying transforms, the section title is promoted to become the
document title::
- <document id="a-title" name="a title">
+ <document ids="a-title" names="a title">
<title>
A Title
<paragraph>
@@ -3221,7 +3221,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -3371,7 +3371,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -3479,22 +3479,22 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing::
<document>
- <section id="title-1" name="title 1">
+ <section ids="title-1" names="title 1">
<title>
Title 1
<paragraph>
Paragraph 1.
- <section id="title-2" name="title 2">
+ <section ids="title-2" names="title 2">
<title>
Title 2
<paragraph>
Paragraph 2.
- <section id="title-3" name="title 3">
+ <section ids="title-3" names="title 3">
<title>
Title 3
<paragraph>
Paragraph 3.
- <section id="title-4" name="title 4">
+ <section ids="title-4" names="title 4">
<title>
Title 4
<paragraph>
@@ -3638,7 +3638,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
@@ -3728,10 +3728,10 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="title" name="title">
+ <document ids="title" names="title">
<title>
Title
- <subtitle id="subtitle" name="subtitle">
+ <subtitle ids="subtitle" names="subtitle">
Subtitle
<paragraph>
A paragraph.
@@ -3946,7 +3946,7 @@ reStructuredText_ source::
Pseudo-XML_ fragment from simple parsing::
- <section id="a-title" name="a title">
+ <section ids="a-title" names="a title">
<title>
A Title
<paragraph>
@@ -4170,7 +4170,7 @@ reStructuredText_ source::
Complete pseudo-XML_ result after parsing and applying transforms::
- <document id="document-title" name="document title">
+ <document ids="document-title" names="document title">
<title>
Document Title
<docinfo>
diff --git a/docutils/docutils/transforms/frontmatter.py b/docutils/docutils/transforms/frontmatter.py
index 1746e22e6..8a5581313 100644
--- a/docutils/docutils/transforms/frontmatter.py
+++ b/docutils/docutils/transforms/frontmatter.py
@@ -50,7 +50,7 @@ class DocTitle(Transform):
Once parsed, it looks like this::
<document>
- <section name="top-level title">
+ <section names="top-level title">
<title>
Top-Level Title
<paragraph>
@@ -58,7 +58,7 @@ class DocTitle(Transform):
After running the DocTitle transform, we have::
- <document name="top-level title">
+ <document names="top-level title">
<title>
Top-Level Title
<paragraph>
@@ -85,10 +85,10 @@ class DocTitle(Transform):
After parsing and running the Section Promotion transform, the
result is::
- <document name="top-level title">
+ <document names="top-level title">
<title>
Top-Level Title
- <subtitle name="second-level title">
+ <subtitle names="second-level title">
Second-Level Title
<paragraph>
A paragraph.
diff --git a/docutils/docutils/transforms/references.py b/docutils/docutils/transforms/references.py
index 33814a9cc..80bafbf2a 100644
--- a/docutils/docutils/transforms/references.py
+++ b/docutils/docutils/transforms/references.py
@@ -97,8 +97,8 @@ class AnonymousHyperlinks(Transform):
internal
<reference anonymous="1">
external
- <target anonymous="1" id="id1">
- <target anonymous="1" id="id2" refuri="http://external">
+ <target anonymous="1" ids="id1">
+ <target anonymous="1" ids="id2" refuri="http://external">
Corresponding references are linked via "refid" or resolved via "refuri"::
@@ -107,8 +107,8 @@ class AnonymousHyperlinks(Transform):
text
<reference anonymous="1" refuri="http://external">
external
- <target anonymous="1" id="id1">
- <target anonymous="1" id="id2" refuri="http://external">
+ <target anonymous="1" ids="id1">
+ <target anonymous="1" ids="id2" refuri="http://external">
"""
default_priority = 440