Skip to content

Commit

Permalink
current status
Browse files Browse the repository at this point in the history
  • Loading branch information
pstorz committed Nov 28, 2018
1 parent f590007 commit bd49fb1
Show file tree
Hide file tree
Showing 40 changed files with 430 additions and 428 deletions.
8 changes: 5 additions & 3 deletions docs/manuals/en/new_main_reference/replace.sh
Expand Up @@ -128,8 +128,6 @@ sed -i -E 's#:raw-latex:`\\directory\{(.*)\}`#:file:`\1`#g' *.rst



# clean empty :: at the start of line
sed -i -E 's#^::$##g' *.rst

#code blocks
# {commands}{get the process ID of a running Bareos daemon}
Expand Down Expand Up @@ -234,7 +232,8 @@ sed -i 's#:raw-latex:`\\configDirectoryFdUnix`#:file:`/etc/bareos/bareos-fd.d/`#
sed -i 's#:raw-latex:`\\configDirectoryBconsoleUnix`#:file:`/etc/bareos/bconsole.d/`#g' *.rst
sed -i 's#:raw-latex:`\\configDirectoryTrayMonitorUnix`#:file:`/etc/bareos/tray-monitor.d/`#g' *.rst
sed -i 's#:raw-latex:`\\logfileUnix`#:file:`/var/log/bareos/bareos.log`#g' *.rst
sed -i 's#:raw-latex:`\\yeno`#yes\\|no#g' *.rst
sed -i 's#:raw-latex:`\\yesno`#yes\\|no#g' *.rst
sed -i 's#:raw-latex:`\\NdmpBareos`#NDMP_BAREOS#g' *.rst



Expand All @@ -260,6 +259,9 @@ echo again warning
perl -i -0 -pe 's#:raw-latex:`\\warning\{(.*?)\}`#\n.. warning:: \n \1#ims' *.rst
perl -i -0 -pe 's#\\warning\{(.*?)\}#\n.. warning:: \n \1#ims' *.rst

echo clean empty ::
# clean empty :: at the start of line
perl -i -pe 's/\s+::$//g' *.rst
#
# DROP SOME STUFF WHICH IS NO LONGER NEEDED
#
Expand Down
26 changes: 13 additions & 13 deletions docs/manuals/en/new_main_reference/source/always-incremental.rst
Expand Up @@ -116,7 +116,7 @@ Always Incremental Backup Job
To configure a job to use Always Incremental Backup Scheme, following
configuration is required:


::

.. code-block:: sh
Expand Down Expand Up @@ -154,7 +154,7 @@ configuration is required:
Consolidate Job
~~~~~~~~~~~~~~~


::

.. code-block:: sh
Expand Down Expand Up @@ -207,7 +207,7 @@ For the Always Incremental Backup Scheme at least two storages are
needed. See :ref:`section-MultipleStorageDevices` how to
setup multiple storages.


::

.. code-block:: sh
Expand All @@ -226,7 +226,7 @@ setup multiple storages.
Next Pool = AI-Consolidated # consolidated jobs go to this pool
}
::

.. code-block:: sh
Expand All @@ -245,7 +245,7 @@ setup multiple storages.
Next Pool = AI-Longterm # copy jobs write to this pool
}
::

.. code-block:: sh
Expand Down Expand Up @@ -274,7 +274,7 @@ configured for always incremental Backup. The Backup itself is scheduled
every night to run as incremental backup, while the consolidation is
scheduled to run every day.


::

.. code-block:: sh
Expand All @@ -294,7 +294,7 @@ scheduled to run every day.
Full Backup Pool = AI-Consolidated
}
::

.. code-block:: sh
Expand Down Expand Up @@ -470,7 +470,7 @@ was introduced.
needs to be configured in the
:raw-latex:`\resourceDirectiveValue{Dir}{Job}{Type}{Consolidate}` job:


::

.. code-block:: sh
Expand Down Expand Up @@ -546,7 +546,7 @@ As all full backups go into the **AI-Consolidated**:sup:`Dir`:sub:`pool` , we
just copy all uncopied backups in the
**AI-Consolidated**:sup:`Dir`:sub:`pool` to a longterm pool:


::

.. code-block:: sh
Expand Down Expand Up @@ -576,7 +576,7 @@ Virtual Full Jobs
The alternative to Copy Jobs is creating a virtual Full Backup Job when
the data should be stored in a long-term pool.


::

.. code-block:: sh
Expand Down Expand Up @@ -656,7 +656,7 @@ incremental backup of the remote client.
Run the first backup but make sure that you choose the remote storage to
be used.


::

.. code-block:: sh
Expand All @@ -678,7 +678,7 @@ daemon.
List volumes shows that the volumes used still belong to the remote
storage:


::

.. code-block:: sh
Expand All @@ -696,7 +696,7 @@ storage:
Use :strong:`update volume` to set the right storage and
check with list volumes that it worked:


::

.. code-block:: sh
Expand Down

0 comments on commit bd49fb1

Please sign in to comment.