Remove the generation of all documentation in one document.

documentation/Makefile.in

@@ -3,7 +3,6 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
-BOOKNAME  = wine-doc
 DB2HTML   = @DB2HTML@
 DB2PDF    = @DB2PDF@
 DB2PS     = @DB2PS@
@@ -83,10 +82,7 @@ html: $(ALLBOOKS:%=%/index.html)
 pdf: $(ALLBOOKS:%=%.pdf)
 ps: $(ALLBOOKS:%=%.ps)
 
-# this is the all-in-one book, not built by default
-wine-doc: wine-doc/index.html wine-doc.pdf wine-doc.ps
-
-.PHONY: everything doc html pdf ps wine-doc dist
+.PHONY: everything doc html pdf ps dist
 
 .SUFFIXES: .sgml /index.html .pdf .ps
 
@@ -103,7 +99,6 @@ wine-devel.pdf wine-devel.ps wine-devel/index.html: $(WINE_DEVEL_SRCS)
 wine-faq.pdf wine-faq.ps wine-faq/index.html: $(WINE_FAQ_SRCS)
 wine-user.pdf wine-user.ps wine-user/index.html: $(WINE_USER_SRCS)
 winelib-user.pdf winelib-user.ps winelib-user/index.html: $(WINELIB_USER_SRCS)
-wine-doc.pdf wine-doc.ps wine-doc/index.html: $(WINE_DOC_SRCS)
 
 wine.man: wine.man.in
 	sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || $(RM) $@
@@ -139,6 +134,6 @@ install-api-man::
 
 clean::
 	$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log wine-doc-*.tar.gz $(MAN_TARGETS)
-	$(RM) -r wine-doc $(ALLBOOKS) html api-guide man$(api_manext) *.junk DBTOHTML_OUTPUT_DIR*
+	$(RM) -r $(ALLBOOKS) html api-guide man$(api_manext) *.junk DBTOHTML_OUTPUT_DIR*
 
 ### Dependencies:

documentation/architecture.sgml

@@ -1029,6 +1029,6 @@ WSOCK32.DLL:	   32-bit sockets APIs
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/bugs.sgml

@@ -435,6 +435,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/build.sgml

@@ -6,6 +6,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/compiling.sgml

@@ -51,6 +51,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/configuring.sgml

@@ -3434,6 +3434,6 @@ export LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/consoles.sgml

@@ -181,6 +181,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/cvs-regression.sgml

@@ -156,6 +156,6 @@ cvs -d $CVSROOT update -D "2002-06-01 15:17:25 CST"
   <!-- Keep this comment at the end of the file
   Local variables:
   mode: sgml
-  sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+  sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
   End:
   -->

documentation/cvs.sgml

@@ -326,6 +326,6 @@ Direct access to the complete CVS tree is also possible, using Bill Fenner's
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/debugger.sgml

@@ -1731,6 +1731,6 @@ $ gdb wine
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/debugging.sgml

@@ -514,6 +514,6 @@ MSG( "Definition of drive %d is incorrect!\n", drive );
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/dlls.sgml

@@ -940,6 +940,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/documentation.sgml

@@ -1080,11 +1080,8 @@ BOOL WINAPI PathRelativePathToA(
                   single unit, you can place them all inside a set.
                   This is useful when you want to bundle up
                   documentation in alternate ways.  We do this with
-                  the Wine documentation, using a <sgmltag
-                  class="starttag">set</sgmltag> to put everything
-                  into a single directory (see
-                  <filename>documentation/wine-doc.sgml</filename>),
-                  and a <sgmltag class="starttag">book</sgmltag> to
+                  the Wine documentation, using 
+                  <sgmltag class="starttag">book</sgmltag> to
                   put each Wine guide into a separate directory (see
                   <filename>documentation/wine-devel.sgml</filename>,
                   etc.).
@@ -1737,6 +1734,6 @@ BOOL WINAPI PathRelativePathToA(
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/faq.sgml

@@ -1744,6 +1744,6 @@ rm -fR \[/path/\]Wine*
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "book" "part" "chapter" "")
 End:
 -->

documentation/fonts.sgml

@@ -499,6 +499,6 @@ FontPath "tcp/localhost:7100"
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/getting.sgml

@@ -700,6 +700,6 @@ iff</></>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/i18n.sgml

@@ -198,6 +198,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/implementation.sgml

@@ -530,6 +530,6 @@ EOF
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/installing.sgml

@@ -152,6 +152,6 @@ Password:
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/introduction.sgml

@@ -515,6 +515,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/make_winehq

@@ -38,12 +38,6 @@ echo "./db2html-winehq wine-faq.sgml"
 tar czf winedoc-html.tgz wine-user wine-devel winelib-user wine-faq
 cp winedoc-html.tgz "$WWWDIR"
 
-## Create one-book HTML tarball
-echo "./db2html-winehq wine-doc.sgml"
-./db2html-winehq wine-doc.sgml
-tar czf wine-set-html.tgz wine-doc
-cp wine-set-html.tgz "$WWWDIR"
-
 ## Create PostScript tarball
 echo "db2ps -d ./print.dsl wine-user.sgml"
 db2ps -d ./print.dsl wine-user.sgml > /dev/null 2>&1

documentation/multimedia.sgml

@@ -1297,6 +1297,6 @@ Kernel space |                    Client applications
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/ole.sgml

@@ -392,6 +392,6 @@ static ICOM_VTABLE(IDirect3D) d3dvt = {
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/opengl.sgml

@@ -454,6 +454,6 @@ gcc dummy.c -L/usr/local/lib -lwine -lopengl32
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/patches.sgml

@@ -214,6 +214,6 @@ code
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/porting.sgml

@@ -387,6 +387,6 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H))
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/printing.sgml

@@ -311,6 +311,6 @@ printer=on
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/running.sgml

@@ -742,6 +742,6 @@ winspool</><entry>wnet</><entry>x11</>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "chapter" "")
+sgml-parent-document:("wine-user.sgml" "set" "book" "chapter" "")
 End:
 -->

documentation/testing.sgml

@@ -520,6 +520,6 @@ ok ( GetLastError() == WIN9X_ERROR || GetLastError() == NT_ERROR, ...);
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/tools.sgml

@@ -89,6 +89,6 @@ bash-2.03# ../../tools/bin2res -d bin shres.rc
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "set" "book" "part" "chapter" "")
+sgml-parent-document:("wine-devel.sgml" "set" "book" "part" "chapter" "")
 End:
 -->

documentation/winelib-bindlls.sgml

@@ -304,6 +304,6 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c,
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->

documentation/winelib-intro.sgml

@@ -426,6 +426,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->

documentation/winelib-mfc.sgml

@@ -231,6 +231,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->

documentation/winelib-pkg.sgml

@@ -10,6 +10,6 @@
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->

documentation/winelib-porting.sgml

@@ -391,6 +391,6 @@ printf("Processor architecture=%d\n",si ANONS .wProcessorArchitecture);
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->

documentation/winelib-toolkit.sgml

@@ -942,6 +942,6 @@ ORDINAL forward EXPORTNAME SYMBOLNAME
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-parent-document:("wine-doc.sgml" "book" "chapter" "")
+sgml-parent-document:("winelib-user.sgml" "book" "chapter" "")
 End:
 -->