From 34c0be50003a59efd5beda0ed49ff4f33b86b1fc Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 19 May 2015 08:05:04 +0200
Subject: [PATCH] Fix prior bad patch and reference to undefined variable

---
 docs/latex/external-references.tex | 1 -
 docs/manuals/en/main/basejob.tex   | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/latex/external-references.tex b/docs/latex/external-references.tex
index 11769895..758851cf 100644
--- 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 cea5653c..7429fa70 100644
--- 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}
-- 
2.39.5