X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=docs%2Fconfiguration.rst;h=e212d9ce2b4dd1b80498e81cdb75c64b925b127c;hb=refs%2Fchanges%2F85%2F10185%2F1;hp=af98c6e22f0518248c9f5203f18052b6100a470f;hpb=fc00439357256a05f1b56220c64eee0acb81315f;p=releng%2Fglobal-jjb.git

diff --git a/docs/configuration.rst b/docs/configuration.rst
index af98c6e2..e212d9ce 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -19,7 +19,7 @@ Documentation for npmrc is available via the `npm project
 <https://docs.npmjs.com/files/npmrc>`_.
 
 :Required: This file MUST exist. An empty file is acceptable if a
-proxy is not available for the project.
+    proxy is not available for the project.
 :type: Custom file
 
 Create a "Custom file" with contents:
@@ -28,15 +28,15 @@ Create a "Custom file" with contents:
 
    registry = https://nexus.opendaylight.org/content/repositories/npmjs/
 
-pip.conf
---------
+pipconf
+-------
 
 This file contains default configuration for the python-pip tool and lives
 in $HOME/.config/pip/pip.conf. Documentation for pip.conf is available via the
 `pip project <https://pip.readthedocs.io/en/stable/user_guide/#configuration>`_.
 
 :Required: This file MUST exist. An empty file is acceptable if a
-proxy is not available for the project.
+    proxy is not available for the project.
 :type: Custom file
 
 Create a "Custom file" with contents:
@@ -46,3 +46,14 @@ Create a "Custom file" with contents:
    [global]
    timeout = 60
    index-url = https://nexus3.opendaylight.org/repository/PyPi/simple
+
+
+Jenkins CI Jobs
+===============
+
+jenkins-cfg-merge
+-----------------
+
+This job manages Jenkins Global configuration. Refer to
+the :ref:`CI Documentation <lf-global-jjb-jenkins-cfg-merge>` for job
+configuration details.