diff --git a/docs/source/api/alarm_handler_device.rst b/docs/source/api/alarm_handler_device.rst
index 596275b7a16ddbdcc9b067678eab60496280aa05..be3a7d8f5902866d1a64da465d6367bfd64bc9e9 100644
--- a/docs/source/api/alarm_handler_device.rst
+++ b/docs/source/api/alarm_handler_device.rst
@@ -1,4 +1,3 @@
-
 ====================
 Alarm Handler Device
 ====================
diff --git a/docs/source/api/base/admin_mode_model.rst b/docs/source/api/base/admin_mode_model.rst
index b2c370977fbfb0eceee2aa5084692f5b46a631fc..9d1dd0ebe0093dd4d79537d8625ca6346f51021e 100644
--- a/docs/source/api/base/admin_mode_model.rst
+++ b/docs/source/api/base/admin_mode_model.rst
@@ -1,4 +1,3 @@
-
 ================
 Admin Mode Model
 ================
diff --git a/docs/source/api/base/base_device.rst b/docs/source/api/base/base_device.rst
index 83ce6e563eddf3580dc6af399b5eaf4c6119385b..8eb87944951700627a773e6b105010a5108b2f27 100644
--- a/docs/source/api/base/base_device.rst
+++ b/docs/source/api/base/base_device.rst
@@ -1,4 +1,3 @@
-
 ===========
 Base Device
 ===========
diff --git a/docs/source/api/base/component_manager.rst b/docs/source/api/base/component_manager.rst
index b7c0ef637195b6c3b022940272ab9a5316539293..3071d88a8282903e511ffba7c715e97e1820310b 100644
--- a/docs/source/api/base/component_manager.rst
+++ b/docs/source/api/base/component_manager.rst
@@ -1,4 +1,3 @@
-
 ======================
 Base Component Manager
 ======================
diff --git a/docs/source/api/base/index.rst b/docs/source/api/base/index.rst
index 17146d9708a6c484a23271d9478be369fd8df3db..ecfccb70e91a5a1a6f655ab03c15506cc1c3a92b 100644
--- a/docs/source/api/base/index.rst
+++ b/docs/source/api/base/index.rst
@@ -1,3 +1,4 @@
+===============
 Base subpackage
 ===============
 
diff --git a/docs/source/api/base/op_state_model.rst b/docs/source/api/base/op_state_model.rst
index c609c633908038e775a7d70b36356755e85aedbd..3fb7d60a7148e0b83272fc49b006f71efe1a0dc6 100644
--- a/docs/source/api/base/op_state_model.rst
+++ b/docs/source/api/base/op_state_model.rst
@@ -1,4 +1,3 @@
-
 ==============
 Op State Model
 ==============
diff --git a/docs/source/api/base/reference_component_manager.rst b/docs/source/api/base/reference_component_manager.rst
index 0f2462addeeaf7bd904b106776a1e709cbb9f633..d70135f333ba413828ed8e9c9bd08ffb5470cd8c 100644
--- a/docs/source/api/base/reference_component_manager.rst
+++ b/docs/source/api/base/reference_component_manager.rst
@@ -1,4 +1,3 @@
-
 ================================
 Reference Base Component Manager
 ================================
diff --git a/docs/source/api/capability_device.rst b/docs/source/api/capability_device.rst
index 973e38de8413864e28ba531f5b943b97ce07e4a1..52b8fb79003a8be166a55f7ff7d627a341ac9efd 100644
--- a/docs/source/api/capability_device.rst
+++ b/docs/source/api/capability_device.rst
@@ -1,4 +1,3 @@
-
 =================
 Capability Device
 =================
diff --git a/docs/source/api/commands.rst b/docs/source/api/commands.rst
index 70b6557902a04a13f3e13ce8f1e4a64b94a90300..7a251c81334aba5fad8561db46f05693103bcef0 100644
--- a/docs/source/api/commands.rst
+++ b/docs/source/api/commands.rst
@@ -1,4 +1,3 @@
-
 ========
 Commands
 ========
diff --git a/docs/source/api/control_model.rst b/docs/source/api/control_model.rst
index da751799de28550a9cd403e9e79be52e498928a4..836668d3d8af3beb100e587da81a4dfde9159f6c 100644
--- a/docs/source/api/control_model.rst
+++ b/docs/source/api/control_model.rst
@@ -1,4 +1,3 @@
-
 =============
 Control Model
 =============
diff --git a/docs/source/api/csp/obs/component_manager.rst b/docs/source/api/csp/obs/component_manager.rst
index 238d6c9baf83a05669b9165136bb97eec9992409..d082d253f7e8141db303a3faa370198741531cd7 100644
--- a/docs/source/api/csp/obs/component_manager.rst
+++ b/docs/source/api/csp/obs/component_manager.rst
@@ -1,4 +1,3 @@
-
 =========================
 CSP obs component manager
 =========================
diff --git a/docs/source/api/csp/obs/obs_device.rst b/docs/source/api/csp/obs/obs_device.rst
index 7e09d1b100d7797e522c0f81282a187447ba6b73..d556e02dac2bd49ebe6e67bd014d94aa77d46024 100644
--- a/docs/source/api/csp/obs/obs_device.rst
+++ b/docs/source/api/csp/obs/obs_device.rst
@@ -1,4 +1,3 @@
-
 =========================
 CSP Subelement Obs device
 =========================
diff --git a/docs/source/api/csp/obs/obs_state_model.rst b/docs/source/api/csp/obs/obs_state_model.rst
index edafe2b8ea5479959ad13310e59cbcac145ac29d..8391d0635e7a3bef4b857e548f8bd29f2bd842b7 100644
--- a/docs/source/api/csp/obs/obs_state_model.rst
+++ b/docs/source/api/csp/obs/obs_state_model.rst
@@ -1,4 +1,3 @@
-
 ==============================
 CSP Subelement Obs State Model
 ==============================
diff --git a/docs/source/api/csp/obs/reference_component_manager.rst b/docs/source/api/csp/obs/reference_component_manager.rst
index 0e258e931558aa3251ba62acfa7ada09b3f2db20..beb98715b639bc7da4547109ee969328b91c80b2 100644
--- a/docs/source/api/csp/obs/reference_component_manager.rst
+++ b/docs/source/api/csp/obs/reference_component_manager.rst
@@ -1,4 +1,3 @@
-
 ===================================
 Reference CSP Obs Component Manager
 ===================================
diff --git a/docs/source/api/csp/subarray/component_manager.rst b/docs/source/api/csp/subarray/component_manager.rst
index cb55162ba6c419f80230e4ec9dd60e04417e0e8b..f9e055256dabbe135d4dc094cf811d03aae72122 100644
--- a/docs/source/api/csp/subarray/component_manager.rst
+++ b/docs/source/api/csp/subarray/component_manager.rst
@@ -1,4 +1,3 @@
-
 ==============================
 CSP Subarray Component Manager
 ==============================
diff --git a/docs/source/api/csp/subarray/reference_component_manager.rst b/docs/source/api/csp/subarray/reference_component_manager.rst
index 0e976a6d7a3faaf2f6bdc34d2f3883f90aefc51d..4aecd76bbf5389ed2fc4e99ab9ff8a793847384e 100644
--- a/docs/source/api/csp/subarray/reference_component_manager.rst
+++ b/docs/source/api/csp/subarray/reference_component_manager.rst
@@ -1,4 +1,3 @@
-
 ========================================
 Reference CSP Subarray Component Manager
 ========================================
diff --git a/docs/source/api/csp/subarray/subarray_device.rst b/docs/source/api/csp/subarray/subarray_device.rst
index fa3239bfefd9397d143677abe83df641bf11619c..c0e7eefac20c1f600e36b095877c7bec56f6141b 100644
--- a/docs/source/api/csp/subarray/subarray_device.rst
+++ b/docs/source/api/csp/subarray/subarray_device.rst
@@ -1,4 +1,3 @@
-
 ===================
 CSP Subarray device
 ===================
