diff --git a/docs/manuals/en/new_main_reference/replace.sh b/docs/manuals/en/new_main_reference/replace.sh
index 3a3aa8d2468..3460ade57c6 100755
--- a/docs/manuals/en/new_main_reference/replace.sh
+++ b/docs/manuals/en/new_main_reference/replace.sh
@@ -124,13 +124,20 @@ sed -i -E 's|:raw-latex:`\\parameter\{(.*)\}`|:option:`\1`|g' *.rst
# remove xml stuff
-sed -i -E 's#\\##g' *.rst
-sed -i -E 's#\\##g' *.rst
+perl -i -pe 's#\##g' *.rst
+perl -i -pe 's#\##g' *.rst
# resourcetype
-sed -i -E 's#:raw-latex:`\\resourcetype\{(.*)\}\{(.*)\}`#*\2*:sub:`\1`\ #g' *.rst
+sed -i -E 's#:raw-latex:`\\resourcetype\{(.*)\}\{(.*)\}`#:sup:`\1`\ :strong:`\2`#g' *.rst
+
+# \name
+sed -i -E 's#:raw-latex:`\\name\{(.*)\}`#**\1**#g' *.rst
+
+# resourcename
+
+sed -i -E 's#:raw-latex:`\\resourcename\{(.*)\}\{(.*)\}\{(.*)\}`#**\3**:sup:`\1`:sub:`\2`\ #g' *.rst
#
@@ -204,7 +211,6 @@ sed -i -E 's#:raw-latex:`\\resourcetype\{(.*)\}\{(.*)\}`#*\2*:sub:`\1`\ #g' *.rs
#sed -i -E 's|:raw-latex:`\\job\{(.*)\}`|**\1**|g' *.rst
#sed -i -E 's|:raw-latex:`\\fileset\{(.*)\}`|**\1**|g' *.rst
#
-#sed -i -E 's|:raw-latex:`\\name\{(.*)\}`|**\1**|g' *.rst
#
#sed -i -E 's|:raw-latex:`\\host\{(.*)\}`|**\1**|g' *.rst
#
diff --git a/docs/manuals/en/new_main_reference/source/always-incremental.rst b/docs/manuals/en/new_main_reference/source/always-incremental.rst
index c4250f7d2ee..11b0be2943b 100644
--- a/docs/manuals/en/new_main_reference/source/always-incremental.rst
+++ b/docs/manuals/en/new_main_reference/source/always-incremental.rst
@@ -682,7 +682,7 @@ storage:
.. code-block:: sh
:caption: list volumes
- *list volumes
+ *list volumes
.....
Pool: Full
+---------+------------+-----------+---------+----------+----------+--------------+---------+------+-----------+-----------+---------------------+-------------+
@@ -700,8 +700,8 @@ check with list volumes that it worked:
.. code-block:: sh
:caption: update volume
- *update volume=Full-0001 storage=File
- *list volumes
+ *update volume=Full-0001 storage=File
+ *list volumes
...
Pool: Full
+---------+------------+-----------+---------+----------+----------+--------------+---------+------+-----------+-----------+---------------------+---------+
diff --git a/docs/manuals/en/new_main_reference/source/autochangers.rst b/docs/manuals/en/new_main_reference/source/autochangers.rst
index 1761e1003a7..df235aa6518 100644
--- a/docs/manuals/en/new_main_reference/source/autochangers.rst
+++ b/docs/manuals/en/new_main_reference/source/autochangers.rst
@@ -1197,7 +1197,7 @@ run. A job definition for an admin job to do that may look like this:
}
}
-Replace :raw-latex:`\resourcename{Dir}{Storage}{Tape}` by the storage
+Replace **Tape**:sup:`Dir`:sub:`Storage` by the storage
name of your tape library. Use the highest
:raw-latex:`\linkResourceDirective{Dir}{Job}{Priority}` value to make
sure no other jobs are running. In the default configuration for
diff --git a/docs/manuals/en/new_main_reference/source/bconsole.rst b/docs/manuals/en/new_main_reference/source/bconsole.rst
index 2b64e83489a..57d2e072bff 100644
--- a/docs/manuals/en/new_main_reference/source/bconsole.rst
+++ b/docs/manuals/en/new_main_reference/source/bconsole.rst
@@ -690,14 +690,14 @@ configure
.. code-block:: sh
:caption: Example: adding a client and a job resource during runtime
- *configure add client name=client2-fd address=192.168.0.2 password=secret
+ *configure add client name=client2-fd address=192.168.0.2 password=secret
Created resource config file "/etc/bareos/bareos-dir.d/client/client2-fd.conf":
Client {
Name = client2-fd
Address = 192.168.0.2
Password = secret
}
- *configure add job name=client2-job client=client2-fd jobdefs=DefaultJob
+ *configure add job name=client2-job client=client2-fd jobdefs=DefaultJob
Created resource config file "/etc/bareos/bareos-dir.d/job/client2-job.conf":
Job {
Name = client2-job
@@ -715,7 +715,7 @@ configure
- :file:`/etc/bareos/bareos-dir-export/client/client2-fd/bareos-fd.d/director/bareos-dir.conf`
(assuming your director resource is named
- :raw-latex:`\name{bareos-dir}`)
+ **bareos-dir**)
-
@@ -744,7 +744,7 @@ configure
This command allows to export the
- *Director*:sub:`Fd` resource for clients
+ :sup:`Fd` :strong:`Director` resource for clients
already configured in the |bareosDir|.
Usage:
@@ -762,7 +762,7 @@ configure
Password = "[md5]932d1d3ef3c298047809119510f4bee6"
}
- To use it, copy the *Director*:sub:`Fd`
+ To use it, copy the :sup:`Fd` :strong:`Director`
resource file to the client machine (on Linux: to
:raw-latex:`\directory{/etc/bareos/bareos-fd.d/director/}`) and
restart the |bareosFd|.
@@ -1297,7 +1297,7 @@ list
.. code-block:: sh
:caption: list pools
- *list pools
+ *list pools
+------+---------+---------+---------+----------+-------------+
| PoId | Name | NumVols | MaxVols | PoolType | LabelFormat |
+------+---------+---------+---------+----------+-------------+
@@ -1341,7 +1341,7 @@ llist
.. code-block:: sh
:caption: llist pools
- *llist pools
+ *llist pools
PoolId: 1
Name: Default
NumVols: 0
@@ -1431,7 +1431,7 @@ move
.. code-block:: sh
:caption: move
- *move storage=TandbergT40 srcslots=32 dstslots=33
+ *move storage=TandbergT40 srcslots=32 dstslots=33
Connecting to Storage daemon TandbergT40 at bareos:9103 ...
3306 Issuing autochanger "slots" command.
Device "Drive-1" has 39 slots.
@@ -1517,7 +1517,7 @@ purge
.. code-block:: sh
:caption: purge example
- *purge volume action=truncate storage=File pool=Full
+ *purge volume action=truncate storage=File pool=Full
However, normally you should use the :raw-latex:`\bcommand{purge}{}`
command only to purge a volume from the catalog and use the
@@ -1542,13 +1542,13 @@ resolve
.. code-block:: sh
:caption: resolve example
- *resolve www.bareos.com
+ *resolve www.bareos.com
bareos-dir resolves www.bareos.com to host[ipv4:84.44.166.242]
- *resolve client=client1-fd www.bareos.com
+ *resolve client=client1-fd www.bareos.com
client1-fd resolves www.bareos.com to host[ipv4:84.44.166.242]
- *resolve storage=File www.bareos.com
+ *resolve storage=File www.bareos.com
bareos-sd resolves www.bareos.com to host[ipv4:84.44.166.242]
query
@@ -1850,7 +1850,7 @@ setdebug
.. code-block:: sh
:caption: set Director debug level to 100 and get messages written to his trace file
- *setdebug level=100 trace=1 dir
+ *setdebug level=100 trace=1 dir
level=100 trace=1 hangup=0 timestamp=0 tracefilename=/var/lib/bareos/bareos-dir.example.com.trace
setip
@@ -1986,7 +1986,7 @@ status
.. code-block:: sh
:caption: status storage
- *status storage=File
+ *status storage=File
Connecting to Storage daemon File at 192.168.68.112:8103
rufus-sd Version: 1.39.6 (24 March 2006) i686-pc-linux-gnu redhat (Stentz)
@@ -2032,7 +2032,7 @@ status
.. code-block:: sh
:caption: status storage
- *status storage=File
+ *status storage=File
...
Device status:
Autochanger "DDS-4-changer" with devices:
@@ -2070,7 +2070,7 @@ status
.. code-block:: sh
:caption: status scheduler
- *status scheduler
+ *status scheduler
Scheduler Jobs:
Schedule Jobs Triggered
@@ -2160,7 +2160,7 @@ status
.. code-block:: sh
:caption: status subscriptions
- *status subscriptions
+ *status subscriptions
Ok: available subscriptions: 8 (42/50) (used/total)
Also, the number of subscriptions is checked after every job. If the
diff --git a/docs/manuals/en/new_main_reference/source/catmaintenance.rst b/docs/manuals/en/new_main_reference/source/catmaintenance.rst
index f3c2f20f255..280baa20350 100644
--- a/docs/manuals/en/new_main_reference/source/catmaintenance.rst
+++ b/docs/manuals/en/new_main_reference/source/catmaintenance.rst
@@ -334,8 +334,8 @@ the database ``path:bareos``.
.. code-block:: sh
:caption: Verify Bareos database on PostgreSQL as Unix user bareos (bareos-13.2.3)
- root@linux:~# su - bareos -s /bin/sh
- bareos@linux:~# psql
+ root@linux:~# su - bareos -s /bin/sh
+ bareos@linux:~# psql
Welcome to psql 8.3.23, the PostgreSQL interactive terminal.
Type: \copyright for distribution terms
@@ -344,7 +344,7 @@ the database ``path:bareos``.
\g or terminate with semicolon to execute query
\q to quit
- bareos=> \dt
+ bareos=> \dt
List of relations
Schema | Name | Type | Owner
--------+------------------------+-------+----------
@@ -380,13 +380,13 @@ the database ``path:bareos``.
public | version | table | postgres
(30 rows)
- bareos=> select * from Version;
+ bareos=> select * from Version;
versionid
-----------
2002
(1 row)
- bareos=> \du
+ bareos=> \du
List of roles
Role name | Superuser | Create role | Create DB | Connections | Member of
---------------+-----------+-------------+-----------+-------------+-----------
@@ -394,7 +394,7 @@ the database ``path:bareos``.
postgres | yes | yes | yes | no limit | {}
(2 rows)
- bareos=> \dp
+ bareos=> \dp
Access privileges for database "bareos"
Schema | Name | Type | Access privileges
--------+-----------------------------------+----------+--------------------------------------
@@ -509,7 +509,7 @@ with the credentials of the database administrator:
[client]
host=localhost
user=root
- password=YourPasswordForAccessingMysqlAsRoot
+ password=YourPasswordForAccessingMysqlAsRoot
Alternatively you can specifiy your database password by adding it to
the file :file:`/etc/my.cnf`.
@@ -556,7 +556,7 @@ variable is given.
.. code-block:: sh
:caption: Setup Bareos catalog database
- export db_password=YourSecretPassword
+ export db_password=YourSecretPassword
/usr/lib/bareos/scripts/create_bareos_database
/usr/lib/bareos/scripts/make_bareos_tables
/usr/lib/bareos/scripts/grant_bareos_privileges
@@ -572,7 +572,7 @@ is used on SLES11):
.. code-block:: sh
:caption: Verify Bareos database on MySQL
- root@linux:~# mysql --user=bareos --password=YourSecretPassword bareos
+ root@linux:~# mysql --user=bareos --password=YourSecretPassword bareos
Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 162
Server version: 5.5.32 SUSE MySQL package
@@ -585,7 +585,7 @@ is used on SLES11):
Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
- mysql> show tables;
+ mysql> show tables;
+--------------------+
| Tables_in_bareos |
+--------------------+
@@ -622,7 +622,7 @@ is used on SLES11):
+--------------------+
30 rows in set (0.00 sec)
- mysql> describe Job;
+ mysql> describe Job;
+-----------------+---------------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra |
+-----------------+---------------------+------+-----+---------+----------------+
@@ -656,7 +656,7 @@ is used on SLES11):
+-----------------+---------------------+------+-----+---------+----------------+
27 rows in set (0,00 sec)
- mysql> select * from Version;
+ mysql> select * from Version;
+-----------+
| VersionId |
+-----------+
@@ -664,7 +664,7 @@ is used on SLES11):
+-----------+
1 row in set (0.00 sec)
- mysql> exit
+ mysql> exit
Bye
Modify database credentials
@@ -706,7 +706,7 @@ Rerun the Bareos grant script
.. code-block:: sh
:caption: Modify database privileges
- export db_password=MyNewSecretPassword
+ export db_password=MyNewSecretPassword
/usr/lib/bareos/scripts/grant_bareos_privileges
.. raw:: latex
@@ -722,7 +722,7 @@ Rerun the Bareos grant script
:caption: Show Bareos database users
mysql
- mysql> SELECT user,host,password FROM mysql.user WHERE user='bareos';
+ mysql> SELECT user,host,password FROM mysql.user WHERE user='bareos';
+--------+-----------+-------------------------------------------+
| user | host | password |
+--------+-----------+-------------------------------------------+
@@ -732,14 +732,14 @@ Rerun the Bareos grant script
+--------+-----------+-------------------------------------------+
3 rows in set (0.00 sec)
- mysql> UPDATE mysql.user SET Password=PASSWORD('MyNewSecretPassword') where User='bareos';
+ mysql> UPDATE mysql.user SET Password=PASSWORD('MyNewSecretPassword') where User='bareos';
Query OK, 3 rows affected (0.00 sec)
Rows matched: 3 Changed: 3 Warnings: 0
- mysql> FLUSH PRIVILEGES;
+ mysql> FLUSH PRIVILEGES;
Query OK, 0 rows affected (0.00 sec)
- mysql> SELECT user,host,password FROM mysql.user WHERE user='bareos';
+ mysql> SELECT user,host,password FROM mysql.user WHERE user='bareos';
+--------+-----------+-------------------------------------------+
| user | host | password |
+--------+-----------+-------------------------------------------+
@@ -777,11 +777,11 @@ The database is accessable by following command:
.. code-block:: sh
:caption: Verify Bareos database on Sqlite3 (bareos-13.2.3)
- sqlite3 /var/lib/bareos/bareos.db
+ sqlite3 /var/lib/bareos/bareos.db
SQLite version 3.7.6.3
Enter ".help" for instructions
Enter SQL statements terminated with a ";"
- sqlite> .tables
+ sqlite> .tables
BaseFiles Filename Media Pool
CDImages Job MediaType Quota
Client JobHisto NDMPJobEnvironment RestoreObject
@@ -790,7 +790,7 @@ The database is accessable by following command:
DeviceStats Location Path UnsavedFiles
File LocationLog PathHierarchy Version
FileSet Log PathVisibility
- sqlite> select * from Version;
+ sqlite> select * from Version;
2002
sqlite>
diff --git a/docs/manuals/en/new_main_reference/source/client-initiated-connection.rst b/docs/manuals/en/new_main_reference/source/client-initiated-connection.rst
index d26f56428e8..4aaf6a608b8 100644
--- a/docs/manuals/en/new_main_reference/source/client-initiated-connection.rst
+++ b/docs/manuals/en/new_main_reference/source/client-initiated-connection.rst
@@ -70,7 +70,7 @@ show all waiting connections:
.. code-block:: sh
:caption: show waiting client connections
- *status dir
+ *status dir
...
Client Initiated Connections (waiting for jobs):
Connect time Protocol Authenticated Name
@@ -106,7 +106,7 @@ adding the line
\configline{Append = "/var/log/bareos/bareos-fd.log" = all, !skipped, !restored}
to the default message resource
-:raw-latex:`\resourcename{Fd}{Messages}{Standard}`:
+**Standard**:sup:`Fd`:sub:`Messages` :
diff --git a/docs/manuals/en/new_main_reference/source/configure.rst b/docs/manuals/en/new_main_reference/source/configure.rst
index 839e44775d5..a78253dee2b 100644
--- a/docs/manuals/en/new_main_reference/source/configure.rst
+++ b/docs/manuals/en/new_main_reference/source/configure.rst
@@ -592,13 +592,13 @@ When naming resources, for some resource types naming conventions should
be applied:
Client
- names should be postfixed with :raw-latex:`\name{-fd}`
+ names should be postfixed with **-fd**
Storage
- names should be postfixed with :raw-latex:`\name{-sd}`
+ names should be postfixed with **-sd**
Director
- names should be postfixed with :raw-latex:`\name{-dir}`
+ names should be postfixed with **-dir**
These conventions helps a lot when reading log messages.
diff --git a/docs/manuals/en/new_main_reference/source/consoleconf.rst b/docs/manuals/en/new_main_reference/source/consoleconf.rst
index 9af25184b40..b4bf57d91a3 100644
--- a/docs/manuals/en/new_main_reference/source/consoleconf.rst
+++ b/docs/manuals/en/new_main_reference/source/consoleconf.rst
@@ -121,8 +121,8 @@ There are three different kinds of consoles, which the administrator or
user can use to interact with the Director. These three kinds of
consoles comprise three different security levels.
-- The first console type is an :raw-latex:`\name{admin}` or
- :raw-latex:`\name{anonymous}` or :raw-latex:`\name{default}` console,
+- The first console type is an **admin** or
+ **anonymous}` or :raw-latex:`\name{default** console,
which has full privileges. There is no console resource necessary for
this type since the password is specified in the Director resource.
Typically you would use this console only for administrators.
@@ -197,10 +197,10 @@ A Console configuration file might look like this:
With this configuration, the console program (e.g.
:program:`bconsole`) will try to connect to a
-|bareosDir| named :raw-latex:`\name{bareos.example.com-dir}`
+|bareosDir| named **bareos.example.com-dir**
at the network address :raw-latex:`\host{bareos.example.com}` and
authenticate to the admin console using the password
-:raw-latex:`\name{PASSWORD}`.
+**PASSWORD**.
.. _section-ConsoleAccessExample:
@@ -254,7 +254,7 @@ configuration (not directly accessible by the user), we define:
}
The user login into the Director from his Console will get logged in as
-:raw-latex:`\resourcename{Dir}{Console}{restricted-user}` and he will
+**restricted-user**:sup:`Dir`:sub:`Console` and he will
only be able to see or access a Job with the name
:raw-latex:`\resourcename*{Dir}{Job}{Restricted Client Save}`, a Client
with the name
@@ -303,7 +303,7 @@ on the Director:
}
The second Director referenced at
-:raw-latex:`\resourcename{Dir}{Director}{secondserver}` might look like
+**secondserver**:sup:`Dir`:sub:`Director` might look like
the following:
diff --git a/docs/manuals/en/new_main_reference/source/debug.rst b/docs/manuals/en/new_main_reference/source/debug.rst
index 4be59a6bd2a..aab1710d954 100644
--- a/docs/manuals/en/new_main_reference/source/debug.rst
+++ b/docs/manuals/en/new_main_reference/source/debug.rst
@@ -146,7 +146,7 @@ daemons, only the name changes), you would do the following:
:caption: run the Bareos Storage daemon in the debugger
gdb --args /usr/sbin/bareos-sd -f -s -d 200
- (gdb) run
+ (gdb) run
Parameter:
@@ -180,6 +180,6 @@ daemons, only the name changes), you would do the following:
.. code-block:: sh
:caption: run the Bareos Storage daemon in the debugger
- (gdb) thread apply all bt
+ (gdb) thread apply all bt
After that you can issue any debugging command.
diff --git a/docs/manuals/en/new_main_reference/source/disk.rst b/docs/manuals/en/new_main_reference/source/disk.rst
index 9de23c150bb..f3abe844cd7 100644
--- a/docs/manuals/en/new_main_reference/source/disk.rst
+++ b/docs/manuals/en/new_main_reference/source/disk.rst
@@ -188,8 +188,8 @@ autochanger magazine. For more information on this, please see the
:ref:`AutochangersChapter` chapter.
Automatic Volume labeling is enabled by making a change to both the
-*Pool*:sub:`Dir` resource and to the
-*Device*:sub:`Sd` resource shown above. In the case
+:sup:`Dir` :strong:`Pool` resource and to the
+:sup:`Sd` :strong:`Device` resource shown above. In the case
of the Pool resource, you must provide Bareos with a label format that
it will use to create new names. In the simplest form, the label format
is simply the Volume name, to which Bareos will append a four digit
@@ -343,7 +343,7 @@ Concurrent Disk Jobs
.. _`ConcurrentDiskJobs`: ConcurrentDiskJobs Above, we discussed how you
could have a single device named
-:raw-latex:`\resourcename{Sd}{Device}{FileBackup}` that writes to
+**FileBackup**:sup:`Sd`:sub:`Device` that writes to
volumes in :raw-latex:`\fileStoragePath`. You can, in fact, run multiple
concurrent jobs using the Storage definition given with this example,
and all the jobs will simultaneously write into the Volume that is being
@@ -579,7 +579,7 @@ Using Multiple Storage Devices
Bareos treats disk volumes similar to tape volumes as much as it can.
This means that you can only have a single Volume mounted at one time on
-a disk as defined in your *Device*:sub:`Sd`
+a disk as defined in your :sup:`Sd` :strong:`Device`
resource.
If you use Bareos without :ref:`section-DataSpooling`,
@@ -587,7 +587,7 @@ multiple concurrent backup jobs can be written to a Volume using
interleaving. However, interleaving has disadvantages, see
:ref:`section-Interleaving`.
-Also the *Device*:sub:`Sd` will be in use. If there
+Also the :sup:`Sd` :strong:`Device` will be in use. If there
are other jobs, requesting other Volumes, these jobs have to wait.
On a tape (or autochanger), this is a physical limitation of the
@@ -595,8 +595,8 @@ hardware. However, when using disk storage, this is only a limitation of
the software.
To enable Bareos to run concurrent jobs (on disk storage), define as
-many *Device*:sub:`Sd` as concurrent jobs should
-run. All these *Device*:sub:`Sd` s can use the same
+many :sup:`Sd` :strong:`Device` as concurrent jobs should
+run. All these :sup:`Sd` :strong:`Device`s can use the same
:raw-latex:`\linkResourceDirective{Sd}{Device}{Archive Device}`
directory. Set
:raw-latex:`\linkResourceDirective{Sd}{Device}{Maximum Concurrent Jobs}`
diff --git a/docs/manuals/en/new_main_reference/source/howto.rst b/docs/manuals/en/new_main_reference/source/howto.rst
index 1ed7e088d45..9cff34c0a46 100644
--- a/docs/manuals/en/new_main_reference/source/howto.rst
+++ b/docs/manuals/en/new_main_reference/source/howto.rst
@@ -170,7 +170,7 @@ Plugin Test
.. code-block:: sh
:caption: status client=mssqlserver-fd
- *status client=mssqlserver-fd
+ *status client=mssqlserver-fd
Connecting to Client mssqlserver-fd at 192.168.10.101:9102
mssqlserver-fd Version: 13.2.2 (12 November 2013) VSS Linux Cross-compile Win64
@@ -264,7 +264,7 @@ Here you can see an example for a backup:
.. code-block:: sh
:caption: run MSSQL backup job
- *run job=MSSQLBak
+ *run job=MSSQLBak
Using Catalog "MyCatalog"
Run Backup job
JobName: MSSQLBak
@@ -276,10 +276,10 @@ Here you can see an example for a backup:
Storage: File (From Job resource)
When: 2013-11-21 09:48:27
Priority: 10
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=7
You have no messages.
- *mess
+ *mess
21-Nov 09:48 bareos-dir JobId 7: Start Backup JobId 7, Job=MSSQLBak.2013-11-21_09.48.30_04
21-Nov 09:48 bareos-dir JobId 7: Using Device "FileStorage" to write.
21-Nov 09:49 bareos-sd JobId 7: Volume "test1" previously written, moving to end of data.
@@ -411,7 +411,7 @@ Example for a full restore:
.. code-block:: sh
:caption: restore MSSQL database
- *restore client=mssqlserver-fd
+ *restore client=mssqlserver-fd
Using Catalog "MyCatalog"
First you select one or more JobIds that contain files
@@ -433,7 +433,7 @@ Example for a full restore:
11: Enter a list of directories to restore for found JobIds
12: Select full restore to a specified Job date
13: Cancel
- Select item- (1-13): 5
+ Select item- (1-13): 5
Automatically selected FileSet: Mssql
+-------+-------+----------+-------------+---------------------+------------+
| JobId | Level | JobFiles | JobBytes | StartTime | VolumeName |
@@ -451,9 +451,9 @@ Example for a full restore:
Enter "done" to leave this mode.
cwd is: /
- $ mark *
+ $ mark *
1 file marked.
- $ done
+ $ done
Bootstrap records written to /var/lib/bareos/bareos-dir.restore.4.bsr
The job will require the following
@@ -470,7 +470,7 @@ Example for a full restore:
The defined Restore Job resources are:
1: RestoreMSSQL
2: RestoreFiles
- Select Restore Job (1-2): 1
+ Select Restore Job (1-2): 1
Using Catalog "MyCatalog"
Run Restore job
JobName: RestoreMSSQL
@@ -486,7 +486,7 @@ Example for a full restore:
Catalog: MyCatalog
Priority: 10
Plugin Options: *None*
- OK to run? (yes/mod/no): mod
+ OK to run? (yes/mod/no): mod
Parameters to modify:
1: Level
2: Storage
@@ -502,8 +502,8 @@ Example for a full restore:
12: Replace
13: JobId
14: Plugin Options
- Select parameter to modify (1-14): 14
- Please enter Plugin Options string: mssqlvdi:instance=default:database=myDatabase:replace=yes
+ Select parameter to modify (1-14): 14
+ Please enter Plugin Options string: mssqlvdi:instance=default:database=myDatabase:replace=yes
Run Restore job
JobName: RestoreMSSQL
Bootstrap: /var/lib/bareos/bareos-dir.restore.4.bsr
@@ -518,10 +518,10 @@ Example for a full restore:
Catalog: MyCatalog
Priority: 10
Plugin Options: mssqlvdi:instance=default:database=myDatabase:replace=yes
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=10
You have messages.
- *mess
+ *mess
21-Nov 17:12 bareos-dir JobId 10: Start Restore Job RestoreMSSQL.2013-11-21_17.12.26_11
21-Nov 17:12 bareos-dir JobId 10: Using Device "FileStorage" to read.
21-Nov 17:13 damorgan-sd JobId 10: Ready to read from volume "test1" on device "FileStorage" (/storage).
@@ -592,7 +592,7 @@ incremental backup with a replace of the original database:
.. code-block:: sh
:caption: restore MSSQL database chain
- *restore client=mssqlserver-fd
+ *restore client=mssqlserver-fd
First you select one or more JobIds that contain files
to be restored. You will be presented several methods
@@ -613,7 +613,7 @@ incremental backup with a replace of the original database:
11: Enter a list of directories to restore for found JobIds
12: Select full restore to a specified Job date
13: Cancel
- Select item- (1-13): 5
+ Select item- (1-13): 5
Automatically selected FileSet: Mssql
+-------+-------+----------+-------------+---------------------+------------+
| JobId | Level | JobFiles | JobBytes | StartTime | VolumeName |
@@ -633,16 +633,16 @@ incremental backup with a replace of the original database:
Enter "done" to leave this mode.
cwd is: /
- $ mark *
+ $ mark *
3 files marked.
- $ lsmark
+ $ lsmark
*@MSSQL/
*default/
*myDatabase/
*db-diff
*db-full
*log-2013-11-21 17:32:20
- $ done
+ $ done
Bootstrap records written to /var/lib/bareos/bareos-dir.restore.6.bsr
The job will require the following
@@ -659,7 +659,7 @@ incremental backup with a replace of the original database:
The defined Restore Job resources are:
1: RestoreMSSQL
2: RestoreFiles
- Select Restore Job (1-2): 1
+ Select Restore Job (1-2): 1
Run Restore job
JobName: RestoreMSSQL
Bootstrap: /var/lib/bareos/bareos-dir.restore.6.bsr
@@ -674,7 +674,7 @@ incremental backup with a replace of the original database:
Catalog: MyCatalog
Priority: 10
Plugin Options: *None*
- OK to run? (yes/mod/no): mod
+ OK to run? (yes/mod/no): mod
Parameters to modify:
1: Level
2: Storage
@@ -690,8 +690,8 @@ incremental backup with a replace of the original database:
12: Replace
13: JobId
14: Plugin Options
- Select parameter to modify (1-14): 14
- Please enter Plugin Options string: mssqlvdi:instance=default:database=myDatabase:replace=yes:norecovery=yes
+ Select parameter to modify (1-14): 14
+ Please enter Plugin Options string: mssqlvdi:instance=default:database=myDatabase:replace=yes:norecovery=yes
Run Restore job
JobName: RestoreMSSQL
Bootstrap: /var/lib/bareos/bareos-dir.restore.6.bsr
@@ -706,7 +706,7 @@ incremental backup with a replace of the original database:
Catalog: MyCatalog
Priority: 10
Plugin Options: mssqlvdi:instance=default:database=myDatabase:replace=yes:norecovery=yes
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=14
21-Nov 17:34 bareos-dir JobId 14: Start Restore Job RestoreMSSQL.2013-11-21_17.34.40_16
21-Nov 17:34 bareos-dir JobId 14: Using Device "FileStorage" to read.
diff --git a/docs/manuals/en/new_main_reference/source/install.rst b/docs/manuals/en/new_main_reference/source/install.rst
index 3a0e78195fa..3f49424e8ae 100644
--- a/docs/manuals/en/new_main_reference/source/install.rst
+++ b/docs/manuals/en/new_main_reference/source/install.rst
@@ -446,7 +446,7 @@ informations:
[client]
host=localhost
user=root
- password=YourPasswordForAccessingMysqlAsRoot
+ password=YourPasswordForAccessingMysqlAsRoot
It is recommended, to secure the Bareos database connection with a
password. See
diff --git a/docs/manuals/en/new_main_reference/source/migration.rst b/docs/manuals/en/new_main_reference/source/migration.rst
index 3bbc63b7f43..4c1b59f3ad4 100644
--- a/docs/manuals/en/new_main_reference/source/migration.rst
+++ b/docs/manuals/en/new_main_reference/source/migration.rst
@@ -285,10 +285,10 @@ below.
}
Note that the backup job writes to the :raw-latex:`\pool{Default}` pool,
-which corresponds to :raw-latex:`\resourcename{Dir}{Storage}{File}`
+which corresponds to **File**:sup:`Dir`:sub:`Storage`
storage. There is no
:raw-latex:`\linkResourceDirective{Dir}{Pool}{Storage}` directive in the
-Job resource while the two *Pool*:sub:`Dir`
+Job resource while the two :sup:`Dir` :strong:`Pool`
resources contain different
:raw-latex:`\linkResourceDirective{Dir}{Pool}{Storage}` directives.
Moreover, the :raw-latex:`\pool{Default}` pool contains a
@@ -296,8 +296,8 @@ Moreover, the :raw-latex:`\pool{Default}` pool contains a
refers to the :raw-latex:`\pool{Tape}` pool.
In order to migrate jobs from the
-:raw-latex:`\resourcename{Dir}{Pool}{Default}` pool to the
-:raw-latex:`\resourcename{Dir}{Pool}{Tape}` pool we add the following
+**Default**:sup:`Dir`:sub:`Pool` pool to the
+**Tape**:sup:`Dir`:sub:`Pool` pool we add the following
Job resource:
diff --git a/docs/manuals/en/new_main_reference/source/ndmp.rst b/docs/manuals/en/new_main_reference/source/ndmp.rst
index e1930bc99d6..3d00d8b41d2 100644
--- a/docs/manuals/en/new_main_reference/source/ndmp.rst
+++ b/docs/manuals/en/new_main_reference/source/ndmp.rst
@@ -345,7 +345,7 @@ Verify, that you can access your Primary Storage System via Bareos:
.. code-block:: sh
:caption: verify connection to NDMP Primary Storage System
- *status client=ndmp-client
+ *status client=ndmp-client
Data Agent isilon.example.com NDMPv4
Host info
@@ -493,7 +493,7 @@ Bareos Director: Configure a Paired Storage
For NDMP Backups, we always need two storages that are paired together.
The default configuration already has a Storage
-:raw-latex:`\resourcename{Dir}{Storage}{File}` defined:
+**File**:sup:`Dir`:sub:`Storage` defined:
@@ -510,7 +510,7 @@ The default configuration already has a Storage
}
We now add a paired storage to the already existing
-:raw-latex:`\resourcename{Dir}{}{File}` storage:
+**File**:sup:`Dir`:sub:`` storage:
@@ -551,7 +551,7 @@ Verify that the configuration is correct:
.. code-block:: sh
:caption: verify connection to the \bareosSd
- *status storage=NDMPFile
+ *status storage=NDMPFile
Connecting to Storage daemon File at bareos:9103
bareos-sd Version: 15.2.2 (16 November 2015) x86_64-redhat-linux-gnu redhat Red Hat Enterprise Linux Server release 7.0 (Maipo)
@@ -785,7 +785,7 @@ Now we are ready to do our first NDMP backup:
.. code-block:: sh
:caption: run NDMP backup
- *run job=ndmp-backup-job
+ *run job=ndmp-backup-job
Using Catalog "MyCatalog"
Run Backup job
JobName: ndmp-backup-job
@@ -797,12 +797,12 @@ Now we are ready to do our first NDMP backup:
Storage: NDMPFile (From Job resource)
When: 2016-01-14 10:48:04
Priority: 10
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=1
- *wait jobid=1
+ *wait jobid=1
JobId=1
JobStatus=OK (T)
- *list joblog jobid=1
+ *list joblog jobid=1
2016-01-14 10:57:53 bareos-dir JobId 1: Start NDMP Backup JobId 1, Job=NDMPJob.2016-01-14_10.57.51_04
2016-01-14 10:57:53 bareos-dir JobId 1: Created new Volume "Full-0001" in catalog.
2016-01-14 10:57:53 bareos-dir JobId 1: Using Device "FileStorage" to write.
@@ -908,7 +908,7 @@ Let us have a look what files are in our backup:
.. code-block:: sh
:caption: list the files of the backup job
- *list files jobid=1
+ *list files jobid=1
/@NDMP/ifs/home%0
/ifs/home/
/ifs/home/admin/
@@ -944,7 +944,7 @@ Restore files to original path
.. code-block:: sh
:caption:
- *restore jobid=1
+ *restore jobid=1
You have selected the following JobId: 1
Building directory tree for JobId(s) 1 ...
@@ -956,8 +956,8 @@ Restore files to original path
Enter "done" to leave this mode.
cwd is: /
- $ mark /ifs/home/admin/.zshrc
- $ done
+ $ mark /ifs/home/admin/.zshrc
+ $ done
Bootstrap records written to /var/lib/bareos/bareos-dir.restore.1.bsr
The job will require the following
@@ -974,11 +974,11 @@ Restore files to original path
The defined Restore Job resources are:
1: RestoreFiles
2: ndmp-restore-job
- Select Restore Job (1-2): 2
+ Select Restore Job (1-2): 2
Defined Clients:
1: bareos-fd
2: ndmp-client
- Select the Client (1-2): 2
+ Select the Client (1-2): 2
Run Restore job
JobName: ndmp-backup-job
Bootstrap: /var/lib/bareos/bareos-dir.restore.1.bsr
@@ -993,12 +993,12 @@ Restore files to original path
Catalog: MyCatalog
Priority: 10
Plugin Options: *None*
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=2
- *wait jobid=2
+ *wait jobid=2
JobId=2
JobStatus=OK (T)
- *list joblog jobid=2
+ *list joblog jobid=2
14-Jan 11:04 bareos-dir JobId 2: Start Restore Job ndmp-backup-job.2016-01-14_11.04.53_05
14-Jan 11:04 bareos-dir JobId 2: Using Device "FileStorage" to read.
14-Jan 11:04 bareos-dir JobId 2: Opening tape drive KKAE-IMLO-NHJD-GOCO-GJCO-GEHB-BODL-ADNG@/ifs/home read-only
@@ -1114,15 +1114,15 @@ NDMP Copy Jobs
To be able to do copy jobs, we need to have a second storage resource
where we can copy the data to. Depending on your requirements, this
resource can be added to the existing |bareosSd| (e.g.
-:raw-latex:`\resourcename{Sd}{Storage}{autochanger-0}` for tape based
+**autochanger-0**:sup:`Sd`:sub:`Storage` for tape based
backups) or to an additional |bareosSd|.
We set up an additional |bareosSd| on a host named
:raw-latex:`\host{bareos-sd2.example.com}` with the default
-:raw-latex:`\resourcename{Sd}{Storage}{FileStorage}` device.
+**FileStorage**:sup:`Sd`:sub:`Storage` device.
When this is done, add a second storage resource
-:raw-latex:`\resourcename{Dir}{Storage}{File2}` to the
+**File2**:sup:`Dir`:sub:`Storage` to the
:file:`bareos-dir.conf`:
@@ -1170,7 +1170,7 @@ Then we need to define the just defined pool as the
:raw-latex:`\linkResourceDirective{Dir}{Pool}{Next Pool}` of the pool
that actually holds the data to be copied.
-In our case this is the :raw-latex:`\resourcename{Dir}{Pool}{Full}`
+In our case this is the **Full**:sup:`Dir`:sub:`Pool`
Pool:
@@ -1189,10 +1189,10 @@ Pool:
}
Finally, we need to define a Copy Job that will select the jobs that are
-in the :raw-latex:`\resourcename{Dir}{Pool}{Full}` pool and copy them
-over to the :raw-latex:`\resourcename{Dir}{Pool}{Copy}` pool reading the
-data via the :raw-latex:`\resourcename{Dir}{Storage}{File}` Storage and
-writing the data via the :raw-latex:`\resourcename{Dir}{Storage}{File2}`
+in the **Full**:sup:`Dir`:sub:`Pool` pool and copy them
+over to the **Copy**:sup:`Dir`:sub:`Pool` pool reading the
+data via the **File**:sup:`Dir`:sub:`Storage` Storage and
+writing the data via the **File2**:sup:`Dir`:sub:`Storage`
Storage:
@@ -1219,7 +1219,7 @@ job:
.. code-block:: sh
:caption: run copy job
- *run job=NDMPCopy
+ *run job=NDMPCopy
Run Copy job
JobName: NDMPCopy
Bootstrap: *None*
@@ -1230,12 +1230,12 @@ job:
When: 2016-01-21 09:19:49
Catalog: MyCatalog
Priority: 10
- OK to run? (yes/mod/no): yes
+ OK to run? (yes/mod/no): yes
Job queued. JobId=74
- *wait jobid=74
+ *wait jobid=74
JobId=74
JobStatus=OK (T)
- *list joblog jobid=74
+ *list joblog jobid=74
21-Jan 09:19 bareos-dir JobId 74: The following 1 JobId was chosen to be copied: 73
21-Jan 09:19 bareos-dir JobId 74: Automatically selected Catalog: MyCatalog
21-Jan 09:19 bareos-dir JobId 74: Using Catalog "MyCatalog"
@@ -1315,7 +1315,7 @@ storage. If we try we get this message:
To be able to do NDMP operations from the storage that was used to store
the copies, we need to define a NDMP storage that is paired with it. The
definition is very similar to our
-:raw-latex:`\resourcename{Dir}{Storage}{NDMPFile}` Storage, as we want
+**NDMPFile**:sup:`Dir`:sub:`Storage` Storage, as we want
to restore the data to the same NDMP Storage system:
@@ -1445,7 +1445,7 @@ Verify, that you can access your Primary Storage System
.. code-block:: sh
:caption: status ndmp client
- *status client=isilon
+ *status client=isilon
Data Agent isilon.example.com NDMPv4
Host info
@@ -1584,7 +1584,7 @@ the available tape changer device.
.. code-block:: sh
:caption: status ndmp storage (Tape Agent and Robot Agent)
- *status storage=isilon
+ *status storage=isilon
Tape Agent isilon.bareos.com NDMPv4
Host info
hostname isilon
@@ -1638,7 +1638,7 @@ tape and at one robot agent.
We now know the device names and can configure what robot and what tape
to use when this storage is used by bareos by updating the
-:raw-latex:`\resourcename{Sd}{Storage}{isilon}` resource:
+**isilon**:sup:`Sd`:sub:`Storage` resource:
@@ -1742,7 +1742,7 @@ slots:
.. code-block:: sh
:caption: status storage=isilon slots
- *status slots
+ *status slots
Slot | Volume Name | Status | Media Type | Pool |
------+------------------+-----------+----------------+--------------------------|
1@| ? | ? | ? | ? |
@@ -1768,7 +1768,7 @@ created for NDMP Tapes:
.. code-block:: sh
:caption: label barcodes
- *label storage=isilon barcodes slots=251-257
+ *label storage=isilon barcodes slots=251-257
Automatically selected Storage: isilon
Select Drive:
1: Drive 0
@@ -1820,7 +1820,7 @@ Run NDMP_NATIVE Backup
.. code-block:: sh
:caption: run backup job
- *run job=ndmp-native-backup-job yes
+ *run job=ndmp-native-backup-job yes
JobId 1: Start NDMP Backup JobId 1, Job=ndmp.2017-04-07_01.40.31_10
JobId 1: Using Data host isilon.bareos.com
JobId 1: Using Tape host:device isilon.bareos.com:HP-TLD-004-01
@@ -2002,7 +2002,7 @@ Now we want to restore some files from the backup we just did:
.. code-block:: sh
:caption: run ndmp restore job
- *restore
+ *restore
[...]
cwd is: /
diff --git a/docs/manuals/en/new_main_reference/source/passiveclient.rst b/docs/manuals/en/new_main_reference/source/passiveclient.rst
index 1cbc4df62cb..3962cae9d85 100644
--- a/docs/manuals/en/new_main_reference/source/passiveclient.rst
+++ b/docs/manuals/en/new_main_reference/source/passiveclient.rst
@@ -52,7 +52,7 @@ client definition of the |bareosDir|:
Client {
Name = client1-fd
Password = "secretpassword"
- Passive = yes
+ Passive = yes
[...]
}
@@ -76,7 +76,7 @@ need to be specified anymore.
Client {
Name = client1-fd
[...]
- Compatible = no
+ Compatible = no
}
.. |image| image:: \idir passive-client-communication
diff --git a/docs/manuals/en/new_main_reference/source/programs.rst b/docs/manuals/en/new_main_reference/source/programs.rst
index 623b41be4df..9a0332f161f 100644
--- a/docs/manuals/en/new_main_reference/source/programs.rst
+++ b/docs/manuals/en/new_main_reference/source/programs.rst
@@ -164,7 +164,7 @@ Specifying the Configuration
Each of the utilities that deal with Volumes require a valid
|bareosSd| configuration (actually, the only part of the
configuration file that these programs need is the
-*Device*:sub:`Sd` resource definitions). This
+:sup:`Sd` :strong:`Device` resource definitions). This
permits the programs to find the configuration parameters for your
:raw-latex:`\linkResourceDirective{Sd}{Device}{Archive Device}`. Using
the :option:`-c` option a custom
@@ -1778,7 +1778,7 @@ in a simple text based format:
.. code-block:: sh
:caption:
- # bareos-dbcheck -B
+ # bareos-dbcheck -B
catalog=MyCatalog
db_type=SQLite
db_name=bareos
diff --git a/docs/manuals/en/new_main_reference/source/recycling.rst b/docs/manuals/en/new_main_reference/source/recycling.rst
index f1aa54c9895..d38b2d18d2a 100644
--- a/docs/manuals/en/new_main_reference/source/recycling.rst
+++ b/docs/manuals/en/new_main_reference/source/recycling.rst
@@ -36,7 +36,7 @@ periods, Bareos can manage the recycling (such as defined above)
automatically.
Automatic recycling of Volumes is controlled by four records in the
-*Pool*:sub:`Dir` resource definition. These four
+:sup:`Dir` :strong:`Pool` resource definition. These four
records are:
- :raw-latex:`\linkResourceDirective{Dir}{Pool}{Auto Prune}` = yes
diff --git a/docs/manuals/en/new_main_reference/source/restore.rst b/docs/manuals/en/new_main_reference/source/restore.rst
index df6e27105ce..10794c9d9b2 100644
--- a/docs/manuals/en/new_main_reference/source/restore.rst
+++ b/docs/manuals/en/new_main_reference/source/restore.rst
@@ -91,7 +91,7 @@ are presented with the following selection prompt:
.. code-block:: sh
:caption: restore
- * restore
+ * restore
First you select one or more JobIds that contain files
to be restored. You will be presented several methods
of specifying the JobIds. Then you will be allowed to
@@ -227,7 +227,7 @@ all the Clients found in the database as follows:
.. code-block:: sh
:caption: restore: select client
- Select item- (1-13): 5
+ Select item- (1-13): 5
Defined clients:
1: Rufus
2: Matou
@@ -238,7 +238,7 @@ all the Clients found in the database as follows:
7: PmatouVerify
8: RufusVerify
9: Watchdog
- Select Client (File daemon) resource (1-9): 1
+ Select Client (File daemon) resource (1-9): 1
The listed clients are only examples, yours will look differently. If
you have only one Client, it will be automatically selected. In this
@@ -485,7 +485,7 @@ the prompt list:
.. code-block:: sh
:caption: restore list of files
- * restore
+ * restore
First you select one or more JobIds that contain files
to be restored. You will be presented several methods
of specifying the JobIds. Then you will be allowed to
@@ -505,7 +505,7 @@ the prompt list:
11: Enter a list of directories to restore for found JobIds
12: Select full restore to a specified Job date
13: Cancel
- Select item- (1-13): 7
+ Select item- (1-13): 7
which then prompts you for the client name:
diff --git a/docs/manuals/en/new_main_reference/source/security.rst b/docs/manuals/en/new_main_reference/source/security.rst
index b0792c20ab1..21925471d85 100644
--- a/docs/manuals/en/new_main_reference/source/security.rst
+++ b/docs/manuals/en/new_main_reference/source/security.rst
@@ -379,7 +379,7 @@ Example:
.. code-block:: sh
:caption:
- * status dir
+ * status dir
backup1.example.com-dir Version: 15.3.0 (24 August 2015) x86_64-suse-linux-gnu suse openSUSE 13.2 (Harlequin) (x86_64)
Daemon started 08-Sep-15 12:50. Jobs: run=0, running=0 mode=0 db=sqlite3
Heap: heap=290,816 smbytes=89,166 max_bytes=89,166 bufs=334 max_bufs=335
diff --git a/docs/manuals/en/new_main_reference/source/supportedoses.rst b/docs/manuals/en/new_main_reference/source/supportedoses.rst
index 2df99ca8a5c..4e237ee35c4 100644
--- a/docs/manuals/en/new_main_reference/source/supportedoses.rst
+++ b/docs/manuals/en/new_main_reference/source/supportedoses.rst
@@ -190,7 +190,7 @@ dependencies.
For general information about the packages, see
:ref:`section-BareosPackages`.
-Packages names not containing the word :raw-latex:`\name{bareos}` are
+Packages names not containing the word **bareos** are
required packages where we decided to include them ourselves.
:raw-latex:`\small`
@@ -224,7 +224,7 @@ The distributions of Debian :math:`>=` 8 include a version of Bareos.
Ubuntu Universe :math:`>=` 15.04 does also include these packages.
In the further text, these version will be named
-:raw-latex:`\name{Bareos (Debian.org)}` (also for the Ubuntu Universe
+**Bareos (Debian.org)** (also for the Ubuntu Universe
version, as this is based on the Debian version).
.. _section-DebianOrgLimitations:
@@ -313,7 +313,7 @@ locally.
Assuming your client has the DNS entry
:raw-latex:`\host{client2.example.com}` and has been added to
|bareosDir| as
-:raw-latex:`\resourcename{bareos-dir}{client}{client2-fd}`:
+**client2-fd**:sup:`bareos-dir`:sub:`client` :
@@ -398,7 +398,7 @@ Open the :program:`bconsole` on your
.. code-block:: sh
:caption:
- *status client=client2-fd
+ *status client=client2-fd
In case, the client does not react, following command are useful the
check the status:
diff --git a/docs/manuals/en/new_main_reference/source/troubleshooting.rst b/docs/manuals/en/new_main_reference/source/troubleshooting.rst
index 29b457a0afb..358a485102c 100644
--- a/docs/manuals/en/new_main_reference/source/troubleshooting.rst
+++ b/docs/manuals/en/new_main_reference/source/troubleshooting.rst
@@ -69,10 +69,10 @@ following command:
.. code-block:: sh
:caption: Test DNS resolution of the \bareosFd \name{bareos-fd}
- *resolve client=bareos-fd NONEXISTINGHOSTNAME
+ *resolve client=bareos-fd NONEXISTINGHOSTNAME
Connecting to Client bareos-fd at bareos:9102
bareos-fd: Failed to resolve NONEXISTINGHOSTNAME
- *resolve client=bareos-fd bareos-sd1.example.com
+ *resolve client=bareos-fd bareos-sd1.example.com
Connecting to Client bareos-fd at bareos:9102
bareos-fd resolves bareos-sd1.example.com to host[ipv4;192.168.0.1]
@@ -239,7 +239,7 @@ also read the chapter about :ref:`ConcurrentDiskJobs`.
Below is a super stripped down :file:`bareos-dir.conf` file
showing you the four places where the the file must be modified to allow
-the same job :raw-latex:`\resourcename{Dir}{Job}{NightlySave}` to run up
+the same job **NightlySave**:sup:`Dir`:sub:`Job` to run up
to four times concurrently. The change to the Job resource is not
necessary if you want different Jobs to run at the same time, which is
the normal case.
@@ -317,13 +317,13 @@ As a temporary fix, just reset this counter:
1000 OK: bareos-dir Version: 17.2.5 (14 Feb 2018)
Enter a period to cancel a command.
- *sqlquery
+ *sqlquery
Automatically selected Catalog: MyCatalog
Using Catalog "MyCatalog"
Entering SQL query mode.
Terminate each query with a semicolon.
Terminate query mode with a blank line.
- Enter SQL query: UPDATE Media SET VolWrites = 0 WHERE VolWrites > '2000000000';
+ Enter SQL query: UPDATE Media SET VolWrites = 0 WHERE VolWrites > '2000000000';
No results to list.
SELECT volwrites FROM media; volwrites > '0';
+-----------+
diff --git a/docs/manuals/en/new_main_reference/source/tutorial.rst b/docs/manuals/en/new_main_reference/source/tutorial.rst
index 03a585ac374..afe5d6826f0 100644
--- a/docs/manuals/en/new_main_reference/source/tutorial.rst
+++ b/docs/manuals/en/new_main_reference/source/tutorial.rst
@@ -115,7 +115,7 @@ Type :raw-latex:`\bcommand{help}{}` to see a list of available commands:
.. code-block:: sh
:caption: help
- *help
+ *help
Command Description
======= ===========
add Add media to a pool
@@ -204,7 +204,7 @@ should get something similar this:
.. code-block:: sh
:caption: show filesets
- *show filesets
+ *show filesets
...
FileSet {
Name = "SelfTest"
@@ -235,7 +235,7 @@ Megabytes) and complexity without being too big. The FileSet
:raw-latex:`\fileset{Catalog}` is used for backing up Bareos’s catalog
and is not of interest to us for the moment. You can change what is
backed up by editing the configuration and changing the ``path:File =``
-line in the *FileSet*:sub:`Dir` resource.
+line in the :sup:`Dir` :strong:`FileSet` resource.
Now is the time to run your first backup job. We are going to backup
your Bareos source directory to a File Volume in your
@@ -248,7 +248,7 @@ is. Now enter:
.. code-block:: sh
:caption: status dir
- *status dir
+ *status dir
bareos-dir Version: 13.2.0 (09 April 2013) x86_64-pc-linux-gnu debian Debian GNU/Linux 6.0 (squeeze)
Daemon started 23-May-13 13:17. Jobs: run=0, running=0 mode=0
Heap: heap=270,336 smbytes=59,285 max_bytes=59,285 bufs=239 max_bufs=239
@@ -267,8 +267,8 @@ is. Now enter:
where the times and the Director’s name will be different according to
your setup. This shows that an Incremental job is scheduled to run for
-the Job :raw-latex:`\resourcename{Dir}{Job}{BackupClient1}` at 1:05am
-and that at 1:10, a :raw-latex:`\resourcename{Dir}{Job}{BackupCatalog}`
+the Job **BackupClient1**:sup:`Dir`:sub:`Job` at 1:05am
+and that at 1:10, a **BackupCatalog**:sup:`Dir`:sub:`Job`
is scheduled to run.
Now enter:
@@ -279,7 +279,7 @@ Now enter:
.. code-block:: sh
:caption: status client
- *status client
+ *status client
Automatically selected Client: bareos-fd
Connecting to Client bareos-fd at bareos:9102
@@ -294,7 +294,7 @@ Now enter:
====
In this case, the client is named
-:raw-latex:`\resourcename{Dir}{Client}{bareos-fd}` your name might be
+**bareos-fd**:sup:`Dir`:sub:`Client` your name might be
different, but the line beginning with ``path:bareos-fd Version`` is
printed by your |bareosFd|, so we are now sure it is up and
running.
@@ -307,7 +307,7 @@ Finally do the same for your |bareosSd| with:
.. code-block:: sh
:caption: status storage
- *status storage
+ *status storage
Automatically selected Storage: File
Connecting to Storage daemon File at bareos:9103
@@ -332,7 +332,7 @@ Finally do the same for your |bareosSd| with:
====
You will notice that the default |bareosSd| device is named
-:raw-latex:`\resourcename{Dir}{Storage}{File}` and that it will use
+**File**:sup:`Dir`:sub:`Storage` and that it will use
device :raw-latex:`\directory{/var/lib/bareos/storage}`, which is not
currently open.
@@ -402,7 +402,7 @@ At this point, take some time to look carefully at what is printed and
understand it. It is asking you if it is OK to run a job named
:raw-latex:`\job{BackupClient1}` with FileSet
:raw-latex:`\fileset{SelfTest}` as an Incremental job on your Client,
-and to use Storage :raw-latex:`\resourcename{Dir}{Storage}{File}` and
+and to use Storage **File**:sup:`Dir`:sub:`Storage` and
Pool :raw-latex:`\pool{Full}`, and finally, it wants to run it now (the
current time should be displayed by your console).
@@ -424,7 +424,7 @@ If you wait a few seconds, then enter the command
.. code-block:: sh
:caption: run
- *messages
+ *messages
28-Apr-2003 14:30 bareos-sd: Wrote label to prelabeled Volume
"TestVolume001" on device /var/lib/bareos/storage
28-Apr-2003 14:30 rufus-dir: Bareos 1.30 (28Apr03): 28-Apr-2003 14:30
@@ -464,7 +464,7 @@ can also ask bconsole to wait, until a specific job is finished:
.. code-block:: sh
:caption: wait
- *wait jobid=1
+ *wait jobid=1
or just :raw-latex:`\bcommand{wait}{}`, which waits for all running jobs
to finish.
@@ -521,7 +521,7 @@ program by entering:
.. code-block:: sh
:caption: restore
- *restore all
+ *restore all
First you select one or more JobIds that contain files
to be restored. You will be presented several methods
of specifying the JobIds. Then you will be allowed to
@@ -810,7 +810,7 @@ DNS resolvable name or an IP address.
.. code-block:: sh
:caption: add a client
- *configure add client name=client2-fd address=192.168.0.2 password=secret
+ *configure add client name=client2-fd address=192.168.0.2 password=secret
Created resource config file "/etc/bareos/bareos-dir.d/client/client2-fd.conf":
Client {
Name = client2-fd
@@ -828,7 +828,7 @@ This creates two resource configuration files:
- :file:`/etc/bareos/bareos-dir-export/client/client2-fd/bareos-fd.d/director/bareos-dir.conf`
(assuming your director resource is named
- :raw-latex:`\name{bareos-dir}`)
+ **bareos-dir**)
The
:file:`/etc/bareos/bareos-dir-export/client/client2-fd/bareos-fd.d/director/bareos-dir.conf`
@@ -869,7 +869,7 @@ Reload or restart your |bareosDir|:
.. code-block:: sh
:caption: reload the Director configuration
- *reload
+ *reload
reloaded
The corresponding |bareosFd| director resource can be
@@ -916,16 +916,16 @@ In detail:
:ref:`ClientResourceClient`.
:file:`director/bareos-dir.conf`
- gives the |bareosDir| :raw-latex:`\name{bareos-dir}`
+ gives the |bareosDir| **bareos-dir**
full access to this |bareosFd|. During installation, the
:raw-latex:`\linkResourceDirective{Fd}{Director}{Password}` is set
to a random default. Adapt the name and/or the password to your
- |bareosDir|. (The name :raw-latex:`\name{bareos-dir}` is
+ |bareosDir|. (The name **bareos-dir** is
the default |bareosDir| name since Bareos
16.2.4.)
:file:`director/bareos-mon.conf`
- gives the |bareosDir| :raw-latex:`\name{bareos-mon}`
+ gives the |bareosDir| **bareos-mon**
restricted access to this |bareosFd|. During
installation, the
:raw-latex:`\linkResourceDirective{Fd}{Director}{Password}` is set
@@ -936,16 +936,16 @@ In detail:
defines, how messages should be handled. The default sends all
relevant messages to the |bareosDir|.
-If your |bareosDir| is named :raw-latex:`\name{bareos-dir}`,
+If your |bareosDir| is named **bareos-dir**,
the :file:`/etc/bareos/bareos-fd.d/director/bareos-dir.conf`
may already be overwritten by the file you copied from the
|bareosDir|. If your Director has another name, an addition
resource file will exists. You can define an arbitrary number of
|bareosDir|’s in your |bareosFd| configuration.
However, normally you will only have one
-*Director*:sub:`Fd` with full control of your
+:sup:`Fd` :strong:`Director` with full control of your
|bareosFd| and optional one
-*Director*:sub:`Fd` for monitoring (used by the
+:sup:`Fd` :strong:`Director` for monitoring (used by the
:raw-latex:`\bareosTrayMonitor`).
Anyhow, the resource will look similar to this:
@@ -963,8 +963,8 @@ Anyhow, the resource will look similar to this:
After a restart of the |bareosFd| to reload the
configuration this resource allows the access for a
-|bareosDir| with name :raw-latex:`\name{bareos-dir}` and
-password :raw-latex:`\name{secret}` (stored in MD5 format).
+|bareosDir| with name **bareos-dir** and
+password **secret** (stored in MD5 format).
@@ -979,10 +979,10 @@ password :raw-latex:`\name{secret}` (stored in MD5 format).
Manual configuration
^^^^^^^^^^^^^^^^^^^^
-If you have not created the *Director*:sub:`Fd` by
+If you have not created the :sup:`Fd` :strong:`Director` by
:raw-latex:`\bcommand{configure}{}`, you can create it also manually. If
your |bareosDir| is also named
-:raw-latex:`\name{bareos-dir}`, modify or create the file
+**bareos-dir**, modify or create the file
:file:`/etc/bareos/bareos-fd.d/director/bareos-dir.conf`:
@@ -1049,26 +1049,26 @@ The following example show how to
.. code-block:: sh
:caption: test the client and add a job resource
- *status client=client2-fd
+ *status client=client2-fd
...
- *configure add job name=client2-job client=client2-fd jobdefs=DefaultJob
+ *configure add job name=client2-job client=client2-fd jobdefs=DefaultJob
Created resource config file "/etc/bareos/bareos-dir.d/job/client2-job.conf":
Job {
Name = client2-job
Client = client2-fd
JobDefs = DefaultJob
}
- *estimate listing job=client2-job
+ *estimate listing job=client2-job
...
- *run job=client2-job
+ *run job=client2-job
...
- *wait jobid=...
+ *wait jobid=...
...
- *list joblog jobid=...
+ *list joblog jobid=...
...
- *list files jobid=...
+ *list files jobid=...
...
- *list volumes
+ *list volumes
...
Patience When Starting Daemons or Mounting Blank Tapes
@@ -1113,8 +1113,8 @@ Volume for writing backups. Bareos will select the first available
Volume from the Pool that is appropriate for the
:raw-latex:`\linkResourceDirective{Dir}{Job}{Storage}` you have
specified for the Job being run. When a volume has filled up with data,
-Bareos will change its :raw-latex:`\name{VolStatus}` from
-:raw-latex:`\name{Append}` to :raw-latex:`\name{Full}`, and then Bareos
+Bareos will change its **VolStatus** from
+**Append}` to :raw-latex:`\name{Full**, and then Bareos
will use the next volume and so on. If no appendable Volume exists in
the Pool, the Director will attempt to recycle an old Volume. For
details, please read the :ref:`RecyclingChapter`
@@ -1135,7 +1135,7 @@ been recorded in the catalog. You can verify this by entering:
.. code-block:: sh
:caption: list pools
- *list pools
+ *list pools
+--------+--------------+---------+---------+----------+---------------+
| PoolId | Name | NumVols | MaxVols | PoolType | LabelFormat |
+--------+--------------+---------+---------+----------+---------------+
diff --git a/docs/manuals/en/new_main_reference/source/update.rst b/docs/manuals/en/new_main_reference/source/update.rst
index 6a6397a65c2..60bf45688c2 100644
--- a/docs/manuals/en/new_main_reference/source/update.rst
+++ b/docs/manuals/en/new_main_reference/source/update.rst
@@ -141,7 +141,7 @@ should look similar to this:
[client]
host=localhost
user=root
- password=YourPasswordForAccessingMysqlAsRoot
+ password=YourPasswordForAccessingMysqlAsRoot
If you are able to connect via the :program:`mysql` to the
database, run the following script from the Unix prompt:
diff --git a/docs/manuals/en/new_main_reference/source/webui.rst b/docs/manuals/en/new_main_reference/source/webui.rst
index 57d3fcafb62..c5179852488 100644
--- a/docs/manuals/en/new_main_reference/source/webui.rst
+++ b/docs/manuals/en/new_main_reference/source/webui.rst
@@ -184,9 +184,9 @@ installed on the same host.
.. _`item-webui-create-user`: item-webui-create-user Use
:program:`bconsole` to create a user with name
- :raw-latex:`\name{admin}` and password :raw-latex:`\name{secret}` and
+ **admin}` and password :raw-latex:`\name{secret** and
permissions defined in
- :raw-latex:`\resourcename{Dir}{Profile}{webui-admin}`:
+ **webui-admin**:sup:`Dir`:sub:`Profile` :
::
@@ -194,7 +194,7 @@ installed on the same host.
.. code-block:: sh
:caption: add a named console
- *configure add console name=admin password=secret profile=webui-admin
+ *configure add console name=admin password=secret profile=webui-admin
Of course, you can choose other names and passwords. For details, see
:ref:`section-webui-console`.
@@ -212,18 +212,18 @@ Create a restricted consoles
There is not need, that |bareosWebui| itself provide a user
management. Instead it uses so named
-*Console*:sub:`Dir` defined in the
+:sup:`Dir` :strong:`Console` defined in the
|bareosDir|. You can have multiple consoles with different
names and passwords, sort of like multiple users, each with different
privileges.
-At least one *Console*:sub:`Dir` is required to use
+At least one :sup:`Dir` :strong:`Console` is required to use
the |bareosWebui|.
-To allow a user with name :raw-latex:`\name{admin}` and password
-:raw-latex:`\name{secret}` to access the |bareosDir| with
+To allow a user with name **admin** and password
+**secret** to access the |bareosDir| with
permissions defined in the
-:raw-latex:`\resourcename{Dir}{Profile}{webui-admin}` (see
+**webui-admin**:sup:`Dir`:sub:`Profile` (see
:ref:`section-webui-profile`), either
- create a file
@@ -252,7 +252,7 @@ permissions defined in the
.. code-block:: sh
:caption: add console
- *configure add console name=admin password=secret profile=webui-admin
+ *configure add console name=admin password=secret profile=webui-admin
For details, please read :ref:`DirectorResourceConsole`.
@@ -263,7 +263,7 @@ Configuration of profile resources
The package **bareos-webui** comes with a predefined
profile for |bareosWebui|:
-:raw-latex:`\resourcename{Dir}{Profile}{webui-admin}`.
+**webui-admin**:sup:`Dir`:sub:`Profile` .
If your |bareosWebui| is installed on another system then
the |bareosDir|, you have to copy the profile to the
@@ -292,9 +292,9 @@ allowing all commands used by the |bareosWebui|:
Plugin Options ACL = *all*
}
-The *Profile*:sub:`Dir` itself does not give any
+The :sup:`Dir` :strong:`Profile` itself does not give any
access to the |bareosDir|, but can be used by
-*Console*:sub:`Dir` , which do give access to the
+:sup:`Dir` :strong:`Console`, which do give access to the
|bareosDir|, see
:ref:`section-webui-console`.
@@ -513,7 +513,7 @@ Console/Profile changes
-----------------------
The |bareosWebui| Director profile shipped with Bareos 15.2
-(:raw-latex:`\resourcename{Dir}{Profile}{webui}` in the file
+(**webui**:sup:`Dir`:sub:`Profile` in the file
:file:`/etc/bareos/bareos-dir.d/webui-profiles.conf`) is not
sufficient to use the |bareosWebui| 16.2. This has several
reasons:
@@ -551,7 +551,7 @@ If you used an unmodified
:file:`/etc/bareos/bareos-dir.d/webui-profiles.conf` file,
the easiest way is to overwrite it with the new profile file
:file:`/etc/bareos/bareos-dir.d/profile/webui-admin.conf`.
-The new :raw-latex:`\resourcename{Dir}{Profile}{webui-admin}` allows all
+The new **webui-admin**:sup:`Dir`:sub:`Profile` allows all
commands, except of the dangerous ones, see
:ref:`section-webui-profile`.
@@ -562,7 +562,7 @@ Since
16.2.0
it is possible to work with different catalogs. Therefore the catalog
parameter has been introduced. If you don’t set a catalog explicitly the
-default :raw-latex:`\resourcename{Dir}{Catalog}{MyCatalog}` will be
+default **MyCatalog**:sup:`Dir`:sub:`Catalog` will be
used. Please see
:ref:`section-webui-configuration-files` for more
details.
diff --git a/docs/manuals/en/new_main_reference/source/win32.rst b/docs/manuals/en/new_main_reference/source/win32.rst
index 68112f43269..9e86a81ecd1 100644
--- a/docs/manuals/en/new_main_reference/source/win32.rst
+++ b/docs/manuals/en/new_main_reference/source/win32.rst
@@ -47,7 +47,7 @@ Windows Installation
Normally, you will install the Windows version of Bareos from the
-binaries. The :raw-latex:`\name{winbareos}` binary packages are provided
+binaries. The **winbareos** binary packages are provided
under `http://download.bareos.org/bareos/release/latest/windows `_.
Additionally, there are `OPSI `_
packages available under
@@ -254,7 +254,7 @@ you have to use the :program:`bconsole`
.. code-block:: sh
:caption: Enable debug
- *setdebug client=bareos-fd level=200 trace=1
+ *setdebug client=bareos-fd level=200 trace=1
Connecting to Client bareos-fd at bareos.example.com:9102
2000 OK setdebug=200 trace=1 hangup=0 tracefile=c:\bareos-fd.trace