You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fl...@apache.org on 2017/10/23 12:42:11 UTC
[couchdb-documentation] 03/03: Switch to American English spelling
This is an automated email from the ASF dual-hosted git repository.
flimzy pushed a commit to branch spelling
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
commit a138bf5aa8b0a0c6a82562e038674e0c10c2f418
Author: Jonathan Hall <fl...@flimzy.com>
AuthorDate: Mon Oct 23 12:16:04 2017 +0200
Switch to American English spelling
---
src/api/basics.rst | 2 +-
src/api/database/changes.rst | 2 +-
src/api/database/compact.rst | 2 +-
src/api/server/common.rst | 4 ++--
src/config/auth.rst | 2 +-
src/config/intro.rst | 2 +-
src/intro/overview.rst | 6 +++---
src/maintenance/performance.rst | 2 +-
src/replication/conflicts.rst | 6 +++---
src/replication/protocol.rst | 4 ++--
src/whatsnew/2.0.rst | 2 +-
src/whatsnew/2.1.rst | 10 +++++-----
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/api/basics.rst b/src/api/basics.rst
index 70f096c..34358a1 100644
--- a/src/api/basics.rst
+++ b/src/api/basics.rst
@@ -21,7 +21,7 @@ Requests are made using HTTP and requests are used to request information from
the database, store new data, and perform views and formatting of the
information stored within the documents.
-Requests to the API can be categorised by the different areas of the CouchDB
+Requests to the API can be categorized by the different areas of the CouchDB
system that you are accessing, and the HTTP method used to send the request.
Different methods imply different operations, for example retrieval of
information from the database is typically handled by the ``GET`` operation,
diff --git a/src/api/database/changes.rst b/src/api/database/changes.rst
index 41c581d..8acd578 100644
--- a/src/api/database/changes.rst
+++ b/src/api/database/changes.rst
@@ -399,7 +399,7 @@ Event Source
The `eventsource` feed provides push notifications that can be consumed in
the form of DOM events in the browser. Refer to the `W3C eventsource
-specification`_ for further details. CouchDB also honours the ``Last-Event-ID``
+specification`_ for further details. CouchDB also honors the ``Last-Event-ID``
parameter.
.. code-block:: http
diff --git a/src/api/database/compact.rst b/src/api/database/compact.rst
index 4fcf34e..5402b57 100644
--- a/src/api/database/compact.rst
+++ b/src/api/database/compact.rst
@@ -22,7 +22,7 @@
Request compaction of the specified database. Compaction compresses the
disk database file by performing the following operations:
- - Writes a new, optimised, version of the database file, removing any
+ - Writes a new, optimized, version of the database file, removing any
unused sections from the new version during write. Because a new file is
temporarily created for this purpose, you may require up to twice the
current storage space of the specified database in order for the
diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index a15f8c3..ba656f5 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -296,7 +296,7 @@
- **add_node**: Add the specified remote node to
this cluster's list of nodes, joining it to the
cluster.
- - **finish_cluster**: Finalise the cluster by
+ - **finish_cluster**: Finalize the cluster by
creating the standard system databases.
:<json string bind_address: The IP address to which to bind the current
node. The special value ``0.0.0.0`` may be specified to bind to all
@@ -746,7 +746,7 @@ Canceling Continuous Replication
You can cancel continuous replication by adding the ``cancel`` field to the
JSON request object and setting the value to true. Note that the structure of
the request must be identical to the original for the cancellation request to
-be honoured. For example, if you requested continuous replication, the
+be honored. For example, if you requested continuous replication, the
cancellation request must also contain the ``continuous`` field.
For example, the replication request:
diff --git a/src/config/auth.rst b/src/config/auth.rst
index 8a22a2a..14f6234 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -223,7 +223,7 @@ Authentication Configuration
.. warning::
This setting only affects the node-local port (5986 by default).
Most administrators want the ``[chttpd]`` setting of the same name
- for clustered-port (5984) behaviour.
+ for clustered-port (5984) behavior.
.. config:option:: secret :: Authentication secret token
diff --git a/src/config/intro.rst b/src/config/intro.rst
index 21f0d6d..313c29a 100644
--- a/src/config/intro.rst
+++ b/src/config/intro.rst
@@ -42,7 +42,7 @@ For example, setting the :option:`httpd/bind_address` parameter in
.. warning::
The ``default.ini`` file may be overwritten during an upgrade or
- re-installation, so localised changes should be made to the ``local.ini``
+ re-installation, so localized changes should be made to the ``local.ini``
file or files within the ``local.d`` directory.
.. highlight:: sh
diff --git a/src/intro/overview.rst b/src/intro/overview.rst
index 61fe454..f3f23a0 100644
--- a/src/intro/overview.rst
+++ b/src/intro/overview.rst
@@ -22,7 +22,7 @@ Document Storage
A CouchDB server hosts named databases, which store **documents**.
Each document is uniquely named in the database, and CouchDB provides
a `RESTful`_ :ref:`HTTP API <api/basics>` for reading and updating (add, edit,
-delete) database documents.
+delete) database documents.
Documents are the primary unit of data in CouchDB and consist of any number
of fields and attachments. Documents also include metadata that’s maintained
@@ -310,7 +310,7 @@ Applications
Using just the basic replication model, many traditionally single server
database applications can be made distributed with almost no extra work.
CouchDB replication is designed to be immediately useful for basic database
-applications, while also being extendable for more elaborate and full-featured
+applications, while also being extensible for more elaborate and full-featured
uses.
With very little database work, it is possible to build a distributed
@@ -354,7 +354,7 @@ For higher availability and more concurrent users, CouchDB is designed for
is independent and replicates data with its cluster mates, allowing individual
server failures with zero downtime. And because consistency scans
and fix-ups aren’t needed on restart,
-if the entire cluster fails -- due to a power outage in a datacenter,
+if the entire cluster fails -- due to a power outage in a data center,
for example -- the entire CouchDB distributed system becomes immediately
available after a restart.
diff --git a/src/maintenance/performance.rst b/src/maintenance/performance.rst
index 82a36dd..55ef2b6 100644
--- a/src/maintenance/performance.rst
+++ b/src/maintenance/performance.rst
@@ -199,7 +199,7 @@ sent to the TCP socket, like the reply to a document write request (or reading
a very small document), will not be sent immediately to the network - TCP will
buffer it for a while hoping that it will be asked to send more data through
the same socket and then send all the data at once for increased performance.
-This TCP buffering behaviour can be disabled via
+This TCP buffering behavior can be disabled via
:config:option:`httpd/socket_options`:
.. code-block:: ini
diff --git a/src/replication/conflicts.rst b/src/replication/conflicts.rst
index de18928..a6cc88b 100644
--- a/src/replication/conflicts.rst
+++ b/src/replication/conflicts.rst
@@ -349,15 +349,15 @@ saved successfully may suddenly lose their changes, only to be resurrected some
time later. This may or may not be acceptable.
Also, it's easy to forget to start the sweeper, or not to implement it properly,
-and this will introduce odd behaviour which will be hard to track down.
+and this will introduce odd behavior which will be hard to track down.
CouchDB's "winning" revision algorithm may mean that information drops out of a
view until a conflict has been resolved. Consider Bob's business card again;
suppose Alice has a view which emits mobile numbers, so that her telephony
application can display the caller's name based on caller ID. If there are
conflicting documents with Bob's old and new mobile numbers, and they happen to
-be resolved in favour of Bob's old number, then the view won't be able to
-recognise his new one. In this particular case, the application might have
+be resolved in favor of Bob's old number, then the view won't be able to
+recognize his new one. In this particular case, the application might have
preferred to put information from both the conflicting documents into the view,
but this currently isn't possible.
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index 1343869..bd4c170 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -18,7 +18,7 @@ CouchDB Replication Protocol
:Version: 3
-The `CouchDB Replication Protocol` is a protocol for synchronising JSON
+The `CouchDB Replication Protocol` is a protocol for synchronizing JSON
documents between 2 peers over HTTP/1.1 by using the public :ref:`CouchDB REST
API <api>` and is based on the Apache CouchDB MVCC_ Data model.
@@ -1840,7 +1840,7 @@ type applied):
"reason": "kaboom!"
}
-Optimisations
+Optimizations
=============
There are RECOMMENDED approaches to optimize the Replication process:
diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst
index 8437b5c..b4e3b16 100644
--- a/src/whatsnew/2.0.rst
+++ b/src/whatsnew/2.0.rst
@@ -144,7 +144,7 @@ Breaking Changes
================
The following changes in 2.0 represent a significant deviation from
-CouchDB 1.x and may alter behaviour of systems designed to work with
+CouchDB 1.x and may alter behavior of systems designed to work with
older versions of CouchDB:
* :ghissue:`620`: ``POST /dbname`` no longer returns an ETag response header,
diff --git a/src/whatsnew/2.1.rst b/src/whatsnew/2.1.rst
index 88f648b..359e604 100644
--- a/src/whatsnew/2.1.rst
+++ b/src/whatsnew/2.1.rst
@@ -34,10 +34,10 @@ Upgrade Notes
performance cost. Consider instead using the ``_scheduler/docs`` HTTP
endpoint.
-* The ``stale`` parameter for views and ``_find`` has been deprecated in favour
+* The ``stale`` parameter for views and ``_find`` has been deprecated in favor
of two new parameters: ``stable`` and ``update``. The old ``stale=ok``
- behaviour is equivalent to ``stable=true&update=false``, and the old
- ``stale=update_after`` behaviour is equivalent to ``stable=true&update=lazy``.
+ behavior is equivalent to ``stable=true&update=false``, and the old
+ ``stale=update_after`` behavior is equivalent to ``stable=true&update=lazy``.
The deprecated ``stale`` parameter will be removed in CouchDB 3.0.
* The ``[couchdb] max_document_size`` configuration parameter was renamed
@@ -309,7 +309,7 @@ The 2.1.0 release includes fixes for the following issues:
* :issue:`1447`: X-Couch-Update-NewRev header is missed if custom headers are
specified in response of _update handler (missed in 2.0 merge)
* :issue:`2731`: Authentication DB was not considered a system DB
-* :issue:`3010`: (Superceded fix for replication exponential backoff)
+* :issue:`3010`: (Superseded fix for replication exponential backoff)
* :issue:`3090`: Error when handling empty "Access-Control-Request-Headers"
header
* :issue:`3100`: Fix documentation on require_valid_user
@@ -335,7 +335,7 @@ The 2.1.0 release includes fixes for the following issues:
spawned process
* :issue:`3193`: fabric:open_revs returns multiple results when one of the
shards has stem_interactive_updates=false
-* :issue:`3199`: Replicator VDU function doesn't acount for an already
+* :issue:`3199`: Replicator VDU function doesn't account for an already
malformed document in replicator db
* :issue:`3202`: (mango) do not allow empty field names
* :issue:`3220`: Handle timeout in _revs_diff
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.