You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2013/12/05 13:29:08 UTC
git commit: updated refs/heads/master to c2da01d
Updated Branches:
refs/heads/master 1ba9aa35a -> c2da01d1f
Remove pronouns
Most pronouns were awkwardly referring to COUCHDB as masculine. I left
in the ones clearly referring to a named person's gender.
I grepped for 'him', 'he' and 'his' and fixed all matches I found, if
there are more, everyone is encouraged to fix them.
I corrected some awkward sentence structures as I went because I just
couldn't resist.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c2da01d1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c2da01d1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c2da01d1
Branch: refs/heads/master
Commit: c2da01d1f25a0d3ff34cd1d54624351ded9604d0
Parents: 1ba9aa3
Author: Robert Newson <rn...@apache.org>
Authored: Thu Dec 5 12:23:18 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Dec 5 12:28:45 2013 +0000
----------------------------------------------------------------------
share/doc/src/api/database/changes.rst | 6 +++---
share/doc/src/api/database/common.rst | 2 +-
share/doc/src/api/database/misc.rst | 2 +-
share/doc/src/api/document/common.rst | 2 +-
share/doc/src/config/intro.rst | 2 +-
share/doc/src/config/query-servers.rst | 2 +-
share/doc/src/install/mac.rst | 2 +-
share/doc/src/install/windows.rst | 2 +-
share/doc/src/intro/security.rst | 14 +++++++-------
share/doc/src/maintenance/compaction.rst | 4 ++--
share/doc/src/query-server/protocol.rst | 4 ++--
share/doc/src/replication/replicator.rst | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/api/database/changes.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/database/changes.rst b/share/doc/src/api/database/changes.rst
index 21d44ea..fc46412 100644
--- a/share/doc/src/api/database/changes.rst
+++ b/share/doc/src/api/database/changes.rst
@@ -513,9 +513,9 @@ _view
.. versionadded:: 1.2
-The special filter ``_view`` allows to use existed :ref:`map function <mapfun>`
+The special filter ``_view`` allows to use existing :ref:`map function <mapfun>`
as the :ref:`filter <filterfun>`. If the map function emits anything for the
-processed document he counts as accepted and the changes event emits to the
+processed document it counts as accepted and the changes event emits to the
feed. For most use-practice cases `filter` functions are very similar to `map`
ones, so this feature helps to reduce amount of duplicated code.
@@ -531,7 +531,7 @@ ones, so this feature helps to reduce amount of duplicated code.
Using ``_view`` filter doesn't queries the view index files, so you cannot
use common :ref:`view query parameters <api/ddoc/view>` to additionally
filter the changes feed by index key. Also, CouchDB doesn't returns
- the result instantly as he does for views - it really uses the specified
+ the result instantly as it does for views - it really uses the specified
map function as filter.
Moreover, you cannot make such filters dynamic e.g. process the request
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/api/database/common.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/database/common.rst b/share/doc/src/api/database/common.rst
index 30c99d0..29e523f 100644
--- a/share/doc/src/api/database/common.rst
+++ b/share/doc/src/api/database/common.rst
@@ -258,7 +258,7 @@
.. http:post:: /{db}
- :synopsis: Creates a new document with generic ID if he had not specified
+ :synopsis: Creates a new document with generated ID if _id is not specified
Creates a new document in the specified database, using the supplied JSON
document structure.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/api/database/misc.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/database/misc.rst b/share/doc/src/api/database/misc.rst
index 7f0b484..194dac3 100644
--- a/share/doc/src/api/database/misc.rst
+++ b/share/doc/src/api/database/misc.rst
@@ -220,7 +220,7 @@ database must be examined.
- :mimetype:`text/plain; charset=utf-8`
:>json array missing: List of missed revisions for specified document
:>json array possible_ancestors: List of revisions that *may be* ancestors
- for specified document and his current revision in requested database
+ for specified document and its current revision in requested database
:code 200: Request completed successfully
:code 400: Invalid database name or JSON payload
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/document/common.rst b/share/doc/src/api/document/common.rst
index bf39c35..1a61682 100644
--- a/share/doc/src/api/document/common.rst
+++ b/share/doc/src/api/document/common.rst
@@ -346,7 +346,7 @@
:code 202: Request was accepted, but changes are not yet stored on disk
:code 400: Invalid request body or parameters
:code 401: Read or write privileges required
- :code 404: Specified database, document ID or his revision doesn't exists
+ :code 404: Specified database, document ID or revision doesn't exists
:code 409: Document with the specified ID already exists or specified
revision is not latest for target document
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/intro.rst b/share/doc/src/config/intro.rst
index f662b8f..3a5c828 100644
--- a/share/doc/src/config/intro.rst
+++ b/share/doc/src/config/intro.rst
@@ -126,7 +126,7 @@ improve configuration readability.
.. note::
In case when you'd like to remove some parameter from the `default.ini`
- without his modification, you may specify him within the `local.ini`, but
+ without modifiying that file, you may override in `local.ini`, but
without any value::
[httpd_global_handlers]
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/config/query-servers.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/query-servers.rst b/share/doc/src/config/query-servers.rst
index 36092bf..19a5988 100644
--- a/share/doc/src/config/query-servers.rst
+++ b/share/doc/src/config/query-servers.rst
@@ -41,7 +41,7 @@ Query Servers Definition
- ``LANGUAGE``: is a programming language which code this query server may
execute. For instance, there are `python`, `ruby`, `clojure` and other query
servers in wild. This value is also used for `ddoc` field ``language``
- to determine query server that will process his functions.
+ to determine which query server process the functions.
Note, that you may setup multiple query servers for the same programming
language, but you have to name them different (like `python-dev` etc.).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/install/mac.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/mac.rst b/share/doc/src/install/mac.rst
index 81afa6b..3b0393b 100644
--- a/share/doc/src/install/mac.rst
+++ b/share/doc/src/install/mac.rst
@@ -23,7 +23,7 @@ Installation on Mac OS X
Installation using the Apache CouchDB native application
========================================================
-The easiest way to run CouchDB on Mac OS X is through his native Mac OS X
+The easiest way to run CouchDB on Mac OS X is through the native Mac OS X
application. Just follow the below instructions:
#. `Download Apache CouchDB for Mac OS X`_.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/install/windows.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/install/windows.rst b/share/doc/src/install/windows.rst
index ad0bfeb..b7b66af 100644
--- a/share/doc/src/install/windows.rst
+++ b/share/doc/src/install/windows.rst
@@ -33,7 +33,7 @@ This is the simplest way to go.
- Accept the License agreement
- Select the installation directory
- Specify "Start Menu" group name
- - Approve that you'd like to install CouchDB as service and let him been
+ - Approve that you'd like to install CouchDB as service and let it be
started automatically after installation (probably, you'd like so)
- Verify installation settings
- Install CouchDB
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/intro/security.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/intro/security.rst b/share/doc/src/intro/security.rst
index bc4a679..a57b1b7 100644
--- a/share/doc/src/intro/security.rst
+++ b/share/doc/src/intro/security.rst
@@ -281,7 +281,7 @@ structure. So how `authentication database` is different from others?
any document (to be honest, that they always can do)
- There is special design document ``_auth`` that cannot be modified
- Every document (of course, except `design documents`) represents registered
- CouchDB users and belong to him
+ CouchDB users and belong to them
- Users may only access (:get:`GET /_users/org.couchdb.user:Jan
</{db}/{docid}>`) or modify (:put:`PUT /_users/org.couchdb.user:Jan
</{db}/{docid}>`) documents that they owns
@@ -318,8 +318,8 @@ process:
- **type** (*string*): Document type. Constantly have value ``user``
Additionally, you may specify any custom fields that are relates to the target
-user. This is good place to store user's private information because only he and
-CouchDB administrators may browse it.
+user. This is good place to store user's private information because only the
+target user and CouchDB administrators may browse it.
.. _org.couchdb.user:
@@ -396,7 +396,7 @@ the next error message:
Password Changing
=================
-This is quite common situation: user had forgot his password, it was leaked
+This is quite common situation: user had forgot their password, it was leaked
somehow (via copy-paste, screenshot, or by typing in wrong chat window) or
something else. Let's change password for our user `jan`.
@@ -466,7 +466,7 @@ CouchDB should respond with:
{"ok":true,"name":"jan","roles":[]}
Hooray! You may wonder why so complex: need to retrieve user's document, add
-special field to him, post it back - where is one big button that changes the
+special field to it, post it back - where is one big button that changes the
password without worry about document's content? Actually, :ref:`Futon
<intro/futon>` has such at the right bottom corner if you have logged in -
all implementation details are hidden from your sight.
@@ -483,7 +483,7 @@ Users Public Information
.. versionadded:: 1.4
Sometimes users *wants* to share some information with the World. For instance,
-their contact email to let other users get in touch with him. To solve this
+their contact email to let other users get in touch with them. To solve this
problem, but still keep sensitive and private information secured there is
special :ref:`configuration <config>` option :config:option:`public_fields
<couch_httpd_auth/public_fields>`. In this options you may define comma
@@ -503,7 +503,7 @@ security reasons.
Now let's share field ``name``. First, setup the ``public_fields`` configuration
option. Remember, that this action requires administrator's privileges and
-the next command will ask for password for user `admin`, assuming that he is
+the next command will ask for password for user `admin`, assuming that they are
the server administrator::
curl -X PUT http://localhost:5984/_config/couch_http_auth/public_fields \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/maintenance/compaction.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/maintenance/compaction.rst b/share/doc/src/maintenance/compaction.rst
index dd99ec2..f6d0240 100644
--- a/share/doc/src/maintenance/compaction.rst
+++ b/share/doc/src/maintenance/compaction.rst
@@ -27,8 +27,8 @@ extension and transfers only actual data into. Because of this, CouchDB checks
first for the available disk space - it should be *twice greater* than the
compacted file's data.
-When all actual data successful transferred to the `compacted` file CouchDB
-*removes* the `target` replacing him with it.
+When all actual data is successfully transferred to the `compacted` file CouchDB
+replaces the `target` with the `compacted` file.
.. _compact/db:
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/query-server/protocol.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/query-server/protocol.rst b/share/doc/src/query-server/protocol.rst
index c34a35c..c1f0b49 100644
--- a/share/doc/src/query-server/protocol.rst
+++ b/share/doc/src/query-server/protocol.rst
@@ -515,7 +515,7 @@ on three parts:
]
When there is no more view rows to process, CouchDB sends special message,
- that signs about that there is no more data to send from his side::
+ that signs about that there is no more data to send from its side::
["list_end"]
@@ -573,7 +573,7 @@ string chunks, but let's take a look on logs::
Note, that now the Query Server sends response by lightweight chunks and if
our communication process was extremely slow, the client will see how response
data appears on their screen. Chunk by chunk, without waiting for the complete
-result, like he have for our previous list function.
+result, like they have for our previous list function.
.. _qs/ddoc/updates:
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c2da01d1/share/doc/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/replicator.rst b/share/doc/src/replication/replicator.rst
index 05171db..0413bce 100644
--- a/share/doc/src/replication/replicator.rst
+++ b/share/doc/src/replication/replicator.rst
@@ -351,11 +351,11 @@ replicator database implementation is like a ``_changes`` feed consumer
replicator database - in fact this feature could be implemented with an
external script/program. This implementation detail implies that for non
admin users, a ``user_ctx`` property, containing the user's name and a
-subset of his/her roles, must be defined in the replication document.
+subset of their roles, must be defined in the replication document.
This is ensured by the document update validation function present in
the default design document of the replicator database. This validation
function also ensure that a non admin user can set a user name property
-in the ``user_ctx`` property that doesn't match his/her own name (same
+in the ``user_ctx`` property that doesn't match their own name (same
principle applies for the roles).
For admins, the ``user_ctx`` property is optional, and if it's missing