From a97d8b6c690eb25fc95d039ce8161ecb4b877ec6 Mon Sep 17 00:00:00 2001 From: Joshua Horton Date: Thu, 16 Mar 2017 13:32:13 -0400 Subject: [PATCH] FAB-2344 fix docs per Elli, Sharon, Keith 1 & 2 from slack disc. 3 is pending - very large. [ci skip] Change-Id: Id7dd4a8b61fe9be936ce243238f7653155f98ff0 Signed-off-by: Joshua Horton Signed-off-by: Christopher Ferris --- docs/source/fabric_model.rst | 5 +++-- docs/source/glossary.rst | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docs/source/fabric_model.rst b/docs/source/fabric_model.rst index f92a547d6ae..52d7665b10b 100644 --- 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 `__ +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 index 47aa8c5bc45..6f6d1d256c3 100644 --- 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: