diff --git a/documentation/Makefile.in b/documentation/Makefile.in
index 203d01f1c16..40db5bb9391 100644
--- a/documentation/Makefile.in
+++ b/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:
diff --git a/documentation/architecture.sgml b/documentation/architecture.sgml
index a4cb11c5008..2ce26a162e4 100644
--- a/documentation/architecture.sgml
+++ b/documentation/architecture.sgml
@@ -1029,6 +1029,6 @@ WSOCK32.DLL: 32-bit sockets APIs
diff --git a/documentation/bugs.sgml b/documentation/bugs.sgml
index cb0ad43082b..5a56b0b7ce9 100644
--- a/documentation/bugs.sgml
+++ b/documentation/bugs.sgml
@@ -435,6 +435,6 @@
diff --git a/documentation/build.sgml b/documentation/build.sgml
index c380bed9170..5a4192781f0 100644
--- a/documentation/build.sgml
+++ b/documentation/build.sgml
@@ -6,6 +6,6 @@
diff --git a/documentation/compiling.sgml b/documentation/compiling.sgml
index bfa013e2d49..7dd767f600d 100644
--- a/documentation/compiling.sgml
+++ b/documentation/compiling.sgml
@@ -51,6 +51,6 @@
diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index 196581cd62c..a6496db9bb0 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -3434,6 +3434,6 @@ export LIB_ODBC_DRIVER_MANAGER=/usr/lib/libodbc.so.1.0.0
diff --git a/documentation/consoles.sgml b/documentation/consoles.sgml
index 8b2e2391555..cb31a669a0b 100644
--- a/documentation/consoles.sgml
+++ b/documentation/consoles.sgml
@@ -181,6 +181,6 @@
diff --git a/documentation/cvs-regression.sgml b/documentation/cvs-regression.sgml
index e5cd68bf9d6..a071aaa3f23 100644
--- a/documentation/cvs-regression.sgml
+++ b/documentation/cvs-regression.sgml
@@ -156,6 +156,6 @@ cvs -d $CVSROOT update -D "2002-06-01 15:17:25 CST"
diff --git a/documentation/cvs.sgml b/documentation/cvs.sgml
index 50fac40bc14..17a0cddf7e6 100644
--- a/documentation/cvs.sgml
+++ b/documentation/cvs.sgml
@@ -326,6 +326,6 @@ Direct access to the complete CVS tree is also possible, using Bill Fenner's
diff --git a/documentation/debugger.sgml b/documentation/debugger.sgml
index b60d54e1a5e..f36b4d719b4 100644
--- a/documentation/debugger.sgml
+++ b/documentation/debugger.sgml
@@ -1731,6 +1731,6 @@ $ gdb wine
diff --git a/documentation/debugging.sgml b/documentation/debugging.sgml
index 760b61a7bfa..528bb541f57 100644
--- a/documentation/debugging.sgml
+++ b/documentation/debugging.sgml
@@ -514,6 +514,6 @@ MSG( "Definition of drive %d is incorrect!\n", drive );
diff --git a/documentation/dlls.sgml b/documentation/dlls.sgml
index 0764ec20926..477b5f43aa3 100644
--- a/documentation/dlls.sgml
+++ b/documentation/dlls.sgml
@@ -940,6 +940,6 @@
diff --git a/documentation/documentation.sgml b/documentation/documentation.sgml
index ad7c782b890..33263f72500 100644
--- a/documentation/documentation.sgml
+++ b/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 set to put everything
- into a single directory (see
- documentation/wine-doc.sgml),
- and a book to
+ the Wine documentation, using
+ book to
put each Wine guide into a separate directory (see
documentation/wine-devel.sgml,
etc.).
@@ -1737,6 +1734,6 @@ BOOL WINAPI PathRelativePathToA(
diff --git a/documentation/faq.sgml b/documentation/faq.sgml
index 4c1079715bd..9688347ae1b 100644
--- a/documentation/faq.sgml
+++ b/documentation/faq.sgml
@@ -1744,6 +1744,6 @@ rm -fR \[/path/\]Wine*
diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml
index 9d4bb3e5d18..de55aac6ca8 100644
--- a/documentation/fonts.sgml
+++ b/documentation/fonts.sgml
@@ -499,6 +499,6 @@ FontPath "tcp/localhost:7100"
diff --git a/documentation/getting.sgml b/documentation/getting.sgml
index e77b7fb4293..b36dd4a14e0 100644
--- a/documentation/getting.sgml
+++ b/documentation/getting.sgml
@@ -700,6 +700,6 @@ iff
diff --git a/documentation/i18n.sgml b/documentation/i18n.sgml
index 3a9511cdf4f..7a0d8e831ff 100644
--- a/documentation/i18n.sgml
+++ b/documentation/i18n.sgml
@@ -198,6 +198,6 @@
diff --git a/documentation/implementation.sgml b/documentation/implementation.sgml
index 86a216c2db8..224f0db36d0 100644
--- a/documentation/implementation.sgml
+++ b/documentation/implementation.sgml
@@ -530,6 +530,6 @@ EOF
diff --git a/documentation/installing.sgml b/documentation/installing.sgml
index 6e42acc3c3e..f1a378e04a4 100644
--- a/documentation/installing.sgml
+++ b/documentation/installing.sgml
@@ -152,6 +152,6 @@ Password:
diff --git a/documentation/introduction.sgml b/documentation/introduction.sgml
index fbcad895c09..d8141b5ccfb 100644
--- a/documentation/introduction.sgml
+++ b/documentation/introduction.sgml
@@ -515,6 +515,6 @@
diff --git a/documentation/make_winehq b/documentation/make_winehq
index 02a43b65237..fec799b878e 100755
--- a/documentation/make_winehq
+++ b/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
diff --git a/documentation/multimedia.sgml b/documentation/multimedia.sgml
index d7068501d7c..bf763d56153 100644
--- a/documentation/multimedia.sgml
+++ b/documentation/multimedia.sgml
@@ -1297,6 +1297,6 @@ Kernel space | Client applications
diff --git a/documentation/ole.sgml b/documentation/ole.sgml
index 47d0f7e2798..c92989c5356 100644
--- a/documentation/ole.sgml
+++ b/documentation/ole.sgml
@@ -392,6 +392,6 @@ static ICOM_VTABLE(IDirect3D) d3dvt = {
diff --git a/documentation/opengl.sgml b/documentation/opengl.sgml
index 88dc0836364..712429d74e4 100644
--- a/documentation/opengl.sgml
+++ b/documentation/opengl.sgml
@@ -454,6 +454,6 @@ gcc dummy.c -L/usr/local/lib -lwine -lopengl32
diff --git a/documentation/patches.sgml b/documentation/patches.sgml
index 42c403eb11d..6d239a1d8b9 100644
--- a/documentation/patches.sgml
+++ b/documentation/patches.sgml
@@ -214,6 +214,6 @@ code
diff --git a/documentation/porting.sgml b/documentation/porting.sgml
index b185b1d9be9..603aa91a980 100644
--- a/documentation/porting.sgml
+++ b/documentation/porting.sgml
@@ -387,6 +387,6 @@ AC_CHECK_HEADER(foo.h, AC_DEFINE(HAVE_FOO_H))
diff --git a/documentation/printing.sgml b/documentation/printing.sgml
index 9d36543b042..7cef465d4c1 100644
--- a/documentation/printing.sgml
+++ b/documentation/printing.sgml
@@ -311,6 +311,6 @@ printer=on
diff --git a/documentation/running.sgml b/documentation/running.sgml
index a91da258227..41446d2992a 100644
--- a/documentation/running.sgml
+++ b/documentation/running.sgml
@@ -742,6 +742,6 @@ winspoolwnetx11
diff --git a/documentation/testing.sgml b/documentation/testing.sgml
index e62e0d4d646..2a3ce363580 100644
--- a/documentation/testing.sgml
+++ b/documentation/testing.sgml
@@ -520,6 +520,6 @@ ok ( GetLastError() == WIN9X_ERROR || GetLastError() == NT_ERROR, ...);
diff --git a/documentation/tools.sgml b/documentation/tools.sgml
index e81806b193f..df3ee71c7ea 100644
--- a/documentation/tools.sgml
+++ b/documentation/tools.sgml
@@ -89,6 +89,6 @@ bash-2.03# ../../tools/bin2res -d bin shres.rc
diff --git a/documentation/winelib-bindlls.sgml b/documentation/winelib-bindlls.sgml
index 200076f95ac..6635c028d38 100644
--- a/documentation/winelib-bindlls.sgml
+++ b/documentation/winelib-bindlls.sgml
@@ -304,6 +304,6 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c,
diff --git a/documentation/winelib-intro.sgml b/documentation/winelib-intro.sgml
index 421df497df4..1873fceafce 100644
--- a/documentation/winelib-intro.sgml
+++ b/documentation/winelib-intro.sgml
@@ -426,6 +426,6 @@
diff --git a/documentation/winelib-mfc.sgml b/documentation/winelib-mfc.sgml
index 47c8d737215..3d07071466c 100644
--- a/documentation/winelib-mfc.sgml
+++ b/documentation/winelib-mfc.sgml
@@ -231,6 +231,6 @@
diff --git a/documentation/winelib-pkg.sgml b/documentation/winelib-pkg.sgml
index 55024d7b345..a8a1167a7b4 100644
--- a/documentation/winelib-pkg.sgml
+++ b/documentation/winelib-pkg.sgml
@@ -10,6 +10,6 @@
diff --git a/documentation/winelib-porting.sgml b/documentation/winelib-porting.sgml
index e85f455632a..236253d5ade 100644
--- a/documentation/winelib-porting.sgml
+++ b/documentation/winelib-porting.sgml
@@ -391,6 +391,6 @@ printf("Processor architecture=%d\n",si ANONS .wProcessorArchitecture);
diff --git a/documentation/winelib-toolkit.sgml b/documentation/winelib-toolkit.sgml
index 94b7592f6e6..3546155a232 100644
--- a/documentation/winelib-toolkit.sgml
+++ b/documentation/winelib-toolkit.sgml
@@ -942,6 +942,6 @@ ORDINAL forward EXPORTNAME SYMBOLNAME