Skip to content

Commit

Permalink
[FAB-6122] Upgrade to 1.1 documentation
Browse files Browse the repository at this point in the history
Doc on upgrade to 1.1. Also change index and name of doc called
"Fabric Capabilities" to avoid conflict.
[ci-skip]

Change-Id: Iee1ba772bce91406d696017b2f083688adfc16fe
Signed-off-by: joe-alewine <Joe.Alewine@ibm.com>
  • Loading branch information
joe-alewine authored and Joe Alewine committed Jan 26, 2018
1 parent 4b419a6 commit 250f899
Show file tree
Hide file tree
Showing 3 changed files with 411 additions and 10 deletions.
15 changes: 6 additions & 9 deletions docs/source/capabilities.rst → docs/source/functionalities.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Hyperledger Fabric Capabilities
===============================
Hyperledger Fabric Functionalities
==================================

Hyperledger Fabric is a unique implementation of distributed ledger technology
Hyperledger Fabric is an implementation of distributed ledger technology
(DLT) that delivers enterprise-ready network security, scalability,
confidentiality and performance, in a modular blockchain architecture.
Hyperledger Fabric delivers the following blockchain network capabilities:
Hyperledger Fabric delivers the following blockchain network functionalities:

Identity management
-------------------
Expand All @@ -14,9 +14,7 @@ identity service that manages user IDs and authenticates all participants on
the network. Access control lists can be used to provide additional layers of
permission through authorization of specific network operations. For example, a
specific user ID could be permitted to invoke a chaincode application, but
blocked from deploying new chaincode. One truism about Hyperledger Fabric
networks is that members know each other (identity), but they do not know what
each other are doing (privacy and confidentiality).
blocked from deploying new chaincode.

Privacy and confidentiality
---------------------------
Expand Down Expand Up @@ -68,8 +66,7 @@ identity, ordering (consensus) and encryption, for example, can be plugged in
to any Hyperledger Fabric network. The result is a universal blockchain
architecture that any industry or public domain can adopt, with the assurance
that its networks will be interoperable across market, regulatory and
geographic boundaries. By contrast, current alternatives to Hyperledger Fabric
are largely partisan, constrained and industry-specific.
geographic boundaries.

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
3 changes: 2 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Business:
:caption: Key Concepts

blockchain
capabilities
functionalities
fabric_model
ledger
usecases
Expand All @@ -64,6 +64,7 @@ Business:
:maxdepth: 2
:caption: Operations Guide

upgrade_to_one_point_one
best_practices
msp
configtx
Expand Down
Loading

0 comments on commit 250f899

Please sign in to comment.