2004-01-24 Joshua Daniel Franklin <joshuadfranklin@yahoo.com>

	* cygwinenv.sgml: Cleanup minor markup problems.
	* dll.sgml: Cleanup minor markup problems.
	* effectively.sgml: Cleanup minor markup problems.
	* gcc.sgml: Cleanup minor markup problems.
	* ntsec.sgml: Cleanup minor markup problems.
	* pathnames.sgml: Cleanup minor markup problems.
	* setup-net.sgml: Cleanup minor markup problems.
	* textbinary.sgml: Cleanup minor markup problems.
	* windres.sgml: Cleanup minor markup problems.

10 files changed, 35 insertions, 8 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index cb1909fab..8b6929ebe 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-24  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
+	* cygwinenv.sgml: Cleanup minor markup problems.
+	* dll.sgml: Cleanup minor markup problems.
+	* effectively.sgml: Cleanup minor markup problems.
+	* gcc.sgml: Cleanup minor markup problems.
+	* ntsec.sgml: Cleanup minor markup problems.
+	* pathnames.sgml: Cleanup minor markup problems.
+	* setup-net.sgml: Cleanup minor markup problems.
+	* textbinary.sgml: Cleanup minor markup problems.
+	* windres.sgml: Cleanup minor markup problems.
+
 2004-01-20  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
 
 	* Makefile.in: Remove unused cygwin-ug and cygwin-api-int 
diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
index 439a22169..ae9563a72 100644
--- a/winsup/doc/cygwinenv.sgml
+++ b/winsup/doc/cygwinenv.sgml
@@ -65,6 +65,7 @@ originally encoded in the firmware of IBM PCs by original
 equipment manufacturers (OEMs).  If you find that some characters 
 (especially non-US or 'graphical' ones) do not display correctly in 
 Cygwin, you can use this option to select an appropriate codepage.
+</para>
 </listitem>
 
 <listitem>
@@ -92,6 +93,7 @@ to copy memory some number of bytes at a time, in the above example
 32768 bytes (32Kb) at a time. The default is to copy as many bytes as 
 possible, which is preferable in most cases but may slow some older systems
 down.
+</para>
 </listitem>
 <listitem>
 <para><envar>(no)glob[:ignorecase]</envar> - if set, command line arguments
diff --git a/winsup/doc/dll.sgml b/winsup/doc/dll.sgml
index a44129b3c..803469367 100644
--- a/winsup/doc/dll.sgml
+++ b/winsup/doc/dll.sgml
@@ -36,6 +36,7 @@ information needed to tell the OS how your program interacts with
 capabilities. To begin an exploration of the many additional options,
 see the gcc documentation and website, currently at 
 <ulink URL="http://gcc.gnu.org/">http://gcc.gnu.org/</ulink>
+</para>
 
 <para>Let's go through a simple example of how to build a dll.
 For this example, we'll use a single file
diff --git a/winsup/doc/effectively.sgml b/winsup/doc/effectively.sgml
index 59ab01ffb..3812bf3e3 100644
--- a/winsup/doc/effectively.sgml
+++ b/winsup/doc/effectively.sgml
@@ -144,6 +144,7 @@ endings, but <systemitem>cygutils</systemitem> provides several dedicated progra
 <command>u2d</command>, and <command>unix2dos</command>. Use the
 <literal>--help</literal> switch for usage information. 
 </para>
+</sect2>
 
 <sect2><title>Creating shortcuts with cygutils</title>
 <para>
diff --git a/winsup/doc/gcc.sgml b/winsup/doc/gcc.sgml
index a67865de3..f1d5431b7 100644
--- a/winsup/doc/gcc.sgml
+++ b/winsup/doc/gcc.sgml
@@ -44,11 +44,13 @@ and like any other Cygwin makefile.  The only difference is that you use
 application instead of a command-line application.  Here's an example:</para>
 
 <screen>
+<![CDATA[
 myapp.exe : myapp.o myapp.res
 	gcc -mwindows myapp.o myapp.res -o $@
 
 myapp.res : myapp.rc resource.h
 	windres $< -O coff -o $@
+]]>
 </screen>
 
 <para>Note the use of <filename>windres</filename> to compile the
diff --git a/winsup/doc/ntsec.sgml b/winsup/doc/ntsec.sgml
index 0a5fe42a8..9cbd0bb06 100644
--- a/winsup/doc/ntsec.sgml
+++ b/winsup/doc/ntsec.sgml
@@ -605,11 +605,11 @@ anymore. Porting a <command>setuid</command> application is illustrated by
 a short example:</para>
 
 <screen>
