Add support for some more markup that had slipped in.

Fixed a typo in a comment.

diff --git a/Doc/tools/sgmlconv/conversion.xml b/Doc/tools/sgmlconv/conversion.xml
index 9df40e37528d05145eaa0688a9edef43c0dcba65..c2f9f0d9200e52d5bfd278d7a2b4813a40a779ef 100644 (file)
--- a/Doc/tools/sgmlconv/conversion.xml
+++ b/Doc/tools/sgmlconv/conversion.xml
@@ -38,6 +38,9 @@
     <attribute name="href" optional="yes"/>
     <content/>
     </macro>
+  <macro name="pep">
+    <attribute name="num"/>
+    </macro>
   <macro name="rfc">
     <attribute name="num"/>
     </macro>
@@ -455,6 +458,10 @@
     <!-- not used anywhere, but it's a standard LaTeXism -->
     <attribute name="spaces">visible</attribute>
     </environment>
+  <macro name="verbatiminput" ouptutname="input">
+    <attribute name="verbatim">yes</attribute>
+    <attribute name="source"/>
+    </macro>
 
   <!-- Table markup. -->
   <macro name="hline"/>
@@ -658,7 +665,10 @@
     <attribute name="token"/>
     <content/>
     </macro>
-  <macro name="token">
+  <macro name="token" outputname="grammartoken">
+    <content/>
+    </macro>
+  <macro name="grammartoken">
     <content/>
     </macro>
   <macro name="orgroup">
@@ -766,7 +776,7 @@
     </macro>
   <macro name="ulink">
     <!-- order of the parameters makes this difficult;
-         we'll need to fix it up tp <ulink href="...">...</ulink>
+         we'll need to fix it up to <ulink href="...">...</ulink>
          in docfixer.py.
       -->
     <child name="text"/>
@@ -831,6 +841,9 @@
   <macro name="textasciitilde" outputname="">
     <text>~</text>
     </macro>
+  <macro name="textbackslash" outputname="">
+    <text>\</text>
+    </macro>
   <macro name="textbar" outputname="">
     <text>|</text>
     </macro>