* Makefile.in: Skip validation in xmlto step.

* overview.sgml: Clarify language in "A brief history of Cygwin".

3 files changed, 20 insertions, 10 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 79d0e6305..194af8b76 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-26  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in: Skip validation in xmlto step.
+
+2010-01-26  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* overview.sgml: Clarify language in "A brief history of Cygwin".
+
 2010-01-26  Thomas Wolff  <towo@towo.net>
 
 	* new-features.sgml (ov-new1.7.2): Add console enhancements.
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 774628ac4..75f3e3b78 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -17,6 +17,8 @@ CC:=@CC@
 CC_FOR_TARGET:=@CC@
 exeext:=@build_exeext@
 
+XMLTO:=xmlto --skip-validation
+
 include $(srcdir)/../Makefile.common
 
 TOCLEAN:=faq.txt ./*.html readme.txt doctool.o doctool.exe *.junk \
@@ -44,13 +46,13 @@ clean:
 install:	all
 
 cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : cygwin-ug-net.sgml doctool
-	-xmlto html-nochunks -m $(srcdir)/cygwin.dsl $<
+	-${XMLTO} html-nochunks -m $(srcdir)/cygwin.dsl $<
 	-cp cygwin-ug-net.html cygwin-ug-net/cygwin-ug-net-nochunks.html
 	-rm -f cygwin-ug-net/cygwin-ug-net-nochunks.html.gz
 	-gzip cygwin-ug-net/cygwin-ug-net-nochunks.html
 
 cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.sgml doctool
-	-xmlto html -o cygwin-ug-net/ -m $(srcdir)/cygwin.dsl $<
+	-${XMLTO} html -o cygwin-ug-net/ -m $(srcdir)/cygwin.dsl $<
 
 # Some versions of jw hang with the -o option
 cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.sgml
@@ -60,7 +62,7 @@ cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile
 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
 
 cygwin-api/cygwin-api.html : cygwin-api.sgml
-	-xmlto html -o cygwin-api/ -m $(srcdir)/cygwin.dsl $<
+	-${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.dsl $<
 
 cygwin-api/cygwin-api.pdf : cygwin-api.sgml
 	-cd cygwin-api && docbook2pdf ../$<
@@ -69,11 +71,11 @@ cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile
 	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
 
 faq/faq.html : $(FAQ_SOURCES)
-	-xmlto html -o faq -m $(srcdir)/cygwin.dsl $(srcdir)/faq-sections.xml
+	-${XMLTO} html -o faq -m $(srcdir)/cygwin.dsl $(srcdir)/faq-sections.xml
 	-sed -i 's;</a><a name="id[0-9]*"></a>;</a>;g' faq/faq.*.html
 
 faq/faq-nochunks.html : $(FAQ_SOURCES)
-	-xmlto html -o faq -m $(srcdir)/cygwin.dsl $(srcdir)/faq.xml
+	-${XMLTO} html -o faq -m $(srcdir)/cygwin.dsl $(srcdir)/faq.xml
 	-sed -i 's;</a><a name="id[0-9]*"></a>;</a>;g' faq/faq-nochunks.html
 
 ./doctool : doctool.c
diff --git a/winsup/doc/overview.sgml b/winsup/doc/overview.sgml
index 0d521fe1e..4f7ef3a3e 100644
--- a/winsup/doc/overview.sgml
+++ b/winsup/doc/overview.sgml
@@ -84,16 +84,16 @@ new interface the Cygwin API. Once written, it was possible to build working
 Win32 tools using UNIX-hosted cross-compilers, linking against this
 library.</para>
 
-<para>From this point, we pursued the goal of producing native tools
+<para>From this point, we pursued the goal of producing Windows-hosted tools
 capable of rebuilding themselves under Windows 9x and NT (this is
 often called self-hosting). Since neither OS ships with standard UNIX
 user tools (fileutils, textutils, bash, etc...), we had to get the GNU
-equivalents working with the Cygwin API. Most of these tools were
+equivalents working with the Cygwin API. Many of these tools were
 previously only built natively so we had to modify their configure
 scripts to be compatible with cross-compilation. Other than the
 configuration changes, very few source-level changes had to be
-made. Running bash with the development tools and user tools in place,
-Windows 9x and NT look like a flavor of UNIX from the perspective of
+made since Cygwin provided a UNIX-like API. Running bash with the development tools and user tools in place,
+Windows 9x and NT looked like a flavor of UNIX from the perspective of
 the GNU configure mechanism. Self hosting was achieved as of the beta
 17.1 release in October 1996.</para>
 
@@ -101,7 +101,7 @@ the GNU configure mechanism. Self hosting was achieved as of the beta
 The entire Cygwin toolset was available as a monolithic install. In
 April 2000, the project announced a
 <ulink url="http://www.cygwin.com/ml/cygwin/2000-04/msg00269.html">
-New Cygwin Net Release</ulink> which provided the native Win32 program
+New Cygwin Net Release</ulink> which provided the native non-Cygwin Win32 program
 <command>setup.exe</command> to install and upgrade each package
 separately. Since then, the Cygwin DLL and <command>setup.exe</command> 
 have seen continuous development.