-
+<![CDATA[
 /* First include all needed cygwin stuff. */
 #ifdef __CYGWIN__
-#include &lt;windows.h&gt;
-#include &lt;sys/cygwin.h&gt;
+#include <windows.h>
+#include <sys/cygwin.h>
 /* Use the following define to determine the Windows version */
 #define is_winnt        (GetVersion() < 0x80000000)
 #endif
@@ -641,16 +641,17 @@ a short example:</para>
     /* Use standard method for W9X as well. */
     hashed_password = crypt (cleartext_password, salt);
     if (!user_pwd_entry ||
-        strcmp (hashed_password, user_pwd_entry-&gt;pw_password))
+        strcmp (hashed_password, user_pwd_entry->pw_password))
       error_exit;
 
 [...]
 
   /* Everything else remains the same! */
 
-  setegid (user_pwd_entry-&gt;pw_gid);
-  seteuid (user_pwd_entry-&gt;pw_uid);
+  setegid (user_pwd_entry->pw_gid);
+  seteuid (user_pwd_entry->pw_uid);
   execl ("/bin/sh", ...);
+]]>
 
 </screen>
 
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
index 56a5f7d69..61e374f08 100644
--- a/winsup/doc/pathnames.sgml
+++ b/winsup/doc/pathnames.sgml
@@ -154,7 +154,7 @@ default printer with the command <command>cat filename > PRN</command>
 
 </sect2>
 
-<sect2> <Title>POSIX devices</title>
+<sect2> <title>POSIX devices</title>
 <para>There is no need to create a POSIX <filename>/dev</filename> 
 directory as it is simulated within Cygwin automatically.
 It supports the following devices: <filename>/dev/null</filename>,
diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml
index 0c0c4f461..f00756068 100644
--- a/winsup/doc/setup-net.sgml
+++ b/winsup/doc/setup-net.sgml
@@ -109,6 +109,7 @@ the cache is no longer necessary, but you may want to retain the
 packages as backups, for installing Cygwin to another system,
 or in case you need to reinstall a package.
 </para>
+</sect2>
 
 <sect2><title>Connection Method</title>
 <para>
diff --git a/winsup/doc/textbinary.sgml b/winsup/doc/textbinary.sgml
index a58bd0231..c561d030a 100644
--- a/winsup/doc/textbinary.sgml
+++ b/winsup/doc/textbinary.sgml
@@ -86,7 +86,7 @@ these shells the relevant value of <envar>CYGWIN</envar> is that at the time
 the shell was launched and not that at the time the program is executed.
 Non-Cygwin shells always pipe and redirect with binary mode. With
 non-Cygwin shells the commands <command> cat filename | program </command>
-and <command> program &lt filename </command> are not equivalent when
+and <command> program &lt; filename </command> are not equivalent when
 <filename>filename</filename> is on a text-mounted partition. </para>
 </listitem>
 </OrderedList>
@@ -98,22 +98,28 @@ from files by using the <command>tr</command> program, which can only write
 to standard output. 
 The script</para>
 <screen>
+<![CDATA[
 #!/bin/sh
 # Remove \r from the file given as argument
 tr -d '\r' < "$1" > "$1".nocr
+]]>
 </screen>
 <para> will not work on a text mounted systems because the \r will be 
 reintroduced on writing. However scripts such as </para>
 <screen>
+<![CDATA[
 #!/bin/sh
 # Remove \r from the file given as argument
 tr -d '\r' | gzip | gunzip > "$1".nocr
+]]>
 </screen>
 <para>and the .bat file</para>
 <screen>
+<![CDATA[
 REM Remove \r from the file given as argument
 @echo off
 tr -d \r < %1 > %1.nocr
+]]>
 </screen>
 <para> work fine. In the first case (assuming the pipes are binary)
 we rely on <command>gunzip</command> to set its output to binary mode,
diff --git a/winsup/doc/windres.sgml b/winsup/doc/windres.sgml
index 2d5410639..82c537dff 100644
--- a/winsup/doc/windres.sgml
+++ b/winsup/doc/windres.sgml
@@ -10,11 +10,13 @@ the Windows resource format for details.  Also, the
 Binutils manual.  Here's an example of using it in a project:</para>
 
 <screen>
+<![CDATA[
 myapp.exe : myapp.o myapp.res
 	gcc -mwindows myapp.o myapp.res -o $@
 
 myapp.res : myapp.rc resource.h
 	windres $< -O coff -o $@
+]]>
 </screen>