<input> stuff removed

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#\\<input\\>##g' *.rst
-sed -i -E 's#\\</input\\>##g' *.rst
+perl -i -pe 's#\<input\>##g' *.rst
+perl -i -pe 's#\</input\>##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
 #

docs/manuals/en/new_main_reference/source/always-incremental.rst

@@ -682,7 +682,7 @@ storage:
 .. code-block:: sh
     :caption: list volumes
 
-    *<input>list volumes</input>
+    *list volumes
     .....
     Pool: Full
     +---------+------------+-----------+---------+----------+----------+--------------+---------+------+-----------+-----------+---------------------+-------------+
@@ -700,8 +700,8 @@ check with list volumes that it worked:
 .. code-block:: sh
     :caption: update volume
 
-    *<input>update volume=Full-0001 storage=File</input>
-    *<input>list volumes</input>
+    *update volume=Full-0001 storage=File
+    *list volumes
     ...
     Pool: Full
     +---------+------------+-----------+---------+----------+----------+--------------+---------+------+-----------+-----------+---------------------+---------+

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

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
 
-            *<input>configure add client name=client2-fd address=192.168.0.2 password=secret</input>
+            *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
             }
-            *<input>configure add job name=client2-job client=client2-fd jobdefs=DefaultJob</input>
+            *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
 
-        *<input>list pools</input>
+        *list pools
         +------+---------+---------+---------+----------+-------------+
         | PoId | Name    | NumVols | MaxVols | PoolType | LabelFormat |
         +------+---------+---------+---------+----------+-------------+
@@ -1341,7 +1341,7 @@ llist
 .. code-block:: sh
     :caption: llist pools
 
-        *<input>llist pools</input>
+        *llist pools
                   PoolId: 1
                     Name: Default
                  NumVols: 0
@@ -1431,7 +1431,7 @@ move
 .. code-block:: sh
     :caption: move
 
-        *<input>move storage=TandbergT40 srcslots=32 dstslots=33</input>
+        *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
 
-        *<input>purge volume action=truncate storage=File pool=Full</input>
+        *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
 
-        *<input>resolve www.bareos.com</input>
+        *resolve www.bareos.com
         bareos-dir resolves www.bareos.com to host[ipv4:84.44.166.242]
 
-        *<input>resolve client=client1-fd www.bareos.com</input>
+        *resolve client=client1-fd www.bareos.com
         client1-fd resolves www.bareos.com to host[ipv4:84.44.166.242]
 
-        *<input>resolve storage=File www.bareos.com</input>
+        *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
 
-        *<input>setdebug level=100 trace=1 dir</input>
+        *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
 
-        *<input>status storage=File</input>
+        *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
 
-        *<input>status storage=File</input>
+        *status storage=File
         ...
         Device status:
         Autochanger "DDS-4-changer" with devices:
@@ -2070,7 +2070,7 @@ status
 .. code-block:: sh
     :caption: status scheduler
 
-        *<input>status scheduler</input>
+        *status scheduler
         Scheduler Jobs:
 
         Schedule               Jobs Triggered
@@ -2160,7 +2160,7 @@ status
 .. code-block:: sh
     :caption: status subscriptions
 
-        *<input>status subscriptions</input>
+        *status subscriptions
         Ok: available subscriptions: 8 (42/50) (used/total)
 
     Also, the number of subscriptions is checked after every job. If the

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:~# <input>su - bareos -s /bin/sh</input>
-    bareos@linux:~# <input>psql</input>
+    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=> <input>\dt</input>
+    bareos=> \dt
                      List of relations
      Schema |          Name          | Type  |  Owner
     --------+------------------------+-------+----------
@@ -380,21 +380,21 @@ the database ``path:bareos``.
      public | version                | table | postgres
     (30 rows)
 
-    bareos=> <input>select * from Version;</input>
+    bareos=> select * from Version;
      versionid
     -----------
           2002
     (1 row)
 
-    bareos=> <input>\du</input>
+    bareos=> \du
                                      List of roles
        Role name   | Superuser | Create role | Create DB | Connections | Member of
     ---------------+-----------+-------------+-----------+-------------+-----------
      bareos        | no        | no          | no        | no limit    | {}
      postgres      | yes       | yes         | yes       | no limit    | {}
     (2 rows)
 
-    bareos=> <input>\dp</input>
+    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=<input>YourPasswordForAccessingMysqlAsRoot</input>
+    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=<input>YourSecretPassword</input>
+    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:~# <input>mysql --user=bareos --password=YourSecretPassword bareos</input>
+    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> <input>show tables;</input>
+    mysql> show tables;
     +--------------------+
     | Tables_in_bareos   |
     +--------------------+
@@ -622,7 +622,7 @@ is used on SLES11):
     +--------------------+
     30 rows in set (0.00 sec)
 
-    mysql> <input>describe Job;</input>
+    mysql> describe Job;
     +-----------------+---------------------+------+-----+---------+----------------+
     | Field           | Type                | Null | Key | Default | Extra          |
     +-----------------+---------------------+------+-----+---------+----------------+
@@ -656,15 +656,15 @@ is used on SLES11):
     +-----------------+---------------------+------+-----+---------+----------------+
     27 rows in set (0,00 sec)
 
-    mysql> <input>select * from Version;</input>
+    mysql> select * from Version;
     +-----------+
     | VersionId |
     +-----------+
     |      2002 |
     +-----------+
     1 row in set (0.00 sec)
 
-    mysql> <input>exit</input>
+    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=<input>MyNewSecretPassword</input>
+    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
 
    <command>mysql</command>
-   mysql> <input>SELECT user,host,password FROM mysql.user WHERE user='bareos';</input>
+   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> <input>UPDATE mysql.user SET Password=PASSWORD('MyNewSecretPassword') where User='bareos';</input>
+   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> <input>FLUSH PRIVILEGES;</input>
+   mysql> FLUSH PRIVILEGES;
    Query OK, 0 rows affected (0.00 sec)
 
-   mysql> <input>SELECT user,host,password FROM mysql.user WHERE user='bareos';</input>
+   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)
 
-    <command>sqlite3</command><input> /var/lib/bareos/bareos.db</input>
+    <command>sqlite3</command> /var/lib/bareos/bareos.db
     SQLite version 3.7.6.3
     Enter ".help" for instructions
     Enter SQL statements terminated with a ";"
-    sqlite> <input>.tables</input>
+    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> <input>select * from Version;</input>
+    sqlite> select * from Version;
     2002
     sqlite>
 

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
 
-    *<input>status dir</input>
+    *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` :