Skip to content

Commit

Permalink
Merge "[FAB-10818] Minor edit to Intro" into release-1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
C0rWin authored and Gerrit Code Review committed Jun 25, 2018
2 parents 08cbd6c + 4c9a8e1 commit b4ff969
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/source/whatis.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ network overlay. Thus, only those nodes that participate in a channel have
access to the smart contract (chaincode) and data transacted, preserving the
privacy and confidentiality of both.

Fabric is also working on two sets of features that are intended to improve
upon its privacy and confidentiality capabilities, specifically: private data
a feature we call SideDB, and zero knowledge proofs (ZKP). More on those as they
become available.
To improve upon its privacy and confidentiality capabilities, Fabric has
added support for [private data](./private-data/private-data.html) and is working
on zero knowledge proofs (ZKP) available in the future. More on this as it
becomes available.

## Pluggable Consensus

Expand Down

0 comments on commit b4ff969

Please sign in to comment.