Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Nov 28, 2018
1 parent 379e90c commit 8b03e83
Show file tree
Hide file tree
Showing 25 changed files with 382 additions and 375 deletions.
15 changes: 11 additions & 4 deletions docs/manuals/en/new_main_reference/replace.sh
Expand Up @@ -144,6 +144,12 @@ sed -i -E 's#:raw-latex:`\\resourcename\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`

perl -i -pe 's#:raw-latex:`\\argument\{(.*?)\}`#:strong:`\1`#g' *.rst

sed -i -E 's#:raw-latex:`\\job\{(.*)\}`#**\1**:sup:`Dir`:sub:`job`\ #g' *.rst
sed -i -E 's#:raw-latex:`\\pool\{(.*)\}`#**\1**:sup:`Dir`:sub:`pool`\ #g' *.rst





#\dt
perl -i -pe 's#:raw-latex:`\\dt\{([A-Za-z ]*)\}`#:strong:`\1`\ #g' *.rst
Expand All @@ -157,9 +163,9 @@ sed -i -E 's#:raw-latex:`\\linkResourceDirective\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**




perl -i -pe 's#:raw-latex:`\\host\{(.*?)\}`#:strong:`\1`#g' *.rst

# TODO: check if |xxxx| replace can be used
sed -i 's#:raw-latex:`\\fileStoragePath`#:file:`/var/lib/bareos/storage/`#g' *.rst
sed -i 's#:raw-latex:`\\scriptPathUnix`#:file:`/usr/lib/bareos/scripts/`#g' *.rst
sed -i 's#:raw-latex:`\\configPathUnix`#:file:`/etc/bareos/`#g' *.rst
Expand All @@ -179,15 +185,16 @@ sed -i 's#:raw-latex:`\\yeno`#yes\\|no#g' *.rst

sed -i -E 's|:raw-latex:`\\fileset\{(.*)\}`|**\1**|g' *.rst

# remove stuff that has no meaning anymore
sed -i 's#\\footnotesize##g' *.rst
sed -i 's#\\normalsize##g' *.rst
sed -i 's#\\hfill##g' *.rst


#
# DROP SOME STUFF WHICH IS NO LONGER NEEDED
#

#sed -i 's|:raw-latex:`\\footnotesize`||g' *.rst
#sed -i 's|:raw-latex:`\\normalsize`||g' *.rst
#sed -i 's|:raw-latex:`\\hfill`||g' *.rst
#
##
#
Expand Down
10 changes: 5 additions & 5 deletions docs/manuals/en/new_main_reference/source/always-incremental.rst
Expand Up @@ -180,7 +180,7 @@ Consolidate Job
is described later, see
:ref:`section-MaxFullConsolidations`.

The :raw-latex:`\job{Consolidate}` job evaluates all jobs configured
The **Consolidate**:sup:`Dir`:sub:`job` job evaluates all jobs configured
with
:raw-latex:`\linkResourceDirectiveValue{Dir}{Job}{Always Incremental}{yes}`.
When a job is selected for consolidation, all job runs are taken into
Expand Down Expand Up @@ -261,7 +261,7 @@ setup multiple storages.
Storage = File1
}
:raw-latex:`\pool{AI-Longterm}` is optional and will be explained in
**AI-Longterm**:sup:`Dir`:sub:`pool` is optional and will be explained in
:ref:`section-AlwaysIncrementalLongTermStorage`.

How it works
Expand Down Expand Up @@ -540,9 +540,9 @@ Copy Jobs
The configuration of archiving via copy job is simple, just configure a
copy job that copies over the latest full backup at that point in time.

As all full backups go into the :raw-latex:`\pool{AI-Consolidated}`, we
As all full backups go into the **AI-Consolidated**:sup:`Dir`:sub:`pool` , we
just copy all uncopied backups in the
:raw-latex:`\pool{AI-Consolidated}` to a longterm pool:
**AI-Consolidated**:sup:`Dir`:sub:`pool` to a longterm pool:



Expand Down Expand Up @@ -753,7 +753,7 @@ On remote machine:

- Add fileset which the client will be backed up.

- Add Pool with name :raw-latex:`\pool{transfer}` where the data will
- Add Pool with name **transfer**:sup:`Dir`:sub:`pool` where the data will
be written to.

- create job that will backup the remote client with the remote fileset
Expand Down

0 comments on commit 8b03e83

Please sign in to comment.