Merge changes from topic 'doc-fixes'

* changes: [FAB-7942] Remove extraneous logging topic [FAB-7941] Kafka doc belongs under operations [FAB-7939] TLS doc belongs under operations
hyperledger · Jan 27, 2018 · b23f581 · b23f581
2 parents 0ca3d2f + 8abf61f
commit b23f581
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/docs/source/dev-setup/build.rst b/docs/source/dev-setup/build.rst
@@ -154,18 +154,5 @@ manipulation through the environment is shown below:
 
     CORE_PEER_LOGGING_LEVEL=CRITICAL peer
 
-Logging
--------
-
-Logging utilizes the `go-logging <https://github.com/op/go-logging>`__
-library.
-
-The available log levels in order of increasing verbosity are: *CRITICAL
-\| ERROR \| WARNING \| NOTICE \| INFO \| DEBUG*
-
-See the :doc:`logging-control` document for
-instructions on tweaking the level of log messages to output when running
-the various Hyperledger Fabric components.
-
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -75,6 +75,8 @@ Business:
    error-handling
    logging-control
    peer-commands
+   enable_tls
+   kafka
 
 .. toctree::
    :maxdepth: 2
@@ -84,13 +86,11 @@ Business:
    txflow
    Hyperledger Fabric CA's User Guide <http://hyperledger-fabric-ca.readthedocs.io/en/latest>
    fabric-sdks
-   kafka
    channels
    couchdb_as_state_database
    peer_event_services
    readwrite
    gossip
-   enable_tls
 
 .. toctree::
    :maxdepth: 2