Skip to content

Commit

Permalink
FAB-2344 fix docs
Browse files Browse the repository at this point in the history
per Elli, Sharon, Keith
1 & 2 from slack disc.
3 is pending - very large.

[ci skip]

Change-Id: Id7dd4a8b61fe9be936ce243238f7653155f98ff0
Signed-off-by: Joshua Horton <joshh@us.ibm.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
  • Loading branch information
joshhus authored and christo4ferris committed Apr 14, 2017
1 parent a71af56 commit a97d8b6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
5 changes: 3 additions & 2 deletions docs/source/fabric_model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
15 changes: 13 additions & 2 deletions docs/source/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down

0 comments on commit a97d8b6

Please sign in to comment.