Commit two patches from Philippe to cleanup the manuals

[bacula/docs] / docs / manuals / en / main / restore.tex

diff --git a/docs/manuals/en/main/restore.tex b/docs/manuals/en/main/restore.tex
index 8481e0f166534a18061e3bd753580edb3f907820..8c1533fc5bcc5d148dc7ea5fe570686e5a8e0510 100644 (file)
--- a/docs/manuals/en/main/restore.tex
+++ b/docs/manuals/en/main/restore.tex
@@ -14,7 +14,7 @@ to restore files by automatically starting a job as you do with Backup,
 Verify, ... jobs.  However, in addition to the console restore command,
 there is a standalone program named {\bf bextract}, which also permits
 restoring files.  For more information on this program, please see the
-\ilink{Bacula Utility Programs}{bextract} chapter of this manual. We 
+\borgxrlink{bextract}{bextract}{utility}{command} in the \utilityman{}. We
 don't particularly recommend the {\bf bextract} program because it
 lacks many of the features of the normal Bacula restore, such as the 
 ability to restore Win32 files to Unix systems, and the ability to
@@ -25,7 +25,7 @@ You may also want to look at the {\bf bls} program in the same chapter,
 which allows you to list the contents of your Volumes.  Finally, if you
 have an old Volume that is no longer in the catalog, you can restore the
 catalog entries using the program named {\bf bscan}, documented in the same
-\ilink{Bacula Utility Programs}{bscan} chapter.
+\borgxrlink{bscan}{bscan}{utility}{command} in the \utilityman{}.
 
 In general, to restore a file or a set of files, you must run a {\bf restore}
 job. That is a job with {\bf Type = Restore}. As a consequence, you will need
@@ -714,22 +714,9 @@ You can use several expressions separated by a commas.
 
 \subsection*{Examples}
 
-\begin{tabular}{|c|c|c|l|}
-\hline
-Orignal filename & New filename & RegexWhere & Comments \\
-\hline
-\hline
-\texttt{c:/system.ini} & \texttt{c:/system.old.ini} & \texttt{/.ini\$/.old.ini/} & \$ matches end of name\\
-\hline
-\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{/prod/rect/,/pdata/rdata/} & uses two regexp\\
-\hline
-\texttt{/prod/u01/pdata/} & \texttt{/rect/u01/rdata}  & \texttt{!/prod/!/rect/!,/pdata/rdata/} & use \texttt{!} as separator\\
-\hline
-\texttt{C:/WINNT} & \texttt{d:/WINNT}  & \texttt{/c:/d:/i} & case insensitive pattern match \\
-\hline
-
-\end{tabular}
-
+\begin{small}
+\LTXtable{\linewidth}{table_regexp}
+\end{small}
 %\subsubsection{Using group}
 %
 %Like with Perl or Sed, you can make submatch with \texttt{()}, 
@@ -1143,7 +1130,7 @@ Bacula}{RescueChapter} chapter of this manual.
    Assuming the above does not resolve the problem, you will need to restore
    or rebuild your catalog.  Note, if it is a matter of some
    inconsistencies in the Bacula tables rather than a broken database, then
-   running \ilink{dbcheck}{dbcheck} might help, but you will need to ensure
+   running the \borgxrlink{dbcheck}{dbcheck}{utility}{command}\footnote{\utilityman{}} might help, but you will need to ensure
    that your database indexes are properly setup.  Please see
    the \ilink{Database Performance Issues}{DatabasePerformance} sections
    of this manual for more details.
@@ -1298,10 +1285,10 @@ FileIndex=1-1
 
 \item [Solution without a Job Listing]
    If you do not have a job listing, then it is a bit more difficult.
-   Either you use the \ilink{bscan}{bscan} program to scan the contents
+   Either you use the \borgxrlink{bscan}{bscan}{utility}{program} to scan the contents
    of your tape into a database, which can be very time consuming 
-   depending on the size of the tape, or you can use the \ilink{bls}{bls}
-   program to list everything on the tape, and reconstruct a bootstrap 
+   depending on the size of the tape, or you can use the \borgxrlink{bls}{bls}{utility}{program}
+   to list everything on the tape, and reconstruct a bootstrap 
    file from the bls listing for the file or files you want following
    the instructions given above.
 
@@ -1473,7 +1460,7 @@ There are basically three steps to take:
 \end{enumerate}
 
 When the above is complete, you can begin bscanning your Volumes. Please
-see the \ilink{bscan}{bscan} section of the Volume Utility Tools of this
-chapter for more details.
+see the \borgxrlink{bscan}{bscan}{utility}{section} of the \utilityman{}.
+
 
 \end{description}