Reverse stomp on earlier changes

diff --git a/docs/manual/rpm-faq.tex b/docs/manual/rpm-faq.tex
index e08491c12298af5bcb1c1c75f42c45bde38c4db5..6f413b90e989e3c0b96d3c37c31db4ce5326009a 100644 (file)
--- a/docs/manual/rpm-faq.tex
+++ b/docs/manual/rpm-faq.tex
@@ -1,13 +1,10 @@
 %%
 %%
 
-\section*{Bacula\raisebox{.6ex}{{\footnotesize
-\textsuperscript{\textregistered}}} - RPM Packaging FAQ}
-\label{_ChapterStart34}
+\chapter{Bacula RPM Packaging FAQ}
+\label{RpmFaqChapter}
 \index[general]{FAQ!Bacula\textsuperscript{\textregistered} - RPM Packaging }
 \index[general]{Bacula\textsuperscript{\textregistered} - RPM Packaging FAQ }
-\addcontentsline{toc}{section}{Bacula\textsuperscript{\textregistered} - RPM
-Packaging FAQ}
 
 \begin{enumerate}
 \item 
@@ -22,7 +19,7 @@ Packaging FAQ}
    packages. Do I need to be root?}{faq4}  
 \item 
    \ilink{I'm building my own rpms but on all platforms and compiles I get an
-   unresolved dependancy for something called
+   unresolved dependency for something called
    /usr/afsws/bin/pagsh.}{faq5} 
 \item 
    \ilink{I'm building my own rpms because you don't publish for my platform.
@@ -33,24 +30,23 @@ Packaging FAQ}
    \ilink{I just upgraded from 1.36.x to 1.38.x and now my director daemon won't start. It appears to start but dies silently and I get a "connection refused" error when starting the console. What is wrong?}{faq8}  
 \end{enumerate}
 
-\subsection*{Answers}
+\section{Answers}
 \index[general]{Answers }
-\addcontentsline{toc}{subsection}{Answers}
 
 \begin{enumerate}
 \item 
    \label{faq1}
    {\bf How do I build Bacula for platform xxx?}
    The bacula spec file contains defines to build for several platforms:
-   RedHat 7.x (rh7), RedHat 8.0 (rh8), RedHat 9 (rh9), Fedora Core (fc1,
-   fc3, fc4, fc5, fc6), Whitebox Enterprise Linux 3.0 (wb3), Red Hat Enterprise Linux 
+   Red Hat 7.x (rh7), Red Hat 8.0 (rh8), Red Hat 9 (rh9), Fedora Core (fc1,
+   fc3, fc4, fc5), Whitebox Enterprise Linux 3.0 (wb3), Red Hat Enterprise Linux 
    (rhel3, rhel4), Mandrake 10.x (mdk), Mandriva 2006.x (mdv) CentOS (centos3, centos4) 
    and SuSE (su9, su10). The package build is controlled by a mandatory define set at 
    the beginning of the file.  These defines basically just control the 
    dependency information that gets coded into the finished rpm package as well 
    as any special configure options required.  The platform define may be edited 
    in the spec file directly (by default all defines are set to 0 or "not set").  
-   For example, to build the RedHat 7.x package find the line in the spec file
+   For example, to build the Red Hat 7.x package find the line in the spec file
    which reads
 
 \footnotesize
@@ -92,8 +88,6 @@ Alternately you may pass the define on the command line when calling rpmbuild:
         %define mysql 0
         OR
         %define mysql4 0
-       OR
-       %define mysql5 0
         
 \end{verbatim}
 \normalsize
@@ -105,8 +99,6 @@ to
         %define mysql 1
         OR
         %define mysql4 1
-       OR
-       %define mysql5 1
         
 \end{verbatim}
 \normalsize
@@ -117,7 +109,6 @@ in the spec file directly or pass it to rpmbuild on the command line:
 \begin{verbatim}
         rpmbuild -ba --define "build_rh7 1" --define "build_mysql 1" bacula.spec
         rpmbuild -ba --define "build_rh7 1" --define "build_mysql4 1" bacula.spec
-       rpmbuild -ba --define "build_rh7 1" --define "build_mysql5 1" bacula.spec
         
 \end{verbatim}
 \normalsize
@@ -167,7 +158,7 @@ and add the following line:
 \end{verbatim}
 \normalsize
 
-Another handy directive for the .rpmmacros file if you wish to supress the
+Another handy directive for the .rpmmacros file if you wish to suppress the
 creation of debug rpm packages is:
 
 \footnotesize
@@ -202,7 +193,7 @@ creation of debug rpm packages is:
    \label{faq7}
    {\bf Is there an easier way than sorting out all these command line options?} Yes, 
     there is a gui wizard shell script which you can use to rebuild the src rpm package. 
-   Look in the source archive for platforms/contrib-rpm/rpm_wizard.sh. This script will 
+   Look in the source archive for platforms/contrib-rpm/rpm\_wizard.sh. This script will 
    allow you to specify build options using gnome dialog screens. It requires zenity.
 
 \item 
@@ -212,8 +203,8 @@ creation of debug rpm packages is:
 \footnotesize
 \begin{verbatim}
         chown bacula.bacula /var/bacula/*
-       chown root.bacula /var/bacula/bacula-fd.9102.state
-       chown bacula.disk /var/bacula/bacula-sd.9103.state
+        chown root.bacula /var/bacula/bacula-fd.9102.state
+        chown bacula.disk /var/bacula/bacula-sd.9103.state
         
 \end{verbatim}
 \normalsize
@@ -253,13 +244,12 @@ For 64 bit support add '--define "build_x86_64 1"'
 \end{verbatim}
 \normalsize
 
-\subsection*{Build Options}
+\section{Build Options}
 \index[general]{Build Options}
-\addcontentsline{toc}{subsection}{Build Options}
 The spec file currently supports building on the following platforms:
 \footnotesize
 \begin{verbatim}
-RedHat builds
+Red Hat builds
 --define "build_rh7 1"
 --define "build_rh8 1"
 --define "build_rh9 1"
@@ -269,12 +259,11 @@ Fedora Core build
 --define "build_fc3 1"
 --define "build_fc4 1"
 --define "build_fc5 1"
---define "build_fc6 1"
 
 Whitebox Enterprise build
 --define "build_wb3 1"
 
-RedHat Enterprise builds
+Red Hat Enterprise builds
 --define "build_rhel3 1"
 --define "build_rhel4 1"
 
@@ -330,9 +319,8 @@ Modify the Packager tag for third party packages:
 \end{verbatim}
 \normalsize
 
-\subsection*{RPM Install Problems}
+\section{RPM Install Problems}
 \index[general]{RPM Install Problems}
-\addcontentsline{toc}{subsection}{RPM Install Options}
 In general the RPMs, once properly built should install correctly.
 However, when attempting to run the daemons, a number of problems
 can occur:
@@ -361,4 +349,3 @@ can occur:
   more information on devices.
 \end{itemize}
  
-