Merge "[FAB-3111] - add to docs"

hyperledger · Apr 27, 2017 · 1b470e2 · 1b470e2
2 parents be623f1 + 846a1d2
commit 1b470e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/docs/source/channels.rst b/docs/source/channels.rst
@@ -1,5 +1,5 @@
 Channels
---------
+========
 
 A Hyperledger Fabric **channel** is a private "subnet" of communication between
 two or more specific network members, for the purpose of conducting private and
@@ -17,6 +17,9 @@ information about the channel policies, members and anchor peers. When adding a
 new member to an existing channel, either this genesis block, or if applicable,
 a more recent reconfiguration block, is shared with the new member.
 
+.. note:: See the :doc:`configtx` section for more more details on the properties
+          and proto structures of config transactions.
+
 The election of a **leading peer** for each member on a channel determines which
 peer communicates with the ordering service on behalf of the member. If no
 leader is identified, an algorithm can be used to identify the leader. The consensus

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -60,6 +60,7 @@ Before diving in, watch how Fabric is `Building a Blockchain for Business <https
    best_practices
    configtx
    configtxgen
+   cc-packaging-and-signing
    Setup/logging-control
 
 .. toctree::
@@ -72,6 +73,7 @@ Before diving in, watch how Fabric is `Building a Blockchain for Business <https
    endorsement-policies
    nodesdk
    orderingservice
+   channels
    ledger
    readwrite
    gossip