diff --git a/docs/source/api/faults.rst b/docs/source/api/faults.rst
index 99304531c6caccec9bb59d38d74b030790d078cb..c7701a00a501d1e5639f7f6ced76f0ea8e7837e2 100644
--- a/docs/source/api/faults.rst
+++ b/docs/source/api/faults.rst
@@ -1,4 +1,3 @@
-
 ======
 Faults
 ======
diff --git a/docs/source/api/logger_device.rst b/docs/source/api/logger_device.rst
index 7cbce3281a7df98c84fb69df22d27d03713b5f96..f91ffe08b4e48df32d599f26469534ab4e494a95 100644
--- a/docs/source/api/logger_device.rst
+++ b/docs/source/api/logger_device.rst
@@ -1,4 +1,3 @@
-
 =============
 Logger Device
 =============
diff --git a/docs/source/api/master_device.rst b/docs/source/api/master_device.rst
index b14c45df2840425808580beb40994bcacdab1891..ec74fa4c2121398bd6e034620fa664a7daa253c6 100644
--- a/docs/source/api/master_device.rst
+++ b/docs/source/api/master_device.rst
@@ -1,4 +1,3 @@
-
 =============
 Master Device
 =============
diff --git a/docs/source/api/obs/index.rst b/docs/source/api/obs/index.rst
index 04e88fdc76e6c53a000643e016f1a04e66ac8ca0..5bfd51a324eb6bce696dddaa841a7262142293a7 100644
--- a/docs/source/api/obs/index.rst
+++ b/docs/source/api/obs/index.rst
@@ -1,3 +1,4 @@
+==============
 Obs subpackage
 ==============
 
diff --git a/docs/source/api/obs/obs_device.rst b/docs/source/api/obs/obs_device.rst
index bab50b23614f4d0e7eed11500e6615b7f4975178..03133428dfa87a80c1a321b3ca7976a73dda458a 100644
--- a/docs/source/api/obs/obs_device.rst
+++ b/docs/source/api/obs/obs_device.rst
@@ -1,4 +1,3 @@
-
 ==========
 Obs Device
 ==========
diff --git a/docs/source/api/obs/obs_state_model.rst b/docs/source/api/obs/obs_state_model.rst
index 1f072c7a35f606c05f927fb87d94755ce313b2f8..03424339409670c8a1afbfb69701206cc0f517d6 100644
--- a/docs/source/api/obs/obs_state_model.rst
+++ b/docs/source/api/obs/obs_state_model.rst
@@ -1,4 +1,3 @@
-
 ===============
 Obs State Model
 ===============
diff --git a/docs/source/api/release.rst b/docs/source/api/release.rst
index 8854d763312a46a1ac71bd91d10b41e20e01e95e..a7576acee06191d47556e95c9b6ee6203697ccd7 100644
--- a/docs/source/api/release.rst
+++ b/docs/source/api/release.rst
@@ -1,4 +1,3 @@
-
 =======
 Release
 =======
diff --git a/docs/source/api/subarray/component_manager.rst b/docs/source/api/subarray/component_manager.rst
index d8d4a2c0d204355efbd98edef1390fa533706db6..d1d83e3cd68e9b6a4582dc9ae8ae50acfd4720ef 100644
--- a/docs/source/api/subarray/component_manager.rst
+++ b/docs/source/api/subarray/component_manager.rst
@@ -1,4 +1,3 @@
-
 ==========================
 Subarray Component Manager
 ==========================
diff --git a/docs/source/api/subarray/index.rst b/docs/source/api/subarray/index.rst
index 471a4d3a2cb9cde1aef178402295876fc7391580..58a07a06a88de1d94ec6e90869eebcd9c5a425e3 100644
--- a/docs/source/api/subarray/index.rst
+++ b/docs/source/api/subarray/index.rst
@@ -1,3 +1,4 @@
+========
 Subarray
 ========
 
