Skip to content

Commit ed86027

Browse files
author
Yuta Namiki
committed
[FAB-9523] Use American Spelling in Doc Consistently
Since labels in configuration file (configtx.yaml), standard configuration directory (crypto-config/peerOrganizations) and many identifiers in source codes use American spelling, it would be kind to a reader if the document use American spelling consistently. Change-Id: Ib59ee66453465abefb43ddbf8474e271258f0f3d Signed-off-by: Yuta Namiki <y-namiki@ak.jp.nec.com>
1 parent 3d066c1 commit ed86027

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

docs/source/identity/identity.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ It's because CAs are so important that Fabric provides a built-in CA component t
217217
allow you to create CAs in the blockchain networks you form. This component -- known
218218
as **fabric-ca** is a private root CA provider capable of managing digital identities of
219219
Fabric participants that have the form of X.509 certificates.
220-
Because Fabric-CA is a custom CA targetting the Root CA needs of Fabric,
220+
Because Fabric-CA is a custom CA targeting the Root CA needs of Fabric,
221221
it is inherently not capable of providing SSL certificates for general/automatic use
222222
in browsers. However, because **some** CA must be used to manage identity
223223
(even in a test environment), fabric-ca can be used to provide and manage

docs/source/membership/membership.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ name the MSP after the organization, a convention you'll find adopted in most po
4242
configurations. For example, organization `ORG1` would have an MSP called `ORG1-MSP`.
4343
In some cases an organization may require multiple membership groups -- for example,
4444
where channels are used to perform very different business functions between
45-
organisations. In these cases it makes sense to have multiple MSPs and name them
45+
organizations. In these cases it makes sense to have multiple MSPs and name them
4646
accordingly, e.g., `ORG2-MSP-NATIONAL` and `ORG2-MSP-GOVERNMENT`, reflecting the
4747
different membership roots of trust within `ORG2` in the NATIONAL sales channel
4848
compared to the GOVERNMENT regulatory channel.

docs/source/msp-identity-validity-rules.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ Notice that the validity of a certificate is also affected, in a similar
3333
way, if one or more organizational units are specified in the MSP configuration.
3434
Recall that an organizational unit is specified in an MSP configuration
3535
as a pair of two values, say (parent-cert, ou-string) representing the
36-
certificate authority that certifies that organisational unit, and the
37-
actual organisational unit identifier, respectively.
36+
certificate authority that certifies that organizational unit, and the
37+
actual organizational unit identifier, respectively.
3838
If a certificate C is signed by an iCA or rCA
39-
for which an organisational unit has been specified in the MSP configuration,
39+
for which an organizational unit has been specified in the MSP configuration,
4040
then C is considered valid if, among other requirements, it includes
4141
ou-string as part of its OU field.
4242

docs/source/msp.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ verification. These parameters are deduced by
5454
to request changes to this MSP configuration (e.g. root CAs, intermediate CAs)
5555
- A list of Organizational Units that valid members of this MSP should
5656
include in their X.509 certificate; this is an optional configuration
57-
parameter, used when, e.g., multiple organisations leverage the same
57+
parameter, used when, e.g., multiple organizations leverage the same
5858
root of trust, and intermediate CAs, and have reserved an OU field for
5959
their members
6060
- A list of certificate revocation lists (CRLs) each corresponding to
@@ -95,7 +95,7 @@ How to generate MSP certificates and their signing keys?
9595
--------------------------------------------------------
9696

9797
To generate X.509 certificates to feed its MSP configuration, the application
98-
can use `Openssl <https://www.openssl.org/>`_. We emphasise that in Hyperledger
98+
can use `Openssl <https://www.openssl.org/>`_. We emphasize that in Hyperledger
9999
Fabric there is no support for certificates including RSA keys.
100100

101101
Alternatively one can use ``cryptogen`` tool, whose operation is explained in
@@ -223,7 +223,7 @@ reject the system genesis block, if the latter includes two MSPs with the same
223223
identifier, and consequently the bootstrapping of the network would fail.
224224

225225
For application channels, the verification components of only the MSPs that
226-
govern a channel need to reside in the channel's genesis block. We emphasise
226+
govern a channel need to reside in the channel's genesis block. We emphasize
227227
that it is **the responsibility of the application** to ensure that correct
228228
MSP configuration information is included in the genesis blocks (or the
229229
most recent configuration block) of a channel prior to instructing one or
@@ -261,7 +261,7 @@ considered:
261261
data with a set of peers that are members of the same subdivision, and NOT with
262262
the full set of providers constituting the actual organization.
263263
- **Multiple organizations using a single MSP.** This corresponds to a
264-
case of a consortium of organisations that are governed by similar
264+
case of a consortium of organizations that are governed by similar
265265
membership architecture. One needs to know here that peers would propagate
266266
organization-scoped messages to the peers that have an identity under the
267267
same MSP regardless of whether they belong to the same actual organization.
@@ -282,7 +282,7 @@ Two ways to handle this:
282282
a chaincode. A limitation of this approach is that gossip peers would
283283
consider peers with membership identities under their local MSP as
284284
members of the same organization, and would consequently gossip
285-
with them organisation-scoped data (e.g. their status).
285+
with them organization-scoped data (e.g. their status).
286286
- **Defining one MSP to represent each division**. This would involve specifying for each
287287
division, a set of certificates for root CAs, intermediate CAs, and admin
288288
Certs, such that there is no overlapping certification path across MSPs.

0 commit comments

Comments
 (0)