Fix PDF build

(This used to be commit 90042ce898b3acd4390baea58716362714e7edcb)

6 files changed, 83 insertions, 6 deletions

diff --git a/docs/docbook/configure b/docs/docbook/configure
index f668d8c2b6..d2f8c5b7e4 100755
--- a/docs/docbook/configure
+++ b/docs/docbook/configure
@@ -634,6 +634,76 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+# Extract the first word of "latex", so it can be a program name with args.
+set dummy latex; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:641: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_LATEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$LATEX" in
+  /*)
+  ac_cv_path_LATEX="$LATEX" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_LATEX="$LATEX" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_LATEX="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+LATEX="$ac_cv_path_LATEX"
+if test -n "$LATEX"; then
+  echo "$ac_t""$LATEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+# Extract the first word of "dvips", so it can be a program name with args.
+set dummy dvips; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:676: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_DVIPS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$DVIPS" in
+  /*)
+  ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_DVIPS="$DVIPS" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_DVIPS="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+DVIPS="$ac_cv_path_DVIPS"
+if test -n "$DVIPS"; then
+  echo "$ac_t""$DVIPS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 
@@ -785,6 +855,8 @@ s%@mandir@%$mandir%g
 s%@XSLTPROC@%$XSLTPROC%g
 s%@PDFLATEX@%$PDFLATEX%g
 s%@XMLTO@%$XMLTO%g
+s%@LATEX@%$LATEX%g
+s%@DVIPS@%$DVIPS%g
 s%@DOC_BUILD_DATE@%$DOC_BUILD_DATE%g
 
 CEOF
diff --git a/docs/docbook/global.ent b/docs/docbook/global.ent
index 69924d7c94..d1bbf522dc 100644
--- a/docs/docbook/global.ent
+++ b/docs/docbook/global.ent
@@ -503,5 +503,4 @@ an Active Directory environment.
 <!ENTITY Further-Resources SYSTEM "projdoc/Further-Resources.xml">
 
 <!ENTITY not.implemented "<note><para>Currently NOT implemented.</para></note>">
-<!ENTITY not "<emphasis>NOT</emphasis>">
 <!ENTITY rootprompt "<prompt>root# </prompt>">
diff --git a/docs/docbook/projdoc/AccessControls.xml b/docs/docbook/projdoc/AccessControls.xml
index 6a56705a54..74269616aa 100644
--- a/docs/docbook/projdoc/AccessControls.xml
+++ b/docs/docbook/projdoc/AccessControls.xml
@@ -247,6 +247,8 @@ at how Samba helps to bridge the differences.
 	<para>
 	There are three basic operations for managing directories, <command>create, delete, rename</command>.
 	<table>
+		<title>Managing directories with unix and windows</title>
+		<tgroup align="center" cols="3">
 		<thead>
 		<row><entry>Action</entry><entry>MS Windows Command</entry><entry>Unix Command</entry></row>
 		</thead>
@@ -256,6 +258,7 @@ at how Samba helps to bridge the differences.
 			<row><entry>delete</entry><entry>rd folder</entry><entry>rmdir folder</entry></row>
 			<row><entry>rename</entry><entry>rename oldname newname</entry><entry>mv oldname newname</entry></row>
 		</tbody>
+	</tgroup>
 	</table>
 	</para>
 
diff --git a/docs/docbook/projdoc/CUPS-printing.xml b/docs/docbook/projdoc/CUPS-printing.xml
index 5c325c480f..25d1ac6139 100644
--- a/docs/docbook/projdoc/CUPS-printing.xml
+++ b/docs/docbook/projdoc/CUPS-printing.xml
@@ -361,7 +361,7 @@ spooler can do:
     printfiles from all client platforms in a uniform way;</para></listitem>
   <listitem><para>act as a central accounting and billing server, as all files are passed
     through the <command>pstops</command> Filter and are therefor logged in
-    the CUPS <filename>page&lowbar;log</filename>. - <emphasis>NOTE: </emphasis>this
+    the CUPS <filename>page_log</filename>. - <emphasis>NOTE: </emphasis>this
     can not happen with "raw" print jobs, which always remain unfiltered
     per definition;</para></listitem>
   <listitem><para>enable clients to consolidate on a single PostScript driver, even for
diff --git a/docs/docbook/projdoc/DOMAIN_MEMBER.xml b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
index bb8e95b8a9..83e33df9ee 100644
--- a/docs/docbook/projdoc/DOMAIN_MEMBER.xml
+++ b/docs/docbook/projdoc/DOMAIN_MEMBER.xml
@@ -453,13 +453,16 @@ to be fully trusted by it.
 <title>Joining an NT4 type Domain with Samba-3</title>
 
 <para>
-Assumptions:
-<table><tbody>
+<table><title>Assumptions</title>
+<tgroup align="left" cols="2">
+	<tbody>
 	<row><entry>NetBIOS name:</entry><entry>SERV1</entry></row>
 	<row><entry>Win2K/NT domain name:</entry><entry>DOM</entry></row>
 	<row><entry>Domain's PDC NetBIOS name:</entry><entry>DOMPDC</entry></row>
 	<row><entry>Domain's BDC NetBIOS names:</entry><entry>DOMBDC1 and DOMBDC2</entry></row>
-</tbody></table>
+</tbody>
+</tgroup>
+</table>
 </para>
 
 <para>
diff --git a/docs/docbook/projdoc/IntroSMB.xml b/docs/docbook/projdoc/IntroSMB.xml
index 38e40ae239..d5ce43fbdf 100644
--- a/docs/docbook/projdoc/IntroSMB.xml
+++ b/docs/docbook/projdoc/IntroSMB.xml
@@ -288,7 +288,7 @@ in case anyone asks.
 <!-- This really needs to go... -->
 
 <para>
-This chapter is Copyright &copy; 2003 David Lechnyr (david at lechnyr dot com).
+This chapter is Copyright 2003 David Lechnyr (david at lechnyr dot com).
 Permission is granted to copy, distribute and/or modify this document under the terms
 of the GNU Free Documentation License, Version 1.2 or any later version published by the Free
 Software Foundation. A copy of the license is available at http://www.gnu.org/licenses/fdl.txt.