Merge "FAB-2344 fix docs"

hyperledger · Apr 14, 2017 · 5e88e2e · 5e88e2e
2 parents fe8c71d + a97d8b6
commit 5e88e2e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/docs/source/fabric_model.rst b/docs/source/fabric_model.rst
@@ -92,8 +92,9 @@ governed on the broader network and on channel levels.  This "permissioned" noti
 of Fabric, coupled with the existence and capabilities of channels, helps address
 scenarios where privacy and confidentiality are paramount concerns.
 
-See the Fabric CA section to better understand cryptographic
-implementations, and the sign, verify, authenticate approach used in Fabric.
+See the 'Fabric CA <https://hyperledger-fabric.readthedocs.io/en/latest/Setup/ca-setup.html>`__
+section to better understand cryptographic implementations, and the sign, verify,
+authenticate approach used in Fabric.
 
 .. _Consensus:
 

diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst
@@ -143,8 +143,19 @@ A policy could require that a transaction be endorsed by a minimum number of
 endorsing peers, a minimum percentage of endorsing peers, or by all endorsing
 peers that are assigned to a specific chaincode application. Policies can be
 curated based on the application and the desired level of resilience against
-misbehavior (deliberate or not) by the endorsing peers.  A distinct endorsement
-policy for deploy transactions, which install new chaincode, is also required.
+misbehavior (deliberate or not) by the endorsing peers. A distinct endorsement
+policy for install and instantiate transactions is also required.
+
+.. _Fabric-ca:
+
+Fabric-ca
+-------------
+
+Fabric-ca is the default Certificate Authority component, which issues PKI-based
+certificates to network member organizations and their users. The CA issues one
+root certificate (rootCert) to each member, one enrollment certificate (eCert)
+to each authorized user, and a number of transaction certificates (tCerts) for
+each eCert.
 
 .. _Genesis-Block: