diff --git a/LDP/guide/docbook/LDP-Author-Guide/tools-word-processors.xml b/LDP/guide/docbook/LDP-Author-Guide/tools-word-processors.xml
index 5489449f..eb7525e9 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/tools-word-processors.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/tools-word-processors.xml
@@ -146,8 +146,6 @@ It took a while to find out 1.1 was a requirement for XML to work.
 	</para>
 
 	<para>
-
-	<para>
 During the install process I believe I was offered the choice to install
 the XML features.  I have a tendency to do full installs of my office
 programs, so I selected everything.
@@ -234,7 +232,7 @@ such editor.
 	</para>
 
 	<para>
-To validate the document, I used <guimenu>Tools --> <guimenuitem>XML
+To validate the document, I used <guimenu>Tools</guimenu> --> <guimenuitem>XML
 Filter Settings</guimenuitem>, then
 clicked the <guibutton>Test XSLTs</guibutton> button.  On my screen, I set up the XSLT
 for export to be <filename>ldp-html.xsl</filename>.	If you test and there are errors,
@@ -248,7 +246,7 @@ until they're gone.
 If you want to open a file to see the source instead of the processed
 results, go to <guimenu>Tools</guimenu> --> <guimenuitem>XML Filter
 Settings</guimenuitem> --> <guimenuitem>Test XSLTs</guimenuitem>, and then
-under the <menuchoice>Import</menuchoice> section, check the
+under the <guimenuitem>Import</guimenuitem> section, check the
 <guilabel>Display Source</guilabel> box.  My import XSLT
 is currently <filename>docbooktosoffheadings.xsl</filename> (the default) and the template
 for import is <filename>DocBookTemplate.stw</filename> (also default).
diff --git a/LDP/guide/docbook/LDP-Author-Guide/tools.xml b/LDP/guide/docbook/LDP-Author-Guide/tools.xml
index 30506039..ba2fda31 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/tools.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/tools.xml
@@ -46,14 +46,13 @@
 			pull in the ISOs
 		and make your own. Some packages are described in the
 		Release Notes, <ulink
-url="http://fedora.redhat.com/docs/release-notes/">http://fedora.redhat.com/docs/release-notes/</ulink>.
+url="http://fedora.redhat.com/docs/release-notes/" />.
 		</para>
 
 		<para> Installation instructions: none; use Red Hat 9
 		until they are written: <ulink
-url="http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/">
-		http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/</ulink>
-		<para> </listitem>
+url="http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/" />.
+		</para> </listitem>
 	</varlistentry>
 
 	<varlistentry> <term><filename>Mandrake</filename></term>
diff --git a/LDP/guide/docbook/LDP-Author-Guide/using-docbook.xml b/LDP/guide/docbook/LDP-Author-Guide/using-docbook.xml
index 95a04e14..0268f542 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/using-docbook.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/using-docbook.xml
@@ -490,15 +490,19 @@ structured data, by using querying languages for XML (XPath and XQuery).
 		There are likely as many ways of doing this as there are DocBook
 		authors; however, here are two ways that you might find useful.
 		Thanks to <ulink url="http://www.pratapgarh.com/appaji">Y Giridhar Appaji Nag</ulink>
-		<ulink url="http://www.wonderfrog.net">Martin Brown</ulink>
+		<ulink url="http://linux-ip.net/">Martin Brown</ulink>
 		for the markup used here.
 	</para>
 	<example id="example-markup-command-1">
 	<title>Command Prompt--Version One</title>
+	<screen>
 		  <sgmltag>programlisting</sgmltag>
 		  <sgmltag>prompt</sgmltag># <sgmltag class="endtag">prompt</sgmltag><sgmltag>userinput</sgmltag><sgmltag>command</sgmltag>cd<sgmltag class="endtag">command</sgmltag> /some/dir<sgmltag class="endtag">userinput</sgmltag>
 		  <sgmltag>prompt</sgmltag># <sgmltag class="endtag">prompt</sgmltag><sgmltag>userinput</sgmltag><sgmltag>command</sgmltag>ls<sgmltag class="endtag">command</sgmltag> -l<sgmltag class="endtag">userinput</sgmltag>
-		  <sgmltag class="endtag">programlisting<sgmltag>
+		  <sgmltag class="endtag">programlisting</sgmltag>
+	</screen>
+
+	<para>Displays as:</para>
 
   <programlisting>
   <prompt># </prompt><userinput><command>cd</command> /some/dir</userinput>
@@ -515,11 +519,12 @@ structured data, by using querying languages for XML (XPath and XQuery).
 		~/dir]$&lt;/prompt&gt;"&gt;
 	</para>
 
-	<note><para>
+	<para>
 		For more information about entities, read <xref
 		linkend="tools-entities" />.
-	</para></note>
+	</para>
 
+	<screen>
 		  <sgmltag>screen</sgmltag>
 		  <sgmltag>prompt</sgmltag>&amp;prompt; <sgmltag
 		  class="endtag">prompt</sgmltag><sgmltag>userinput</sgmltag>cd
@@ -527,7 +532,10 @@ structured data, by using querying languages for XML (XPath and XQuery).
 		  <sgmltag>prompt</sgmltag>&amp;prompt; <sgmltag
 		  class="endtag">prompt</sgmltag><sgmltag>userinput</sgmltag>ls
 		  -l<sgmltag class="endtag">userinput</sgmltag> <sgmltag
-		  class="endtag">screen<sgmltag>
+		  class="endtag">screen</sgmltag>
+	</screen>
+
+	<para>Displays as:</para>
 
   <screen> 
   <prompt>[user@machine ~/dir]$ </prompt><userinput>cd /some/dir</userinput>