diff --git a/docs/source/api/subarray/reference_component_manager.rst b/docs/source/api/subarray/reference_component_manager.rst
index 812466e86f2f712461d4bf0e1fccbc60148634e1..b39b16889dcfb71e2431ce819e58883e154385ad 100644
--- a/docs/source/api/subarray/reference_component_manager.rst
+++ b/docs/source/api/subarray/reference_component_manager.rst
@@ -1,4 +1,3 @@
-
 ====================================
 Reference Subarray Component Manager
 ====================================
diff --git a/docs/source/api/subarray/subarray_device.rst b/docs/source/api/subarray/subarray_device.rst
index 7333fd52c4989e87bf53369e5a015c1897ca75fa..881e7dd627ca7b434ef921c529bed568dacc30f2 100644
--- a/docs/source/api/subarray/subarray_device.rst
+++ b/docs/source/api/subarray/subarray_device.rst
@@ -1,4 +1,3 @@
-
 ===============
 Subarray Device
 ===============
diff --git a/docs/source/api/subarray/subarray_obs_state_model.rst b/docs/source/api/subarray/subarray_obs_state_model.rst
index 74123e43fc07dd0e323844af1d44c054effea4ac..ec0fec9e9ced31ce58cb973fe7c857396cd9d2e4 100644
--- a/docs/source/api/subarray/subarray_obs_state_model.rst
+++ b/docs/source/api/subarray/subarray_obs_state_model.rst
@@ -1,4 +1,3 @@
-
 ========================
 Subarray Obs State Model
 ========================
diff --git a/docs/source/api/tel_state_device.rst b/docs/source/api/tel_state_device.rst
index dbbc3ea9d6e5a069c4910cbed8257475a67bf1c1..b32cb68e3b4d1b8d60d114779048e37a6c4acc27 100644
--- a/docs/source/api/tel_state_device.rst
+++ b/docs/source/api/tel_state_device.rst
@@ -1,4 +1,3 @@
-
 ================
 Tel State Device
 ================
diff --git a/docs/source/api/utils.rst b/docs/source/api/utils.rst
index bd0645823e689e026761cdf6d14723e171c1fae5..c145bd88c9a04dfa5d874bac387d7092ee931600 100644
--- a/docs/source/api/utils.rst
+++ b/docs/source/api/utils.rst
@@ -1,4 +1,3 @@
-
 =====
 Utils
 =====
diff --git a/docs/source/guide/component_managers.rst b/docs/source/guide/component_managers.rst
index 4e0ca54d7b9b680493f35605143a618680ee1cae..cd182d01b88a3aa1c1abf57fb57b0957b3905ed3 100644
--- a/docs/source/guide/component_managers.rst
+++ b/docs/source/guide/component_managers.rst
@@ -1,3 +1,4 @@
+=================================
 Components and component managers
 =================================
 
diff --git a/docs/source/guide/getting_started.rst b/docs/source/guide/getting_started.rst
index 7769c645b4ab783c508782dc0354c28dbb2aaf56..0b67fedfefddd4108b1a15f5baf9a88ff0b5cba6 100644
--- a/docs/source/guide/getting_started.rst
+++ b/docs/source/guide/getting_started.rst
@@ -1,3 +1,4 @@
+===============
 Getting started
 ===============
 This page will guide you through the steps to writing a SKA Tango device
diff --git a/docs/source/guide/index.rst b/docs/source/guide/index.rst
index 40fdcc2cfc81d28820b39e7adb4500634e24dddd..2d0b701bba26080cce22b54ff11659da1fbacccc 100644
--- a/docs/source/guide/index.rst
+++ b/docs/source/guide/index.rst
@@ -1,3 +1,4 @@
+===============
 Developer Guide
 ===============