Fix prior bad patch and reference to undefined variable

diff --git a/docs/latex/external-references.tex b/docs/latex/external-references.tex
index 117698952007c7829e35135c3c0e95488236b55e..758851cf5d6a7b0ec1bd756d8368204116a4e23a 100644 (file)
--- a/docs/latex/external-references.tex
+++ b/docs/latex/external-references.tex
@@ -54,7 +54,6 @@
 \externaldocument[main-]{../main/bootstrap}
 \externaldocument[main-]{../main/autochangers}
 \externaldocument[main-]{../main/migration}
-\externaldocument[main-]{../main/images}
 \externaldocument[main-]{../main/supporteddrives}
 \externaldocument[main-]{../main/restore}
 \externaldocument[main-]{../main/postgresql}

diff --git a/docs/manuals/en/main/basejob.tex b/docs/manuals/en/main/basejob.tex
index cea5653cb3152e1626e643e8aae06b373015a43d..7429fa7093a1afb07b35072038747369cfb71ef1 100644 (file)
--- a/docs/manuals/en/main/basejob.tex
+++ b/docs/manuals/en/main/basejob.tex
@@ -79,7 +79,7 @@ that it will backup files based on the last backup time, which is more useful,
 because the mtime/ctime timestamps may differ on various Clients, causing
 unnecessary files to be backed up.
 
-\begin{lstlisting}
+\begin{verbatim}
   Job {
     Name = USR
     Level = Base
@@ -115,5 +115,4 @@ unnecessary files to be backed up.
       File = /usr
     }
   }
-\end{lstlisting}
->>>>>>> fdd23df... Add small note on BaseJobs and pruning
+\end{verbatim}