Cleanup services
diff --git a/sphinx/files/reclass/source/nodes/index.rst b/sphinx/files/reclass/source/nodes/index.rst
index 612e144..81a9252 100644
--- a/sphinx/files/reclass/source/nodes/index.rst
+++ b/sphinx/files/reclass/source/nodes/index.rst
@@ -13,7 +13,7 @@
- **IP Addresses**
- **Assigned Services**
{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
- * - {{ node_name }}
+ * - :ref:`{{ node_name }}`
{%- if node_grains.sphinx is defined %}
- {% for ip in node_grains.ipv4 %}
{%- if ip != "127.0.0.1" %}
diff --git a/sphinx/files/reclass/source/nodes/node.rst b/sphinx/files/reclass/source/nodes/node.rst
index 7412ec7..a00a1a1 100644
--- a/sphinx/files/reclass/source/nodes/node.rst
+++ b/sphinx/files/reclass/source/nodes/node.rst
@@ -1,6 +1,8 @@
+.. _{{ node_name }}:
+
===============================================
-Node {{ node_name }}
+{{ node_name }}
===============================================
{%- if node_grains.get('sphinx_doc', {}) is not none %}
@@ -11,7 +13,6 @@
===============================================
.. list-table::
- :width: 100
:widths: 15 15 70
:header-rows: 1
diff --git a/sphinx/files/reclass/source/services/catalog.rst b/sphinx/files/reclass/source/services/catalog.rst
index 7add482..265dc1d 100644
--- a/sphinx/files/reclass/source/services/catalog.rst
+++ b/sphinx/files/reclass/source/services/catalog.rst
@@ -3,4 +3,19 @@
Service Catalog
===============================
-All services within the configured infrastructure.
+All service definitions of configured infrastructure.
+
+.. list-table::
+ :widths: 20 80
+ :header-rows: 1
+
+ * - **Service**
+ - **Description**
+{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
+{%- if node_grains.get('sphinx_doc', {}) != None %}
+{%- for service_name, service in node_grains.get('sphinx', {}).get('doc', {}).iteritems() %}
+ * - {{ service.name }}
+ - {{ service.get('description', '') }}
+{%- endfor %}
+{%- endif %}
+{%- endfor %}
diff --git a/sphinx/files/reclass/source/services/endpoints.rst b/sphinx/files/reclass/source/services/endpoints.rst
index 4c2d99b..871432c 100644
--- a/sphinx/files/reclass/source/services/endpoints.rst
+++ b/sphinx/files/reclass/source/services/endpoints.rst
@@ -1,9 +1,9 @@
-===============================
+=================
Service Endpoints
-===============================
+=================
-Services exposed within configured infrastructure.
+Services endpoints within configured infrastructure.
.. list-table::
:header-rows: 1
@@ -24,7 +24,7 @@
- {{ endpoint.address }}
- {{ endpoint.protocol }}
- {{ service_name }}
- - {{ node_name }}
+ - :ref:`{{ node_name }}`
{%- endfor %}
{%- endif %}
{%- endfor %}