fix

bareos · Dec 2, 2018 · 873e42c · 873e42c
1 parent 45fd033
commit 873e42c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/docs/manuals/en/new_main_reference/destfiles.txt b/docs/manuals/en/new_main_reference/destfiles.txt
@@ -15,13 +15,13 @@
 #chapter14/monitorconf.tex
 #chapter15/bconsole.tex
 #chapter16/restore.tex
-chapter17/disk.tex
+#chapter17/disk.tex
 #chapter17/recycling.tex
 #chapter18/pools.tex
 #chapter19/autochangers.tex
 #chapter20/tape-without-autochanger.tex
 #chapter21/spooling.tex
-#chapter22/migration.tex
+chapter22/migration.tex
 #chapter23/always-incremental.tex
 #chapter24/basejob.tex
 #chapter26/plugins.tex

diff --git a/docs/manuals/en/new_main_reference/post_conversion_changes.sh b/docs/manuals/en/new_main_reference/post_conversion_changes.sh
@@ -101,14 +101,20 @@ ${PERL} 's#item:#item-#g'   ${DESTFILE}
 
 # \package
 ${PERL} 's#:raw-latex:`\\package\{(.*?)\}`#**\1**#g'   ${DESTFILE}
+${PERL} 's#:raw-latex:`\\package\{(.*?)\}`#**\1**#g'   ${DESTFILE}
+
+${PERL} 's#:raw-latex:`\\volumestatus\{(.*?)\}`#**\1**#g'   ${DESTFILE}
+
 
+${PERL} 's#:raw-latex:`\\volumeparameter\{(.*?)\}\{(.*?)\}`#\1 = **\2**#g' ${DESTFILE}
 
 # remove nonsense lines
 ${PERL} 's#   .. raw:: latex##g'   ${DESTFILE}
 
 # \parameter
-perl -i  -pe 's#(\s+):raw-latex:`\\parameter\{(.*?)\}(\s*)`#\1               :option:`\2`\3#g' ${DESTFILE}
-perl -i -pe 's#(\s+)\\parameter\{(.*?)\}(\s*)#\1                  :option:`\2`\3#g' ${DESTFILE}
+${PERL} 's#(\s+):raw-latex:`\\parameter\{(.*?)\}(\s*)`#\1               :option:`\2`\3#g' ${DESTFILE}
+${PERL} 's#(\s+)\\parameter\{(.*?)\}(\s*)#\1                  :option:`\2`\3#g' ${DESTFILE}
+
 
 
 # sinceversion
@@ -129,6 +135,8 @@ ${PERL} 's#:raw-latex:`\\argument\{(.*?)\}`#:strong:`\1`#g' ${DESTFILE}
 #\dt
 ${PERL} 's#:raw-latex:`\\dt\{([A-Za-z ]*)\}`#:strong:`\1`\ #g' ${DESTFILE}
 
+${PERL} 's#:raw-latex:`\\dtYesNo`#:strong:`Yes|No`#g'  ${DESTFILE}
+
 #${PERL} 's#:raw-latex:`\\multicolumn\{[^}]*\}\{[^}]+\}\{([^}]*)\}`#:strong:`\1`\ #g' ${DESTFILE}
 
 
@@ -205,8 +213,8 @@ ${PERL} 's#:raw-latex:`\\resourcename\*\{(.*?)\}\{(.*?)\}\{(.*?)\}`#**\3**:sup:`
 
 
 
-${PERL} 's#:raw-latex:`\\job\{(.*)\}`#**\1**:sup:`Dir`:sub:`job`\ #g'   ${DESTFILE}
-${PERL} 's#:raw-latex:`\\pool\{(.*)\}`#**\1**:sup:`Dir`:sub:`pool`\ #g'   ${DESTFILE}
+${PERL} 's#:raw-latex:`\\job\{(.*?)\}`#**\1**:sup:`Dir`:sub:`job`\ #g'   ${DESTFILE}
+${PERL} 's#:raw-latex:`\\pool\{(.*?)\}`#**\1**:sup:`Dir`:sub:`pool`\ #g'   ${DESTFILE}
 
 ${PERL} 's#:raw-latex:`\\textbar`#|#g'   ${DESTFILE}