diff --git a/docs/manuals/source/DeveloperGuide/jobexec.rst b/docs/manuals/source/DeveloperGuide/jobexec.rst
index e9339752815..7185644960d 100644
--- a/docs/manuals/source/DeveloperGuide/jobexec.rst
+++ b/docs/manuals/source/DeveloperGuide/jobexec.rst
@@ -31,26 +31,26 @@ As there are lots of configuration options that will change the job execution in
 
 When such a job is run, the |dir| connects to the |sd| and does the initial job setup, then the |dir| connects to the |fd| to setup and start the job there. The |fd| then connects to the |sd| and sends it data there.
 
-Overview
-~~~~~~~~
+Overview simple backup job
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/backup-short.puml
 
 
-Detailed View
-~~~~~~~~~~~~~
+Detailed View simple backup job
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/backup-long.puml
 
 Simple restore job
 ------------------
 
-Overview
-~~~~~~~~
+Overview simple restore job
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. uml:: /DeveloperGuide/jobexec/restore-short.puml
 
 
-Detailed View
-~~~~~~~~~~~~~
+Detailed View simple restore job
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/restore-long.puml
 
 
@@ -61,12 +61,12 @@ None of the data is transferred over the network.
 
 When such a job is run, the |dir| connects to the |sd| and tells is what data to read from which volume and what volume the records should be written to.
 
-Overview
-~~~~~~~~
+Overview local copy job
+~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/localcopy-short.puml
 
-Detailed View
-~~~~~~~~~~~~~
+Detailed View local copy job
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/localcopy-long.puml
 
 
@@ -79,10 +79,10 @@ The main difference is what the director writes to the catalog after the job is
 When such a remote copy or migrate job is run, the |dir| connects to the reading |sd| and then to the writing |sd|.
 The writing |sd| is put into listen-mode while the writing |sd| will essentially run a restore where the data is sent to the writing |sd|.
 
-Overview
-~~~~~~~~
+Overview remote copy job
+~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/remotecopy-short.puml
 
-Detailed View
-~~~~~~~~~~~~~
+Detailed View remote copy job
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 .. uml:: /DeveloperGuide/jobexec/remotecopy-long.puml
diff --git a/docs/manuals/source/DeveloperGuide/netprotocol.rst b/docs/manuals/source/DeveloperGuide/netprotocol.rst
index 80bf84b71c5..8d027813f28 100644
--- a/docs/manuals/source/DeveloperGuide/netprotocol.rst
+++ b/docs/manuals/source/DeveloperGuide/netprotocol.rst
@@ -288,39 +288,39 @@ Detailed Diagram
 Restore of a Single File
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Overview
-^^^^^^^^
+Overview single file restore
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/restore_of_one_file_overview.puml
 
-Detailed Diagram
-^^^^^^^^^^^^^^^^
+Detailed Diagram single file restore
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/restore_of_one_file.puml
 
 Migration of a Single Volume
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Overview
-^^^^^^^^
+Overview single volume migration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/migration_of_one_volume_overview.puml
 
-Detailed Diagram
-^^^^^^^^^^^^^^^^
+Detailed Diagram single volume migration
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/migration_of_one_volume.puml
 
 Verify of a Single File (Mode: Volume to Catalog)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Overview
-^^^^^^^^
+Overview single file verify
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/verify_one_file_volume_to_catalog_overview.puml
 
-Detailed Diagram
-^^^^^^^^^^^^^^^^
+Detailed Diagram single file verify
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. uml:: netprotocol/verify_one_file_volume_to_catalog.puml
 
diff --git a/docs/manuals/source/IntroductionAndTutorial/Tutorial.rst b/docs/manuals/source/IntroductionAndTutorial/Tutorial.rst
index 59b3b729222..fa163d17331 100644
--- a/docs/manuals/source/IntroductionAndTutorial/Tutorial.rst
+++ b/docs/manuals/source/IntroductionAndTutorial/Tutorial.rst
@@ -632,8 +632,8 @@ The :file:`/etc/bareos/bareos-dir-export/client/client2-fd/bareos-fd.d/director/
 
    scp /etc/bareos/bareos-dir-export/client/client2-fd/bareos-fd.d/director/bareos-dir.conf root@client2.example.com:/etc/bareos/bareos-fd.d/director/
 
-Manual configuration
-^^^^^^^^^^^^^^^^^^^^
+Manual configuration of client
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Alternatively you can configure your resources manually. On the |dir| create the file