You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2014/04/26 21:28:35 UTC
[01/50] documentation commit: updated refs/heads/import-master to
0efce91
Repository: couchdb-documentation
Updated Branches:
refs/heads/import-master [created] 0efce9185
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-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/6be67ad5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/6be67ad5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/6be67ad5
Branch: refs/heads/import-master
Commit: 6be67ad5c793c13b0bd4a44e89926a15326fcfa8
Parents: 9e213d4
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
----------------------------------------------------------------------
src/api/database/changes.rst | 6 +++---
src/api/database/common.rst | 2 +-
src/api/database/misc.rst | 2 +-
src/api/document/common.rst | 2 +-
src/config/intro.rst | 2 +-
src/config/query-servers.rst | 2 +-
src/install/mac.rst | 2 +-
src/install/windows.rst | 2 +-
src/intro/security.rst | 14 +++++++-------
src/maintenance/compaction.rst | 4 ++--
src/query-server/protocol.rst | 4 ++--
src/replication/replicator.rst | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/6be67ad5/src/api/database/changes.rst
----------------------------------------------------------------------
diff --git a/src/api/database/changes.rst b/src/api/database/changes.rst
index 21d44ea..fc46412 100644
--- a/src/api/database/changes.rst
+++ b/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-documentation/blob/6be67ad5/src/api/database/common.rst
----------------------------------------------------------------------
diff --git a/src/api/database/common.rst b/src/api/database/common.rst
index 30c99d0..29e523f 100644
--- a/src/api/database/common.rst
+++ b/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-documentation/blob/6be67ad5/src/api/database/misc.rst
----------------------------------------------------------------------
diff --git a/src/api/database/misc.rst b/src/api/database/misc.rst
index 7f0b484..194dac3 100644
--- a/src/api/database/misc.rst
+++ b/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-documentation/blob/6be67ad5/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index bf39c35..1a61682 100644
--- a/src/api/document/common.rst
+++ b/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-documentation/blob/6be67ad5/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/src/config/intro.rst b/src/config/intro.rst
index f662b8f..3a5c828 100644
--- a/src/config/intro.rst
+++ b/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-documentation/blob/6be67ad5/src/config/query-servers.rst
----------------------------------------------------------------------
diff --git a/src/config/query-servers.rst b/src/config/query-servers.rst
index 36092bf..19a5988 100644
--- a/src/config/query-servers.rst
+++ b/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-documentation/blob/6be67ad5/src/install/mac.rst
----------------------------------------------------------------------
diff --git a/src/install/mac.rst b/src/install/mac.rst
index 81afa6b..3b0393b 100644
--- a/src/install/mac.rst
+++ b/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-documentation/blob/6be67ad5/src/install/windows.rst
----------------------------------------------------------------------
diff --git a/src/install/windows.rst b/src/install/windows.rst
index ad0bfeb..b7b66af 100644
--- a/src/install/windows.rst
+++ b/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-documentation/blob/6be67ad5/src/intro/security.rst
----------------------------------------------------------------------
diff --git a/src/intro/security.rst b/src/intro/security.rst
index bc4a679..a57b1b7 100644
--- a/src/intro/security.rst
+++ b/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-documentation/blob/6be67ad5/src/maintenance/compaction.rst
----------------------------------------------------------------------
diff --git a/src/maintenance/compaction.rst b/src/maintenance/compaction.rst
index dd99ec2..f6d0240 100644
--- a/src/maintenance/compaction.rst
+++ b/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-documentation/blob/6be67ad5/src/query-server/protocol.rst
----------------------------------------------------------------------
diff --git a/src/query-server/protocol.rst b/src/query-server/protocol.rst
index c34a35c..c1f0b49 100644
--- a/src/query-server/protocol.rst
+++ b/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-documentation/blob/6be67ad5/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/src/replication/replicator.rst b/src/replication/replicator.rst
index 05171db..0413bce 100644
--- a/src/replication/replicator.rst
+++ b/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
[41/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add CVE-214-2668 documentation to build system
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/df22ff42
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/df22ff42
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/df22ff42
Branch: refs/heads/import-master
Commit: df22ff42749ab25775caebe8c9024cb98111e9f7
Parents: 7a6af5a
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 09:35:21 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:29 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/df22ff42/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index f332e5c..86351f4 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -390,6 +390,7 @@ src_files = \
../src/cve/2012-5641.rst \
../src/cve/2012-5649.rst \
../src/cve/2012-5650.rst \
+ ../src/cve/2014-2668.rst \
../src/cve/index.rst \
../src/fauxton/addons.rst \
../src/fauxton/index.rst \
[45/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add documentation for CVE-2014-2668
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/16ea31bd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/16ea31bd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/16ea31bd
Branch: refs/heads/import-master
Commit: 16ea31bd23debad2f71e906fd67399b64b8acdfe
Parents: 3ffb39b
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Apr 15 09:11:00 2014 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Apr 16 16:43:10 2014 +0200
----------------------------------------------------------------------
src/cve/2014-2668.rst | 54 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/16ea31bd/src/cve/2014-2668.rst
----------------------------------------------------------------------
diff --git a/src/cve/2014-2668.rst b/src/cve/2014-2668.rst
new file mode 100644
index 0000000..5ccd2a4
--- /dev/null
+++ b/src/cve/2014-2668.rst
@@ -0,0 +1,54 @@
+.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
+.. use this file except in compliance with the License. You may obtain a copy of
+.. the License at
+..
+.. http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+.. License for the specific language governing permissions and limitations under
+.. the License.
+
+
+.. _cve/2014-2668:
+
+==================================================================================
+CVE-2014-2668: DoS (CPU and memory consumption) via the count parameter to /_uuids
+==================================================================================
+
+:Date: 26.03.2014
+
+:Affected: Apache CouchDB releases up to and including 1.3.1, 1.4.0,
+ and 1.5.0 are vulnerable.
+
+:Severity: Moderate
+
+:Vendor: The Apache Software Foundation
+
+Description
+===========
+
+The :ref:`api/server/uuids` resource's `count` query parameter is able to take
+unreasonable huge numeric value which leads to exhaustion of server resources
+(CPU and memory) and to DoS as the result.
+
+Mitigation
+==========
+
+Upgrade to a supported CouchDB release that includes this fix, such as:
+
+- :ref:`1.5.1 <release/1.5.1>`
+- :ref:`1.6.0 <release/1.6.0>`
+
+All listed releases have included a specific fix to
+
+Work-Around
+===========
+
+Disable the :ref:`api/server/uuids` handler completely, by adapting
+`local.ini` and restarting CouchDB::
+
+ [httpd_global_handlers]
+ _uuids =
+
[17/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Fix formatting
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/512da7a6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/512da7a6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/512da7a6
Branch: refs/heads/import-master
Commit: 512da7a6936745cb9319b4a5a2580d22c627b27d
Parents: 146019f
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Feb 25 20:27:33 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Feb 25 20:27:33 2014 +0400
----------------------------------------------------------------------
src/json-structure.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/512da7a6/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 8eae7df..ab3ae45 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -227,7 +227,7 @@ List of Active Tasks
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| tasks [array] | Active Tasks |
+| tasks [array] | Active Tasks |
+--------------------------------+---------------------------------------------+
| pid | Process ID |
+--------------------------------+---------------------------------------------+
[13/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
docs: fix highlighting of artwork.jpg
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9e4fa3af
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9e4fa3af
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9e4fa3af
Branch: refs/heads/import-master
Commit: 9e4fa3af7bbdcd93bf0100a708967e930eef9229
Parents: ac790b1
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sun Jan 12 01:45:22 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Sun Jan 12 11:20:20 2014 +0100
----------------------------------------------------------------------
src/intro/api.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9e4fa3af/src/intro/api.rst
----------------------------------------------------------------------
diff --git a/src/intro/api.rst b/src/intro/api.rst
index 3fb413a..9525bee 100644
--- a/src/intro/api.rst
+++ b/src/intro/api.rst
@@ -567,7 +567,7 @@ documents, music, or movie files. Let's make one.
Attachments get their own URL where you can upload data. Say we want to add
the album artwork to the ``6e1295ed6c29495e54cc05947f18c8af`` document
(*"There is Nothing Left to Lose"*), and let's also say the artwork is in a file
-artwork `.jpg` in the current directory::
+`artwork.jpg` in the current directory::
curl -vX PUT http://127.0.0.1:5984/albums/6e1295ed6c29495e54cc05947f18c8af/artwork.jpg?rev=2-2739352689 \
--data-binary @artwork.jpg -H "Content-Type:image/jpg"
[29/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
s/teh/the in json-structure
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2fcf09bc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2fcf09bc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2fcf09bc
Branch: refs/heads/import-master
Commit: 2fcf09bc5ce54f6d70e90a23aef761a7738942da
Parents: af81438
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Wed Mar 26 09:46:00 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Wed Mar 26 09:46:00 2014 -0400
----------------------------------------------------------------------
src/json-structure.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2fcf09bc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 68137d2..addc5ac 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -357,7 +357,7 @@ Request object
+--------------------------------+---------------------------------------------+
| query | URL query parameters `object`. |
| | Note that multiple keys are not supported |
-| | and teh last key value suppresses others. |
+| | and the last key value suppresses others. |
+--------------------------------+---------------------------------------------+
| requested_path | List of actual requested path section. |
+--------------------------------+---------------------------------------------+
[32/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
change the documentation for unix
the testsuite in Futon is not linked anymore (/_utils/couch_tests.html)
but there is the verify installation page. Changed the docs accordingly.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/0f63aa08
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/0f63aa08
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/0f63aa08
Branch: refs/heads/import-master
Commit: 0f63aa0801a7b93f3ef8b0ee865aee4447c62707
Parents: 48ac4ed
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 27 21:17:05 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 27 21:17:05 2014 +0100
----------------------------------------------------------------------
src/install/unix.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/0f63aa08/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/src/install/unix.rst b/src/install/unix.rst
index da4e5bd..05e0459 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -175,7 +175,9 @@ To check that everything has worked, point your web browser to::
http://127.0.0.1:5984/_utils/index.html
-From here you should run the test suite in Firefox.
+From here you should verify your installation by pointing your web browser to::
+
+ http://localhost:5984/_utils/verify_install.html
Security Considerations
-----------------------
[39/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add CVE-2014-2668 warning to old release branches
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/a7decf19
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/a7decf19
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/a7decf19
Branch: refs/heads/import-master
Commit: a7decf1919be06f069a018328d2e648a1fc8f698
Parents: 96e3b18
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Apr 15 09:12:34 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:28:18 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.3.rst | 4 ++++
src/whatsnew/1.4.rst | 4 ++++
src/whatsnew/1.5.rst | 7 ++++++-
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a7decf19/src/whatsnew/1.3.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.3.rst b/src/whatsnew/1.3.rst
index 7e69785..3f19f56 100644
--- a/src/whatsnew/1.3.rst
+++ b/src/whatsnew/1.3.rst
@@ -21,6 +21,10 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.3.x` is affected by the issue described in :ref:`cve/2014-2668`.
+ Upgrading to a more recent release is strongly recommended.
.. _release/1.3.x/upgrade:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a7decf19/src/whatsnew/1.4.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.4.rst b/src/whatsnew/1.4.rst
index cf10bef..65925e1 100644
--- a/src/whatsnew/1.4.rst
+++ b/src/whatsnew/1.4.rst
@@ -21,6 +21,10 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.4.x` is affected by the issue described in :ref:`cve/2014-2668`.
+ Upgrading to a more recent release is strongly recommended.
.. _release/1.4.x/upgrade:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a7decf19/src/whatsnew/1.5.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.5.rst b/src/whatsnew/1.5.rst
index 7f2d750..1b7539a 100644
--- a/src/whatsnew/1.5.rst
+++ b/src/whatsnew/1.5.rst
@@ -21,6 +21,11 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.5.1` contains important security fixes. Previous `1.5.x`
+ releases are not recommended for regular usage.
+
.. _release/1.5.1:
Version 1.5.1
@@ -28,7 +33,7 @@ Version 1.5.1
* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
- handler in a single request.
+ handler in a single request (:ref:`CVE 2014-2668 <cve/2014-2668>`).
.. _release/1.5.0:
[15/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Fix documentation wording
The warning regarding the Response Object was unclear.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/5a984401
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/5a984401
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/5a984401
Branch: refs/heads/import-master
Commit: 5a984401c5bc22fada4d46c113892eccb3cbe2e8
Parents: 338d677
Author: Andy Wenk <an...@apache.org>
Authored: Thu Feb 20 20:57:11 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Feb 20 20:57:11 2014 +0100
----------------------------------------------------------------------
src/json-structure.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5a984401/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 4ab2f65..8eae7df 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -481,10 +481,10 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- The ``body``, ``base64`` and ``json`` object keys are overlapping each other
- where the last one wins. Since most realizations of key-value objects do
- not preserve the key order or if they are mixed, confusing situations can
- occure. Try to use only one of them.
+ The ``body``, ``base64`` and ``json`` object keys overlapp each other
+ where in the last one wins. Since most implementations of key-value objects do
+ not preserve the key order, confusing situations can emerge. The same applies,
+ when they are mixed. Try to use only one of them.
.. note::
Any custom property makes CouchDB raise an internal exception.
[35/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Describe HTTP 403 response reasons for /_uuids resource
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ab167dc6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ab167dc6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ab167dc6
Branch: refs/heads/import-master
Commit: ab167dc644d1b65e34a9846967f5968d10259c3b
Parents: 1b5c08b
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Mar 27 17:19:06 2014 +0400
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:44 2014 +0200
----------------------------------------------------------------------
src/api/server/common.rst | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ab167dc6/src/api/server/common.rst
----------------------------------------------------------------------
diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index 4e5614c..6327dc0 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -916,6 +916,8 @@ structure is as follows:
``/_uuids``
===========
+.. versionchanged:: 1.5.1
+
.. http:get:: /_uuids
:synopsis: Generates a list of UUIDs from the server
@@ -930,6 +932,8 @@ structure is as follows:
- :mimetype:`text/plain; charset=utf-8`
:>header ETag: Response hash
:code 200: Request completed successfully
+ :code 403: Requested more UUIDs than is :config:option:`allowed
+ <uuids/max_count>` to retrieve
**Request**:
[38/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add license header for tracking.html
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/96e3b186
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/96e3b186
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/96e3b186
Branch: refs/heads/import-master
Commit: 96e3b1862cacbbb4465d97104acd32abae5c86a6
Parents: 9bc7a18
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Apr 13 05:39:00 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Apr 13 05:39:00 2014 +0400
----------------------------------------------------------------------
templates/tracking.html | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/96e3b186/templates/tracking.html
----------------------------------------------------------------------
diff --git a/templates/tracking.html b/templates/tracking.html
index e6d4037..b80e3c2 100644
--- a/templates/tracking.html
+++ b/templates/tracking.html
@@ -1,3 +1,18 @@
+<!--
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+-->
+
{% if not local %}
<script type="text/javascript">
var _gaq = _gaq || [];
[08/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Docs: Fix doc building under CI
Under CI the CouchDB version configured can break the LaTeX PDF
building.
This patch munges the release name for doc builds.
Python styles from Eli Stevens and Alexander Shorin.
Closes COUCHDB-2007
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/af2e52ab
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/af2e52ab
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/af2e52ab
Branch: refs/heads/import-master
Commit: af2e52ab9f10292b3bbba3e4eafdc8580eb9dde2
Parents: aa098a8
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Dec 19 17:37:22 2013 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Dec 19 21:48:49 2013 +0100
----------------------------------------------------------------------
src/conf.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/af2e52ab/src/conf.py
----------------------------------------------------------------------
diff --git a/src/conf.py b/src/conf.py
index 3d2536e..14a93f5 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -55,7 +55,16 @@ release = '.'.join([
if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%':
release += '-dev'
elif _info.get('LOCAL_VERSION_RELEASE'):
- release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
+ # jenkins hack, the release name is too long or uses
+ # characters that cause pain down the road. Example:
+ # 1.6.0+build.jenkins-ERLANG_VERSION=R14B04,label=Mac-OS-10-8-2-832-76-g2996574
+ # which breaks the LaTeX PDF build. Let’s strip this
+ # down to the git hash at the end.
+ if 'jenkins' in _info['LOCAL_VERSION_RELEASE']:
+ release += _info['LOCAL_VERSION_RELEASE'][-9:]
+ else: # regular case
+ release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
+
project = _info['LOCAL_PACKAGE_NAME']
[03/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
grammar
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/52b52c2f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/52b52c2f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/52b52c2f
Branch: refs/heads/import-master
Commit: 52b52c2fa8dadeb553b88cc41f091785ad4c9ec1
Parents: 987ff4f
Author: Robert Newson <rn...@apache.org>
Authored: Thu Dec 5 12:35:00 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Dec 5 12:35:00 2013 +0000
----------------------------------------------------------------------
src/config/query-servers.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/52b52c2f/src/config/query-servers.rst
----------------------------------------------------------------------
diff --git a/src/config/query-servers.rst b/src/config/query-servers.rst
index 19a5988..88fab82 100644
--- a/src/config/query-servers.rst
+++ b/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 which query server process the functions.
+ to determine which query server processes 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.).
[31/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
minor documentation fix
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/48ac4ed5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/48ac4ed5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/48ac4ed5
Branch: refs/heads/import-master
Commit: 48ac4ed5e8e4fd2bf61b37358e0f50c7b47045ea
Parents: 1182519
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 27 21:07:03 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 27 21:07:03 2014 +0100
----------------------------------------------------------------------
src/install/freebsd.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/48ac4ed5/src/install/freebsd.rst
----------------------------------------------------------------------
diff --git a/src/install/freebsd.rst b/src/install/freebsd.rst
index b82edd1..85b74b5 100644
--- a/src/install/freebsd.rst
+++ b/src/install/freebsd.rst
@@ -37,7 +37,7 @@ supported by the start script (defaults shown)::
couchdb_enablelogs="YES"
couchdb_user="couchdb"
-After enabling couchdb rc service use the following to start CouchDB::
+After enabling the couchdb rc service use the following command to start CouchDB::
/usr/local/etc/rc.d/couchdb start
[30/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
docs: clarify that .d and multiple .ini files only apply to unix
- closes COUCHDB-2104
Thanks Ole Johan for reporting this
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/11825194
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/11825194
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/11825194
Branch: refs/heads/import-master
Commit: 118251947b2d59e9f7b2195ee3d7d2f442952da6
Parents: 2fcf09b
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Wed Mar 26 21:12:19 2014 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Wed Mar 26 21:12:19 2014 +0100
----------------------------------------------------------------------
src/config/intro.rst | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/11825194/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/src/config/intro.rst b/src/config/intro.rst
index c528f74..835643a 100644
--- a/src/config/intro.rst
+++ b/src/config/intro.rst
@@ -23,6 +23,14 @@ Introduction Into Configuring
Configuration files
-------------------
+.. warning::
+ The following section covering load order of config files
+ applies only to UNIX-ish systems.
+ For Windows, only the provided ``default.ini`` and ``local.ini``
+ files are relevant. These can of course have content
+ appended, which achieves the same type of functionality
+ as outlined for UNIX-ish systems below.
+
By default, CouchDB reads configuration files from the following locations,
in the following order:
@@ -148,7 +156,7 @@ Setting parameters via the HTTP API
Alternatively, configuration parameters could be set via the
:ref:`HTTP API <api/config>`. This API allows to change CouchDB configuration
-on-fly without need for server restart::
+on-the-fly without requiring a server restart::
curl -X PUT http://localhost:5984/_config/uuids/algorithm -d '"random"'
@@ -157,16 +165,17 @@ In the response the old parameter's value returns::
"sequential"
You should be careful with changing configuration via the HTTP API since it's
-easy to make CouchDB unavailable. For instance, you'd like to change the
-:option:`httpd/bind_address` for new one::
+easy to make CouchDB unavailable. For instance, if you'd like to change the
+:option:`httpd/bind_address` for a new one::
curl -X PUT http://localhost:5984/_config/httpd/bind_address -d '"10.10.0.128"'
-However, if you would made a typo or the specified IP address is not available
-from your network, you'll make CouchDB unavailable for you in both cases and
-you will have the only way to fix the problem by edit the configuration file
-and restart the server. To protect yourself against such accidents you may
-setup the :option:`httpd/config_whitelist` of configuration parameters that
-are allowed to edit via the HTTP API. For others you'll need to directly edit
-the configuration file so you may quick fix any problems that had occurred due
-to misconfiguring.
+However, if you make a typo, or the specified IP address is not available
+from your network, CouchDB will be unavailable for you in both cases and
+the only way to resolve this will be by remoting into the server, correcting
+the errant file, and restarting CouchDB. To protect yourself against such
+accidents you may set the :option:`httpd/config_whitelist` of permitted
+configuration parameters for updates via the HTTP API. Once this option is set,
+further changes to non-whitelisted parameters must take place via the
+configuration file, and in most cases, also requires a server restart before
+hand-edited options take effect.
[37/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add GA tracking to docs, only when not local
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9bc7a18b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9bc7a18b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9bc7a18b
Branch: refs/heads/import-master
Commit: 9bc7a18b82e08e4bc9de8d47bb148a4b0267f298
Parents: 7b33d40
Author: Noah Slater <ns...@tumbolia.org>
Authored: Thu Apr 10 12:45:40 2014 +0200
Committer: Noah Slater <ns...@tumbolia.org>
Committed: Thu Apr 10 12:45:40 2014 +0200
----------------------------------------------------------------------
src/conf.py | 5 ++++-
templates/help.html | 4 ++--
templates/tracking.html | 15 +++++++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9bc7a18b/src/conf.py
----------------------------------------------------------------------
diff --git a/src/conf.py b/src/conf.py
index 14a93f5..03c5dd6 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -106,7 +106,9 @@ html_additional_pages = {
'index': 'pages/index.html'
}
-html_context = {}
+html_context = {
+ "ga_code": "UA-658988-6"
+}
html_sidebars = {
"**": [
@@ -115,6 +117,7 @@ html_sidebars = {
"relations.html",
"utilities.html",
"help.html",
+ "tracking.html",
]
}
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9bc7a18b/templates/help.html
----------------------------------------------------------------------
diff --git a/templates/help.html b/templates/help.html
index be0cb91..a6b7859 100644
--- a/templates/help.html
+++ b/templates/help.html
@@ -16,9 +16,9 @@ specific language governing permissions and limitations under the License.
<h3>More Help</h3>
<ul>
-<li><a href="https://couchdb.apache.org/">Homepage</a></li>
+<li><a href="https://couchdb.apache.org/"{% if not local %} onclick="_gaq.push(['_link', 'https://couchdb.apache.org/']); return false;"{% endif %}>Homepage</a></li>
<li><a href="http://wiki.apache.org/couchdb/">Wiki</a></li>
-<li><a href="https://couchdb.apache.org/#mailing-list">Mailing Lists</a></li>
+<li><a href="https://couchdb.apache.org/#mailing-list"{% if not local %} onclick="_gaq.push(['_link', 'https://couchdb.apache.org/#mailing-list']); return false;"{% endif %}>Mailing Lists</a></li>
<li><a href="http://webchat.freenode.net/?channels=couchdb">IRC</a></li>
<li><a href="https://issues.apache.org/jira/browse/CouchDB">Issues</a></li>
<li><a href="{{ pathto('download') }}">Download</a></li>
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9bc7a18b/templates/tracking.html
----------------------------------------------------------------------
diff --git a/templates/tracking.html b/templates/tracking.html
new file mode 100644
index 0000000..e6d4037
--- /dev/null
+++ b/templates/tracking.html
@@ -0,0 +1,15 @@
+{% if not local %}
+<script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{ ga_code }}']);
+ _gaq.push(['_setDomainName', 'couchdb.org']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+</script>
+{% endif %}
[05/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
docs: various updates for release notes for 1.6.0
- closes COUCHDB-1795
- closes COUCHDB-1962
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c54ddc36
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c54ddc36
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c54ddc36
Branch: refs/heads/import-master
Commit: c54ddc360048b1cf24efcea5d93f34fc0353f2b1
Parents: 8ee4b88
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Fri Dec 13 18:27:10 2013 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Sat Dec 14 11:39:04 2013 +0100
----------------------------------------------------------------------
src/replication/protocol.rst | 4 ++--
src/replication/replicator.rst | 13 +++++++++++++
src/whatsnew/1.6.rst | 5 +++++
3 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c54ddc36/src/replication/protocol.rst
----------------------------------------------------------------------
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index 10ba243..c5a8181 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -107,7 +107,7 @@ Algorithm
5. GET each revisions from the source Database by calling the URL
`/<source>/<docid>?revs=true&open_revs`=<revision>` . This
- will get the document with teh parent revisions. Also don't forget to
+ will get the document with its parent revisions. Also don't forget to
get attachments that aren't already stored at the target. As an
optimisation you can use the HTTP multipart api to get all.
@@ -190,7 +190,7 @@ Pull Only
Reference
---------
-* `TouchDB Ios wiki <https://github.com/couchbaselabs/TouchDB-iOS/wiki/Replication-Algorithm>`_
+* `TouchDB iOS wiki <https://github.com/couchbaselabs/TouchDB-iOS/wiki/Replication-Algorithm>`_
* `CouchDB documentation
<http://wiki.apache.org/couchdb/Replication>`_
* CouchDB `change notifications`_
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c54ddc36/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/src/replication/replicator.rst b/src/replication/replicator.rst
index 6700186..e93c579 100644
--- a/src/replication/replicator.rst
+++ b/src/replication/replicator.rst
@@ -91,6 +91,19 @@ Special fields set by the replicator start with the prefix
If ``replication_state`` is ``error``, this field contains the reason.
+.. code-block:: javascript
+
+ {
+ "_id": "my_rep",
+ "_rev": "2-9f2c0d9372f4ee4dc75652ab8f8e7c70",
+ "source": "foodb",
+ "target": "bardb",
+ "_replication_state": "error",
+ "_replication_state_time": "2013-12-13T18:48:00+01:00",
+ "_replication_state_reason": "db_not_found: could not open foodb",
+ "_replication_id": "fe965cdc47b4d5f6c02811d9d351ac3d"
+ }
+
When the replication finishes, it will update the ``_replication_state``
field (and ``_replication_state_time``) with the value ``completed``, so
the document will look like:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c54ddc36/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index df57320..2a0fc6e 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -46,3 +46,8 @@ Version 1.6.0
* :issue:`1922`: Fix CORS exposed headers :commit:`4f619833`
* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``
:commit:`c66ac4a8`
+* :issue:`1795`: Ensure startup script couchdb clears pid file on termination
+ :commit:`818ef4f9`
+* :issue:`1962`: Various replicator enhancements
+ :commit:`1d5fe2aa` write access for checkpoints is not required on source db
+ :commit:`0693f98e` make the replication checkpoint interval configurable
[18/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Update pagination docs - COUCHDB-1076 is old now
As far as I'm aware, skip is equivalently fast to a startkey search
because whole subtrees are skipped when their document count does
not exceed the remaining skip.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/8530c6bb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/8530c6bb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/8530c6bb
Branch: refs/heads/import-master
Commit: 8530c6bbfc89a9017d13e328d0062f6ff55df1cc
Parents: 512da7a
Author: Randall Leeds <ra...@apache.org>
Authored: Sun Mar 9 20:40:55 2014 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Sun Mar 9 20:43:37 2014 -0700
----------------------------------------------------------------------
src/couchapp/views/pagination.rst | 48 +++++++++++-----------------------
1 file changed, 15 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/8530c6bb/src/couchapp/views/pagination.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/pagination.rst b/src/couchapp/views/pagination.rst
index b40f988..6f3b34e 100644
--- a/src/couchapp/views/pagination.rst
+++ b/src/couchapp/views/pagination.rst
@@ -125,12 +125,11 @@ Or in a pseudo-JavaScript snippet:
page.display_link('next');
}
-Slow Paging (Do Not Use)
-========================
+Paging
+======
-**Don’t use this method!** We just show it because it might seem natural to use,
-and you need to know why it is a bad idea. To get the first five rows from
-the view result, you use the ``?limit=5`` query parameter::
+To get the first five rows from the view result, you use the ``?limit=5``
+query parameter::
curl -X GET http://127.0.0.1:5984/artists/_design/artists/_view/by-name?limit=5
@@ -194,34 +193,17 @@ straightforward:
return page != last_page;
}
-The dealbreaker
----------------
-
-This all looks easy and straightforward, but it has one fatal flaw. Remember
-how view results are generated from the underlying B-tree index: CouchDB
-jumps to the first row (or the first row that matches ``startkey``,
-if provided) and reads one row after the other from the index until there are
-no more rows (or ``limit`` or ``endkey`` match, if provided).
-
-The ``skip`` argument works like this: in addition to going to the first row and
-starting to read, skip will skip as many rows as specified, but CouchDB will
-still read from the first row; it just won’t return any values for the skipped
-rows. If you specify ``skip=100``, CouchDB will read 100 rows and not create
-output for them. This doesn’t sound too bad, but it is very bad, when you use
-1000 or even 10000 as skip values. CouchDB will have to look at a lot of rows
-unnecessarily.
-
-As a rule of thumb, skip should be used only with single digit values. While
-it’s possible that there are legitimate use cases where you specify a larger
-value, they are a good indicator for potential problems with your solution.
-Finally, for the calculations to work, you need to add a reduce function and
-make two calls to the view per page to get all the numbering right,
-and there’s still a potential for error.
-
-Fast Paging (Do Use)
-====================
-
-The correct solution is not much harder. Instead of slicing the result set
+Paging (Alternate Method)
+=========================
+
+The method described above performed poorly with large skip values until
+CouchDB 1.2. Additionally, some use cases may call for the following
+alternate method even with newer versions of CouchDB. One such case is when
+duplicate results should be prevented. Using skip alone it is possible for
+new documents to be inserted during pagination which could change the offset
+of the start of the subsequent page.
+
+A correct solution is not much harder. Instead of slicing the result set
into equally sized pages, we look at 10 rows at a time and use ``startkey`` to
jump to the next 10 rows. We even use skip, but only with the value 1.
[43/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Sometimes one extra character makes all the difference
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9211ff25
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9211ff25
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9211ff25
Branch: refs/heads/import-master
Commit: 9211ff25d67b4c07aea38d4136987df7057137b0
Parents: b91a0e4
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 11:04:38 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:49 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9211ff25/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 92ec2ff..7b95d0d 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -450,7 +450,7 @@ src_files_html = \
../templates/layout.html \
../templates/help.html \
../templates/searchbox.html \
- ../templates/tracing.html \
+ ../templates/tracking.html \
../templates/utilities.html
sphinx_extensions = \
[22/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
some minor documentatiom fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c6aa5722
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c6aa5722
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c6aa5722
Branch: refs/heads/import-master
Commit: c6aa572293677ea3119937759028b4a0a60a77ca
Parents: f49be35
Author: Andy Wenk <an...@apache.org>
Authored: Fri Mar 21 00:22:06 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Fri Mar 21 00:22:06 2014 +0100
----------------------------------------------------------------------
src/intro/overview.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c6aa5722/src/intro/overview.rst
----------------------------------------------------------------------
diff --git a/src/intro/overview.rst b/src/intro/overview.rst
index 4e3b72c..7804cf9 100644
--- a/src/intro/overview.rst
+++ b/src/intro/overview.rst
@@ -261,9 +261,9 @@ updates, ensuring security and data validation in a shared, distributed system.
Distributed Updates and Replication
===================================
-CouchDB is a peer-based distributed database system, it allows for users and
-servers to access and update the same shared data while disconnected and then
-bi-directionally replicate those changes later.
+CouchDB is a peer-based distributed database system. It allows users and servers
+to access and update the same shared data while disconnected. Those changes can
+then be replicated bi-directionally later.
The CouchDB document storage, view and security models are designed to work
together to make true bi-directional replication efficient and reliable.
[04/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add documentation for use_checkpoints replicator option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/8ee4b88a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/8ee4b88a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/8ee4b88a
Branch: refs/heads/import-master
Commit: 8ee4b88a557b92b1775cfa5e78fc5d14d4797270
Parents: 52b52c2
Author: Volker Mische <vo...@gmail.com>
Authored: Tue Jul 16 00:34:31 2013 +0200
Committer: Robert Newson <rn...@apache.org>
Committed: Sat Dec 14 11:34:09 2013 +0100
----------------------------------------------------------------------
src/json-structure.rst | 3 +++
src/replication/replicator.rst | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/8ee4b88a/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index c124e44..042df59 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -271,6 +271,9 @@ Replication Settings
| | filter function; value should be a document |
| | containing parameters as members |
+--------------------------------+---------------------------------------------+
+| use_checkpoints (optional) | Whether to use replication checkpoints |
+| | or not |
++--------------------------------+---------------------------------------------+
.. _replication-status:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/8ee4b88a/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/src/replication/replicator.rst b/src/replication/replicator.rst
index 0413bce..6700186 100644
--- a/src/replication/replicator.rst
+++ b/src/replication/replicator.rst
@@ -22,7 +22,8 @@ cancel an ongoing replication.
These documents have exactly the same content as the JSON objects we use to
``POST`` to ``_replicate`` (fields ``source``, ``target``, ``create_target``,
-``continuous``, ``doc_ids``, ``filter``, ``query_params``).
+``continuous``, ``doc_ids``, ``filter``, ``query_params``,
+``use_checkpoints``).
Replication documents can have a user defined ``_id`` (handy for finding a
specific replication request later). Design Documents
[25/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Improving misleading example. Do not emit(foo, doc)!
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/b9b7c747
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/b9b7c747
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/b9b7c747
Branch: refs/heads/import-master
Commit: b9b7c7478c5a41e7ad6027759e1f833c8d2dd1cc
Parents: aa5ce61
Author: Joan Touzet <wo...@apache.org>
Authored: Fri Mar 21 19:44:58 2014 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Fri Mar 21 19:44:58 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b9b7c747/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 9fa8513..06c4c6d 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by ``LastName``:
function(doc) {
if (doc.Type == "customer") {
- emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
+ emit(doc.LastName, null);
}
}
@@ -49,12 +49,17 @@ associated orders. The values 0 and 1 for the sorting token are arbitrary.
function(doc) {
if (doc.Type == "customer") {
- emit([doc._id, 0], doc);
+ emit([doc._id, 0], null);
} else if (doc.Type == "order") {
- emit([doc.customer_id, 1], doc);
+ emit([doc.customer_id, 1], null);
}
}
+To list a specific customer with ``_id`` XYZ, and all of that customer's orders, limit the startkey and endkey ranges to cover only documents for that customer's ``_id``::
+
+ startkey=["XYZ"]&endkey=["XYZ", {}]
+
+It is not recommended to emit the document itself in the view. Instead, to include the bodies of the documents when requesting the view, request the view with ``?include_docs=true``.
Sorting by Dates
================
@@ -67,14 +72,14 @@ the following emit function would sort by date:
.. code-block:: javascript
- emit(Date.parse(doc.created_at).getTime(), doc);
+ emit(Date.parse(doc.created_at).getTime(), null);
Alternatively, if you use a date format which sorts lexicographically,
such as ``"2013/06/09 13:52:11 +0000"`` you can just
.. code-block:: javascript
- emit(doc.created_at, doc);
+ emit(doc.created_at, null);
and avoid the conversion. As a bonus, this date format is compatible with the
JavaScript date parser, so you can use ``new Date(doc.created_at)`` in your
[34/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add What's New item about uuids.max_count option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/1b5c08b2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/1b5c08b2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/1b5c08b2
Branch: refs/heads/import-master
Commit: 1b5c08b2a40aa885f08d8112a56f174374ce234e
Parents: c356d6c
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Thu Mar 27 13:51:40 2014 +0100
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:20 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.5.rst | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1b5c08b2/src/whatsnew/1.5.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.5.rst b/src/whatsnew/1.5.rst
index 0672bc8..7f2d750 100644
--- a/src/whatsnew/1.5.rst
+++ b/src/whatsnew/1.5.rst
@@ -21,6 +21,15 @@
:depth: 1
:local:
+.. _release/1.5.1:
+
+Version 1.5.1
+=============
+
+* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
+ the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
+ handler in a single request.
+
.. _release/1.5.0:
Version 1.5.0
[46/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
added a section on authorization to the security intro document
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/3695591d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/3695591d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/3695591d
Branch: refs/heads/import-master
Commit: 3695591d35f623d91305bfd9277ae8a82e53be4a
Parents: 16ea31b
Author: Paul Mietz Egli <pa...@obscure.com>
Authored: Wed Apr 16 13:17:24 2014 -0700
Committer: Paul Mietz Egli <pa...@obscure.com>
Committed: Wed Apr 16 13:17:24 2014 -0700
----------------------------------------------------------------------
src/intro/security.rst | 78 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/3695591d/src/intro/security.rst
----------------------------------------------------------------------
diff --git a/src/intro/security.rst b/src/intro/security.rst
index a57b1b7..77c95cb 100644
--- a/src/intro/security.rst
+++ b/src/intro/security.rst
@@ -523,3 +523,81 @@ Good news! Now we may read field ``name`` from *every user's document without
need to be an administrator*. That's important note: don't publish sensitive
information, especially without user's acknowledge - they may not like such
actions from your side.
+
+
+==============
+Authorization
+==============
+
+Now that you have a few users who can log in, you probably want to set up some
+restrictions on what actions they can perform based on their identity and their
+roles. Each database on a CouchDB server can contain its own set of
+authorization rules that specify which users are allowed to read and write
+documents, create design documents, and change certain database configuration
+parameters. The authorization rules are set up by a server admin and can be
+modified at any time.
+
+Database authorization rules assign a user into one of two classes:
+
+- `members`, who are allowed to read all documents and create and modify any
+ document except for design documents.
+- `admins`, who can read and write all types of documents, modify which users
+ are members or admins, and set certain per-database configuration options.
+
+Note that a database admin is not the same as a server admin -- the actions
+of a database admin are restricted to a specific database.
+
+When a database is first created, there are no members or admins. HTTP
+requests that have no authentication credentials or have credentials for a
+normal user are treated as members, and those with server admin credentials
+are treated as database admins. To change the default permissions, you must
+create a :ref:`_security <api/db/security>` document in the database::
+
+ > curl -X PUT http://localhost:5984/mydatabase/_security \
+ -u anna:secret \
+ -H "Content-Type: application/json" \
+ -d '{"admins": { "names": [], "roles": [] }, "members": { "names": ["jan"], "roles": [] } }'
+
+The HTTP request to create the `_security` document must contain the
+credentials of a server admin. CouchDB will respond with:
+
+.. code-block:: javascript
+
+ {"ok":true}
+
+The database is now secured against anonymous reads and writes::
+
+ > curl http://localhost:5984/mydatabase/
+
+.. code-block:: javascript
+
+ {"error":"unauthorized","reason":"You are not authorized to access this db."}
+
+You declared user "jan" as a member in this database, so he is able to read and
+write normal documents::
+
+ > curl -u jan:apple http://localhost:5984/mydatabase/
+
+.. code-block:: javascript
+
+ {"db_name":"mydatabase","doc_count":1,"doc_del_count":0,"update_seq":3,"purge_seq":0,
+ "compact_running":false,"disk_size":12376,"data_size":272,"instance_start_time":"1397672867731570",
+ "disk_format_version":6,"committed_update_seq":3}
+
+If Jan attempted to create a design doc, however, CouchDB would return a
+401 Unauthorized error because the username "jan" is not in the list of
+admin names and the `/_users/org.couchdb.user:jan` document doesn't contain
+a role that matches any of the declared admin roles. If you want to promote
+Jan to an admin, you can update the security document to add `"jan"` to
+the `names` array under `admin`. Keeping track of individual database
+admin usernames is tedious, though, so you would likely prefer to create a
+database admin role and assign that role to the `org.couchdb.user:jan` user
+document::
+
+ > curl -X PUT http://localhost:5984/mydatabase/_security \
+ -u anna:secret \
+ -H "Content-Type: application/json" \
+ -d '{"admins": { "names": [], "roles": ["mydatabase_admin"] }, "members": { "names": [], "roles": [] } }'
+
+See the :ref:`_security document reference page <api/db/security>` for
+additional details about specifying database members and admins.
[49/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
fix documentation for replicator intro
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/a3294bcf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/a3294bcf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/a3294bcf
Branch: refs/heads/import-master
Commit: a3294bcf7f47ffe16bf2a48599c0cfb4a5abc1fc
Parents: ec387c2
Author: Andy Wenk <an...@apache.org>
Authored: Thu Apr 24 22:25:22 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Apr 24 22:25:22 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a3294bcf/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index ff002db..68690bf 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -29,8 +29,8 @@ databases are also deleted on the destination database (if they even existed).
Triggering Replication
----------------------
-Replication is controlled through documents in the :ref:`replicator`, where
-each document describes one replication process (see
+Replication is controlled through documents in the :ref:`_replicator <replicator>`
+database, where each document describes one replication process (see
:ref:`replication-settings`).
A replication is triggered by storing a replication document in the replicator
[33/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add documentation for new uuids.max_count option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c356d6c4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c356d6c4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c356d6c4
Branch: refs/heads/import-master
Commit: c356d6c4b090d73c8b247551152b2c5ac80337cb
Parents: 0f63aa0
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Thu Mar 27 13:51:19 2014 +0100
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:11 2014 +0200
----------------------------------------------------------------------
src/config/misc.rst | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c356d6c4/src/config/misc.rst
----------------------------------------------------------------------
diff --git a/src/config/misc.rst b/src/config/misc.rst
index 753d0e2..58d079c 100644
--- a/src/config/misc.rst
+++ b/src/config/misc.rst
@@ -202,6 +202,17 @@ UUIDs Configuration
[uuid]
utc_id_suffix = my-awesome-suffix
+ .. config:option:: max_count :: Per-Request UUID Limit
+
+ .. versionadded:: 1.5.1
+
+ No more than this number of UUIDs will be sent in a single request. If
+ more UUIDs are requested, an HTTP error response will be thrown.
+
+ ::
+
+ [uuid]
+ max_count = 1000
.. _config/vendor:
[40/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Update 1.6.0 notes with proper CVE-2014-2668 note
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/7a6af5ad
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/7a6af5ad
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/7a6af5ad
Branch: refs/heads/import-master
Commit: 7a6af5ad608624f6da87d00f06e7c35d4d5d2b3d
Parents: a7decf1
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 09:13:19 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:29:17 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.6.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/7a6af5ad/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index 7d93ff6..b1d9bc0 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -46,6 +46,16 @@ Version 1.6.0
* Fauxton: many improvements in our experimental new user interface, including
switching the code editor from CodeMirror to Ace as well as better support
for various browsers.
+* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
+ the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
+ handler in a single request (:ref:`CVE 2014-2668 <cve/2014-2668>`).
+* :issue:`1986`: increase socket buffer size to improve replication speed
+ for large documents and attachments, and fix tests on BSD-like systems.
+ :commit:`9a0e561b`
+* :issue:`1953`: improve performance of multipart/related requests.
+ :commit:`ce3e89dc`
+* :issue:`2221`: verify that authentication-related configuration settings
+ are well-formed. :commit:`dbe769c6`
* :issue:`1922`: fix CORS exposed headers. :commit:`4f619833`
* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``.
:commit:`c66ac4a8`
[19/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Quick doc edit for clarity.
This closes #170
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/1d98d856
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/1d98d856
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/1d98d856
Branch: refs/heads/import-master
Commit: 1d98d85668b3addd4c594bd85a6e7dcfe01edc2e
Parents: 8530c6b
Author: Michael Wheeler <mp...@gmail.com>
Authored: Fri Mar 7 11:26:54 2014 -0500
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Mar 10 22:51:07 2014 +0400
----------------------------------------------------------------------
src/api/ddoc/common.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1d98d856/src/api/ddoc/common.rst
----------------------------------------------------------------------
diff --git a/src/api/ddoc/common.rst b/src/api/ddoc/common.rst
index 8ff571b..9f76e3a 100644
--- a/src/api/ddoc/common.rst
+++ b/src/api/ddoc/common.rst
@@ -46,7 +46,7 @@
a new revision of the existing design document.
The design documents have some agreement upon their fields and structure.
- Currently it is the next:
+ Currently it is the following:
* **language** (*string*): Defines :ref:`Query Server <query-server>`
:config:section:`key <query_servers>` to process design document functions
[26/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
put back JSON return value in collation example
Originally removed in 0f7be287d6a9358d960beb17b16ad7b5e20bd360
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/b461dac7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/b461dac7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/b461dac7
Branch: refs/heads/import-master
Commit: b461dac78b36ab7fd76f2c27e8ad87f748af791f
Parents: b9b7c74
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:28 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:28 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b461dac7/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 06c4c6d..9c2f5c7 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by ``LastName``:
function(doc) {
if (doc.Type == "customer") {
- emit(doc.LastName, null);
+ emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
}
}
[24/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
fix documentation
explain why the HTTP status code 400 will be returned when ?rev=
is included in the request URL
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/aa5ce61d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/aa5ce61d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/aa5ce61d
Branch: refs/heads/import-master
Commit: aa5ce61dcc8d13c07e7b9933da59d8f7c1b072a8
Parents: af95947
Author: Andy Wenk <an...@nms.de>
Authored: Fri Mar 21 22:57:04 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Fri Mar 21 22:57:04 2014 +0100
----------------------------------------------------------------------
src/api/database/common.rst | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/aa5ce61d/src/api/database/common.rst
----------------------------------------------------------------------
diff --git a/src/api/database/common.rst b/src/api/database/common.rst
index f715c70..a1483d9 100644
--- a/src/api/database/common.rst
+++ b/src/api/database/common.rst
@@ -223,6 +223,12 @@
Deletes the specified database, and all the documents and attachments
contained within it.
+ .. note::
+
+ To avoid deleting a database, CouchDB will respond with the HTTP status code 400
+ when the request URL includes a ?rev= parameter. This suggests that one wants to delete
+ a document but forgot to add the document id to the URL.
+
:param db: Database name
:<header Accept: - :mimetype:`application/json`
- :mimetype:`text/plain`
@@ -230,7 +236,7 @@
- :mimetype:`text/plain; charset=utf-8`
:>json boolean ok: Operation status
:code 200: Database removed successfully
- :code 400: Invalid database name
+ :code 400: Invalid database name or forgotten document id by accident
:code 401: CouchDB Server Administrator privileges required
:code 404: Database doesn't exist
[09/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Docs: Correct a `_revs_info` typo implying a factual error
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2af8188d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2af8188d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2af8188d
Branch: refs/heads/import-master
Commit: 2af8188d1daf64ccb086ebd9db177958aee82361
Parents: af2e52a
Author: Jason Smith (air) <jh...@apache.org>
Authored: Sat Dec 21 15:18:26 2013 +0700
Committer: Jason Smith (air) <jh...@apache.org>
Committed: Sat Dec 21 15:18:26 2013 +0700
----------------------------------------------------------------------
src/api/document/common.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2af8188d/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index 1a61682..f21c8df 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -941,7 +941,7 @@ document by supplying the ``revs_info`` argument to the query:
}
-The returned document contains ``_rev_info`` field with extended revision
+The returned document contains ``_revs_info`` field with extended revision
information, including the availability and status of each revision. This array
field contains objects with following structure:
[36/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Verify that auth-related properties are well-formed
Passing unexpected values to auth fields can result in server
issues. Notably, setting "iterations" to a string will cause an
infinite loop as the comparison 'when Iteration > Iterations' will
never evaluate to true.
The latest validate_doc_update prevents user docs with this problem
and administrators can deploy that check themselves (and only
administrators can edit design documents).
A server administrator can also insist on lower and upper bounds for
iteration count to reject weakly protected passwords and
resource-hungry passwords respectively.
COUCHDB-2221
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/7b33d40e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/7b33d40e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/7b33d40e
Branch: refs/heads/import-master
Commit: 7b33d40ea021dad3ba2d2cda6e5d89b5dd22bd69
Parents: ab167dc
Author: Robert Newson <rn...@apache.org>
Authored: Sun Apr 6 18:31:15 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Apr 6 22:09:54 2014 +0100
----------------------------------------------------------------------
src/config/auth.rst | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/7b33d40e/src/config/auth.rst
----------------------------------------------------------------------
diff --git a/src/config/auth.rst b/src/config/auth.rst
index 4127288..8311140 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -166,6 +166,30 @@ Authentication Configuration
[couch_httpd_auth]
iterations = 10000
+ .. config:option:: min_iterations :: Minimum PBKDF2 iterations count
+
+ .. versionadded:: 1.6
+
+ The minimum number of iterations allowed for passwords hashed by
+ the PBKDF2 algorithm. Any user with fewer iterations is forbidden.
+
+ ::
+
+ [couch_httpd_auth]
+ min_iterations = 100
+
+ .. config:option:: max_iterations :: Maximum PBKDF2 iterations count
+
+ .. versionadded:: 1.6
+
+ The maximum number of iterations allowed for passwords hashed by
+ the PBKDF2 algorithm. Any user with greater iterations is forbidden.
+
+ ::
+
+ [couch_httpd_auth]
+ max_iterations = 100000
+
.. config:option:: proxy_use_secret :: Force proxy auth use secret token
[23/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
fix wording in json-structure
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/af959473
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/af959473
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/af959473
Branch: refs/heads/import-master
Commit: af95947358516047298d0c342d76723986232eef
Parents: c6aa572
Author: Andy Wenk <an...@nms.de>
Authored: Thu Jan 30 22:00:28 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Fri Mar 21 22:54:29 2014 +0100
----------------------------------------------------------------------
src/json-structure.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/af959473/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index ab3ae45..68137d2 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -481,10 +481,10 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- The ``body``, ``base64`` and ``json`` object keys overlapp each other
- where in the last one wins. Since most implementations of key-value objects do
- not preserve the key order, confusing situations can emerge. The same applies,
- when they are mixed. Try to use only one of them.
+ The ``body``, ``base64`` and ``json`` object keys are overlapping each other
+ where the last one wins. Since most realizations of key-value objects do
+ not preserve the key order or if they are mixed, confusing situations can
+ occure. Try to use only one of them.
.. note::
Any custom property makes CouchDB raise an internal exception.
[44/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
[build] add missing Makefile.am entries. Actual file still missing.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/3ffb39b0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/3ffb39b0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/3ffb39b0
Branch: refs/heads/import-master
Commit: 3ffb39b0d404cd2c74d33bef0776e27fdf372ad3
Parents: 9211ff2
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Apr 16 16:42:00 2014 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Apr 16 16:42:00 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/3ffb39b0/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 7b95d0d..b3fba13 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -120,6 +120,7 @@ html_files = \
html/_sources/cve/2012-5641.txt \
html/_sources/cve/2012-5649.txt \
html/_sources/cve/2012-5650.txt \
+ html/_sources/cve/2014-2668.txt \
html/_sources/cve/index.txt \
html/_sources/fauxton/addons.txt \
html/_sources/fauxton/index.txt \
@@ -242,6 +243,7 @@ html_files = \
html/cve/2012-5641.html \
html/cve/2012-5649.html \
html/cve/2012-5650.html \
+ html/cve/2014-2668.html \
html/cve/index.html \
html/fauxton/addons.html \
html/fauxton/index.html \
[28/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
fixed _update function example
It was only checking for req.id existance (it should
always be included in the request) and not its truthiness.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/af81438e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/af81438e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/af81438e
Branch: refs/heads/import-master
Commit: af81438e1e80dd9b4fda49c6747e1b9754825c88
Parents: d2e77f2
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Wed Mar 26 09:38:57 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Wed Mar 26 09:38:57 2014 -0400
----------------------------------------------------------------------
src/couchapp/ddocs.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/af81438e/src/couchapp/ddocs.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/ddocs.rst b/src/couchapp/ddocs.rst
index 754b9b7..4f4664a 100644
--- a/src/couchapp/ddocs.rst
+++ b/src/couchapp/ddocs.rst
@@ -419,7 +419,7 @@ The basic example that demonstrates all use-cases of update handlers below:
function(doc, req){
if (!doc){
- if ('id' in req){
+ if ('id' in req && req['id']){
// create new document
return [{'_id': req['id']}, 'New World']
}
[10/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Document `data_size` in `/db`
The value is returned, but was missing in the documentation.
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/6e855182
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/6e855182
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/6e855182
Branch: refs/heads/import-master
Commit: 6e85518260161c7559e9deac280b502fdccedf38
Parents: 2af8188
Author: Jens Rantil <je...@gmail.com>
Authored: Fri Dec 27 22:20:49 2013 +0100
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Dec 28 01:47:58 2013 +0400
----------------------------------------------------------------------
src/api/database/common.rst | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/6e855182/src/api/database/common.rst
----------------------------------------------------------------------
diff --git a/src/api/database/common.rst b/src/api/database/common.rst
index 29e523f..f715c70 100644
--- a/src/api/database/common.rst
+++ b/src/api/database/common.rst
@@ -61,6 +61,7 @@
:>json string db_name: The name of the database.
:>json number disk_format_version: The version of the physical format used
for the data when it is stored on disk.
+ :>json number data_size: Actual data size in bytes of the database data.
:>json number disk_size: Size in bytes of the data as stored on the disk.
Views indexes are not included in the calculation.
:>json number doc_count: A count of the documents in the specified database.
[42/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Add some more files to the build system
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/b91a0e4e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/b91a0e4e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/b91a0e4e
Branch: refs/heads/import-master
Commit: b91a0e4ed2bdcbcb9f068be17f382417dbda13cf
Parents: df22ff4
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 10:20:31 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:40 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b91a0e4e/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 86351f4..92ec2ff 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -450,6 +450,7 @@ src_files_html = \
../templates/layout.html \
../templates/help.html \
../templates/searchbox.html \
+ ../templates/tracing.html \
../templates/utilities.html
sphinx_extensions = \
[14/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
added documentation fixes
made the deletion of a document clearer and
fixed some wording in the JSON structure tables
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/338d6775
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/338d6775
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/338d6775
Branch: refs/heads/import-master
Commit: 338d6775c537282ec4cd053505ad42277f4f76d8
Parents: 9e4fa3a
Author: Andy Wenk <an...@apache.org>
Authored: Fri Jan 24 00:20:41 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Mon Feb 3 13:05:36 2014 +0100
----------------------------------------------------------------------
src/api/document/common.rst | 19 +++++----
src/json-structure.rst | 84 ++++++++++++++++++++--------------------
2 files changed, 54 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/338d6775/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index f21c8df..bdd6702 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -238,18 +238,22 @@
"rev": "1-917fa2381192822767f010b95b45325b"
}
-
.. http:delete:: /{db}/{docid}
:synopsis: Deletes the document
- Deletes the specified document from the database. You must supply the
- current (latest) revision, either by using the ``rev`` parameter to
- specify the revision.
+ Marks the specified document as deleted by adding a field ``_deleted`` with
+ the value ``true``. Documents with this field will not be returned within
+ requests anymore, but stay in the database. You must supply the current
+ (latest) revision, either by using the ``rev`` parameter or by using the
+ :header:`If-Match` header to specify the revision.
+
+ .. seealso::
+ :ref:`Retrieving Deleted Documents <api/doc/retrieving-deleted-documents>`
.. note::
- Note that deletion of a record increments the revision number.
- The use of a revision for deletion of the record allows replication of
- the database to correctly track the deletion in synchronized copies.
+ CouchDB doesn't actually delete documents. The reason is the need to track
+ them correctly during the replication process between databases to prevent
+ accidental document recovery for any previous state.
:param db: Database name
:param docid: Document ID
@@ -489,6 +493,7 @@ Basic Attachments Info
"name": "Spaghetti with meatballs"
}
+.. _api/doc/retrieving-deleted-documents:
Retrieving Attachments Content
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/338d6775/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 7d22f1e..4ab2f65 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -119,30 +119,30 @@ CouchDB database information object
+================================+=============================================+
| db_name | The name of the database. |
+--------------------------------+---------------------------------------------+
-| committed_update_seq | The number of committed update. |
+| committed_update_seq | The number of committed updates. |
+--------------------------------+---------------------------------------------+
-| doc_count | A count of the documents in the specified |
-| | database. |
+| doc_count | The number of documents in the database. |
+--------------------------------+---------------------------------------------+
-| doc_del_count | Number of deleted documents |
+| doc_del_count | The number of deleted documents. |
+--------------------------------+---------------------------------------------+
| compact_running | Set to true if the database compaction |
| | routine is operating on this database. |
+--------------------------------+---------------------------------------------+
| disk_format_version | The version of the physical format used for |
-| | the data when it is stored on disk. |
+| | the data when it is stored on hard disk. |
+--------------------------------+---------------------------------------------+
-| disk_size | Size in bytes of the data as stored on the |
-| | disk. Views indexes are not included in the |
+| disk_size | Size in bytes of the data as stored on disk.|
+| | View indexes are not included in the |
| | calculation. |
+--------------------------------+---------------------------------------------+
-| instance_start_time | Timestamp of when the database was opened, |
-| | expressed in microseconds since the epoch. |
+| instance_start_time | Timestamp indicating when the database was |
+| | opened, expressed in microseconds since the |
+| | epoch. |
+--------------------------------+---------------------------------------------+
| purge_seq | The number of purge operations on the |
| | database. |
+--------------------------------+---------------------------------------------+
-| update_seq | The current number of updates to the |
+| update_seq | The current number of updates made in the |
| | database. |
+--------------------------------+---------------------------------------------+
@@ -227,7 +227,7 @@ List of Active Tasks
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| tasks [array] | Active Task |
+| tasks [array] | Active Tasks |
+--------------------------------+---------------------------------------------+
| pid | Process ID |
+--------------------------------+---------------------------------------------+
@@ -265,16 +265,16 @@ Replication Settings
| | start |
+--------------------------------+---------------------------------------------+
| filter (optional) | name of the filter function in the form of |
-| | ddoc/myfilter |
+| | ``ddoc/myfilter`` |
+--------------------------------+---------------------------------------------+
-| query_params (optional) | query parameter that are passed to the |
-| | filter function; value should be a document |
-| | containing parameters as members |
+| query_params (optional) | Query parameter that are passed to the |
+| | filter function; the value should be a |
+| | document containing parameters as members |
+--------------------------------+---------------------------------------------+
| use_checkpoints (optional) | Whether to use replication checkpoints |
| | or not |
+--------------------------------+---------------------------------------------+
-| checkpoint_interval (optional) | Specifies checkpoint interval in ms. |
+| checkpoint_interval (optional) | Specifies the checkpoint interval in ms. |
+--------------------------------+---------------------------------------------+
.. _replication-status:
@@ -289,7 +289,7 @@ Replication Status
+--------------------------------+---------------------------------------------+
| session_id | Unique session ID |
+--------------------------------+---------------------------------------------+
-| source_last_seq | Last sequence number read from source |
+| source_last_seq | Last sequence number read from the source |
| | database |
+--------------------------------+---------------------------------------------+
| history [array] | Replication History |
@@ -326,16 +326,16 @@ Request object
| Field | Description |
+================================+=============================================+
| body | Request body data as `string`. |
-| | If request method is `GET` method contains |
-| | this field contains ``"undefined"`` value, |
-| | while if `DELETE` or `HEAD` value is ``""`` |
-| | (empty string) |
+| | If the request method is `GET` this field |
+| | contains the value ``"undefined"``. If the |
+| | method is `DELETE` or `HEAD` the value is |
+| | ``""`` (empty string). |
+--------------------------------+---------------------------------------------+
| cookie | Cookies `object`. |
+--------------------------------+---------------------------------------------+
| form | Form data `object`. |
-| | Contains decoded body as key-value pairs if |
-| | `Content-Type` header was |
+| | Contains the decoded body as key-value |
+| | pairs if the `Content-Type` header was |
| | ``application/x-www-form-urlencoded``. |
+--------------------------------+---------------------------------------------+
| headers | Request headers `object`. |
@@ -346,18 +346,18 @@ Request object
| info | :ref:`Database information <dbinfo_object>` |
+--------------------------------+---------------------------------------------+
| method | Request method as `string` or `array`. |
-| | String value is method is one of: `HEAD`, |
+| | String value is a method as one of: `HEAD`, |
| | `GET`, `POST`, `PUT`, `DELETE`, `OPTIONS`, |
-| | and `TRACE`, otherwise it will be |
-| | represented as array of char codes. |
+| | and `TRACE`. Otherwise it will be |
+| | represented as an array of char codes. |
+--------------------------------+---------------------------------------------+
| path | List of requested path sections. |
+--------------------------------+---------------------------------------------+
| peer | Request source IP address. |
+--------------------------------+---------------------------------------------+
| query | URL query parameters `object`. |
-| | Note that multiple keys not supported and |
-| | last key value suppress others. |
+| | Note that multiple keys are not supported |
+| | and teh last key value suppresses others. |
+--------------------------------+---------------------------------------------+
| requested_path | List of actual requested path section. |
+--------------------------------+---------------------------------------------+
@@ -367,8 +367,8 @@ Request object
+--------------------------------+---------------------------------------------+
| userCtx | :ref:`userctx_object`. |
+--------------------------------+---------------------------------------------+
-| uuid | Generated UUID by specified algorithm in |
-| | config file. |
+| uuid | Generated UUID by a specified algorithm in |
+| | the config file. |
+--------------------------------+---------------------------------------------+
.. code-block:: javascript
@@ -481,15 +481,15 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- ``body``, ``base64`` and ``json`` object keys are overlaps each other and
- the last wins. Since most realizations of key-value objects doesn't preserve
- key order mixing them may create confusing situation. Try to use only one of
- them.
+ The ``body``, ``base64`` and ``json`` object keys are overlapping each other
+ where the last one wins. Since most realizations of key-value objects do
+ not preserve the key order or if they are mixed, confusing situations can
+ occure. Try to use only one of them.
.. note::
- Any custom property makes CouchDB raise internal exception.
- Also `Response object` could be a simple string value which would be
- implicitly wrapped into ``{"body": ...}`` object.
+ Any custom property makes CouchDB raise an internal exception.
+ Furthermore, the `Response object` could be a simple string value which would
+ be implicitly wrapped into a ``{"body": ...}`` object.
Returned CouchDB Document with Detailed Revision Info
@@ -503,7 +503,7 @@ Returned CouchDB Document with Detailed Revision Info
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _revs_info [array] | CouchDB Document Extended Revision Info |
+| _revs_info [array] | CouchDB document extended revision info |
+--------------------------------+---------------------------------------------+
| rev | Full revision string |
+--------------------------------+---------------------------------------------+
@@ -521,7 +521,7 @@ Returned CouchDB Document with Revision Info
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _revisions | CouchDB Document Revisions |
+| _revisions | CouchDB document revisions |
+--------------------------------+---------------------------------------------+
| ids [array] | Array of valid revision IDs, in reverse |
| | order (latest first) |
@@ -540,7 +540,7 @@ Returned Document with Attachments
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _attachments (optional) | Document Attachment |
+| _attachments (optional) | Document attachment |
+--------------------------------+---------------------------------------------+
| filename | Attachment |
+--------------------------------+---------------------------------------------+
@@ -601,8 +601,8 @@ User Context Object
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| db | Database name in context of provided |
-| | operation. |
+| db | Database name in the context of the |
+| | provided operation. |
+--------------------------------+---------------------------------------------+
| name | User name. |
+--------------------------------+---------------------------------------------+
[07/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Improve docs of use_checkpoints and checkpoint_interval config options.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/aa098a85
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/aa098a85
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/aa098a85
Branch: refs/heads/import-master
Commit: aa098a85ab85ea25d445615c4cf7a2755e87122d
Parents: b6a2d0a
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Dec 14 21:55:15 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Dec 14 21:55:22 2013 +0400
----------------------------------------------------------------------
src/config/replicator.rst | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/aa098a85/src/config/replicator.rst
----------------------------------------------------------------------
diff --git a/src/config/replicator.rst b/src/config/replicator.rst
index 515c679..388491c 100644
--- a/src/config/replicator.rst
+++ b/src/config/replicator.rst
@@ -116,37 +116,33 @@ Replicator Database Configuration
.. versionadded:: 1.6
Defines replication checkpoint interval in milliseconds. :ref:`Replicator
- <replication/replicator>` will :get:`requests </{db}>` Source database
- each time after a specified amount of interval::
+ <replicator>` will :get:`requests </{db}>` from the Source database at
+ the specified interval::
[replicator]
checkpoint_interval = 5000
- Keeping this value lower raises polling rate to Source database, which
- may be useful for frequently changing data, while higher value saves
- traffic usage that is important for mobile clients.
+ Lower intervals may be useful for frequently changing data, while higher
+ values will lower bandwidth and make fewer requests for infrequently
+ updated databases.
.. config:option:: use_checkpoints
.. versionadded:: 1.6
- If set as ``true`` CouchDB makes intermediate checkpoints during
- replication from those it may continue it in case of failure or restart::
+ If ``use_checkpoints`` is set to ``true``, CouchDB will make checkpoints
+ during replication and at the completion of replication. CouchDB can
+ efficiently resume replication from any of these checkpoints::
[replicator]
use_checkpoints = true
- .. warning:: It's **not recommended** to switch this option off
- (by setting value ``false`` to it) since without checkpoints there would
- not be stored any replication history logs both on Source and Target,
- forcing replication to start from the very beginning.
+ .. note:: Checkpoints are stored in :ref:`local documents <api/local>`
+ on both the source and target databases (which requires write access).
- .. note:: Checkpoints (aka Replication Log) are stored as :ref:`local
- documents <api/local>` both on Source and Target endpoints. In case,
- when client has no write permission on Source database you may disable
- them, but locally for specific replication process.
- See :ref:`replication-settings` for more info.
+ .. warning:: Disabling checkpoints is **not recommended** as CouchDB
+ will scan the Source database's changes feed from the beginning.
.. config:option:: cert_file
[20/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
s/MVC/MVCC in replication protocol docs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f57eed61
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f57eed61
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f57eed61
Branch: refs/heads/import-master
Commit: f57eed61de90001817534750d4fc833439fdaa17
Parents: 1d98d85
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Mon Oct 21 10:02:11 2013 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Thu Mar 13 09:38:24 2014 -0400
----------------------------------------------------------------------
src/replication/protocol.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f57eed61/src/replication/protocol.rst
----------------------------------------------------------------------
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index c5a8181..0f6fdfd 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -40,7 +40,7 @@ provided by the couch_replicator_ module available in Apache CouchDB.
The CouchDB_ replication protocol is using the `CouchDB REST API
<http://wiki.apache.org/couchdb/Reference>`_ and so is based on HTTP and
-the Apache CouchDB MVC Data model. The primary goal of this
+the Apache CouchDB MVCC Data model. The primary goal of this
specification is to describe the CouchDB replication algorithm.
[21/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
update documentation
explain better what happens with the view index when documents
in a view are being processed
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f49be35b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f49be35b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f49be35b
Branch: refs/heads/import-master
Commit: f49be35bb0402693d0f2ff102588d2ad94cb1953
Parents: f57eed6
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 20 23:52:26 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 20 23:52:26 2014 +0100
----------------------------------------------------------------------
src/intro/overview.rst | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f49be35b/src/intro/overview.rst
----------------------------------------------------------------------
diff --git a/src/intro/overview.rst b/src/intro/overview.rst
index f94d656..4e3b72c 100644
--- a/src/intro/overview.rst
+++ b/src/intro/overview.rst
@@ -198,9 +198,10 @@ simultaneous client readers, who can read and query the view while the index
is concurrently being refreshed for other clients without causing problems
for the readers.
-As documents are examined, their previous row values are removed from the
-view indexes, if they exist. If the document is selected by a view function,
-the function results are inserted into the view as a new row.
+As documents are processed by the view engine through your 'map' and 'reduce'
+functions, their previous row values are removed from the view indexes, if
+they exist. If the document is selected by a view function, the function results
+are inserted into the view as a new row.
When view index changes are written to disk, the updates are always appended
at the end of the file, serving to both reduce disk head seek times during
[47/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Support for user configurable SSL ciphers
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/98949599
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/98949599
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/98949599
Branch: refs/heads/import-master
Commit: 9894959972e9819bf8e28458abaca06ceeb56ba9
Parents: 3695591
Author: Terin Stock <te...@gmail.com>
Authored: Sun Apr 20 11:40:25 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Apr 20 12:07:10 2014 +0100
----------------------------------------------------------------------
src/config/http.rst | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/98949599/src/config/http.rst
----------------------------------------------------------------------
diff --git a/src/config/http.rst b/src/config/http.rst
index 1ae3abe..dfe8d5a 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -387,6 +387,30 @@ Secure Socket Level Options
[ssl]
verify_ssl_certificates = false
+ .. config:option:: secure_renegotiate :: Enable secure renegotiation
+
+ Set to `true` to reject renegotiation attempt that does not live up to RFC 5746::
+
+ [ssl]
+ secure_renegotiate = true
+
+ .. config:option:: ciphers :: Specify permitted server cipher list
+
+ Set to the cipher suites that should be supported which can be
+ specified in erlang format "{ecdhe_ecdsa,aes_128_cbc,sha256}" or
+ in OpenSSL format "ECDHE-ECDSA-AES128-SHA256".
+
+ [ssl]
+ ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"]
+
+ .. config:option:: tls_versions :: Specify permitted server SSL/TLS
+ protocol versions
+
+ Set to a list of permitted SSL/TLS protocol versions::
+
+ [ssl]
+ tls_versions = [sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2']
+
.. _cors:
.. _config/cors:
[27/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
clarified what a complex key is in view collation
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d2e77f2b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d2e77f2b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d2e77f2b
Branch: refs/heads/import-master
Commit: d2e77f2b0419523a588e046870e48d8741e827cb
Parents: b461dac
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:50 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:54 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d2e77f2b/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 9c2f5c7..9b11b15 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -32,8 +32,8 @@ property serves as the key, thus the result will be sorted by ``LastName``:
}
}
-CouchDB allows arbitrary JSON structures to be used as keys. You can use complex
-keys for fine-grained control over sorting and grouping.
+CouchDB allows arbitrary JSON structures to be used as keys. You can use JSON
+arrays as keys for fine-grained control over sorting and grouping.
Examples
========
[06/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Document use_checkpoints and checkpoint_interval config options.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/b6a2d0aa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/b6a2d0aa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/b6a2d0aa
Branch: refs/heads/import-master
Commit: b6a2d0aa2078795357241686e0fbe05571745e77
Parents: c54ddc3
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Dec 14 15:37:13 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Dec 14 15:38:19 2013 +0400
----------------------------------------------------------------------
src/config/replicator.rst | 37 +++++++++++++++++++++++++++++++++++++
src/json-structure.rst | 2 ++
src/replication/replicator.rst | 4 ++--
3 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b6a2d0aa/src/config/replicator.rst
----------------------------------------------------------------------
diff --git a/src/config/replicator.rst b/src/config/replicator.rst
index 45451c1..515c679 100644
--- a/src/config/replicator.rst
+++ b/src/config/replicator.rst
@@ -111,6 +111,43 @@ Replicator Database Configuration
.. _inet: http://www.erlang.org/doc/man/inet.html#setopts-2
+ .. config:option:: checkpoint_interval
+
+ .. versionadded:: 1.6
+
+ Defines replication checkpoint interval in milliseconds. :ref:`Replicator
+ <replication/replicator>` will :get:`requests </{db}>` Source database
+ each time after a specified amount of interval::
+
+ [replicator]
+ checkpoint_interval = 5000
+
+ Keeping this value lower raises polling rate to Source database, which
+ may be useful for frequently changing data, while higher value saves
+ traffic usage that is important for mobile clients.
+
+
+ .. config:option:: use_checkpoints
+
+ .. versionadded:: 1.6
+
+ If set as ``true`` CouchDB makes intermediate checkpoints during
+ replication from those it may continue it in case of failure or restart::
+
+ [replicator]
+ use_checkpoints = true
+
+ .. warning:: It's **not recommended** to switch this option off
+ (by setting value ``false`` to it) since without checkpoints there would
+ not be stored any replication history logs both on Source and Target,
+ forcing replication to start from the very beginning.
+
+ .. note:: Checkpoints (aka Replication Log) are stored as :ref:`local
+ documents <api/local>` both on Source and Target endpoints. In case,
+ when client has no write permission on Source database you may disable
+ them, but locally for specific replication process.
+ See :ref:`replication-settings` for more info.
+
.. config:option:: cert_file
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b6a2d0aa/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 042df59..7d22f1e 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -274,6 +274,8 @@ Replication Settings
| use_checkpoints (optional) | Whether to use replication checkpoints |
| | or not |
+--------------------------------+---------------------------------------------+
+| checkpoint_interval (optional) | Specifies checkpoint interval in ms. |
++--------------------------------+---------------------------------------------+
.. _replication-status:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/b6a2d0aa/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/src/replication/replicator.rst b/src/replication/replicator.rst
index e93c579..5117752 100644
--- a/src/replication/replicator.rst
+++ b/src/replication/replicator.rst
@@ -22,8 +22,8 @@ cancel an ongoing replication.
These documents have exactly the same content as the JSON objects we use to
``POST`` to ``_replicate`` (fields ``source``, ``target``, ``create_target``,
-``continuous``, ``doc_ids``, ``filter``, ``query_params``,
-``use_checkpoints``).
+``continuous``, ``doc_ids``, ``filter``, ``query_params``, ``use_checkpoints``,
+``checkpoint_interval``).
Replication documents can have a user defined ``_id`` (handy for finding a
specific replication request later). Design Documents
[02/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
spelling
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/987ff4f0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/987ff4f0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/987ff4f0
Branch: refs/heads/import-master
Commit: 987ff4f0154fdcfc6e191f777f4d9962c488064b
Parents: 6be67ad
Author: Robert Newson <rn...@apache.org>
Authored: Thu Dec 5 12:34:24 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Dec 5 12:34:24 2013 +0000
----------------------------------------------------------------------
src/config/intro.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/987ff4f0/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/src/config/intro.rst b/src/config/intro.rst
index 3a5c828..c528f74 100644
--- a/src/config/intro.rst
+++ b/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 modifiying that file, you may override in `local.ini`, but
+ without modifying that file, you may override in `local.ini`, but
without any value::
[httpd_global_handlers]
[16/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
```validate_doc_update``` moved from views to root
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/146019f5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/146019f5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/146019f5
Branch: refs/heads/import-master
Commit: 146019f51b6c2303464e22de00380e2324720f31
Parents: 5a98440
Author: Anthony Ananich <an...@inpun.com>
Authored: Tue Feb 25 18:17:44 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Feb 25 20:22:20 2014 +0400
----------------------------------------------------------------------
src/query-server/javascript.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/146019f5/src/query-server/javascript.rst
----------------------------------------------------------------------
diff --git a/src/query-server/javascript.rst b/src/query-server/javascript.rst
index 16590d6..386f9c5 100644
--- a/src/query-server/javascript.rst
+++ b/src/query-server/javascript.rst
@@ -273,12 +273,12 @@ The CommonJS module can be added to a design document, like so:
"views": {
"lib": {
"security": "function user_context(userctx, secobj) { ... }"
- },
- "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
- user = require('lib/security').user(userctx, secobj);
- return user.is_admin();
- }"
+ }
},
+ "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
+ user = require('lib/security').user(userctx, secobj);
+ return user.is_admin();
+ }"
"_id": "_design/test"
}
[48/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
minor spelling fixes in docs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ec387c2d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ec387c2d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ec387c2d
Branch: refs/heads/import-master
Commit: ec387c2d7cbed957d730f8034c9522fc77e9cc2e
Parents: 9894959
Author: Andy Wenk <an...@apache.org>
Authored: Thu Apr 24 20:37:16 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Apr 24 21:03:34 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ec387c2d/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index ea4892d..ff002db 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -12,14 +12,14 @@
.. _replication/intro:
-Introduction Into Replications
-==============================
+Introduction to Replication
+===========================
One of CouchDB's strengths is the ability to synchronize two copies of the same
database. This enables users to distribute data across several nodes or
datacenters, but also to move data more closely to clients.
-Replication involves a source and a destination database, which can be one the
+Replication involves a source and a destination database, which can be on the
same or on different CouchDB instances. The aim of the replication is that at
the end of the process, all active documents on the source database are also in
the destination database and all documents that were deleted in the source
[11/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
Mention SOCKS5 protocol option in docs
COUCHDB-2025
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/024f19f5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/024f19f5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/024f19f5
Branch: refs/heads/import-master
Commit: 024f19f5be88db9596c52979b187d5454a45d277
Parents: 6e85518
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jan 6 23:27:33 2014 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jan 6 23:37:43 2014 +0000
----------------------------------------------------------------------
src/api/server/common.rst | 2 +-
src/whatsnew/1.6.rst | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/024f19f5/src/api/server/common.rst
----------------------------------------------------------------------
diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index 98bb19b..4e5614c 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -359,7 +359,7 @@ jumping to ``offset`` bytes towards the beginning of the file first:
Required administrator's privileges on target server.
:<json array doc_ids: Array of document IDs to be synchronized
:<json string proxy: Address of a proxy server through which replication
- should occur
+ should occur (protocol can be "http" or "socks5")
:<json string source: Source database name or URL
:<json string target: Target database name or URL
:>header Content-Type: - :mimetype:`application/json`
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/024f19f5/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index 2a0fc6e..28e5ac2 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -51,3 +51,4 @@ Version 1.6.0
* :issue:`1962`: Various replicator enhancements
:commit:`1d5fe2aa` write access for checkpoints is not required on source db
:commit:`0693f98e` make the replication checkpoint interval configurable
+ :issue:`2025`: Support SOCKS5 protocol for replication sources and targets
[50/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
minor documentation fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/0efce918
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/0efce918
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/0efce918
Branch: refs/heads/import-master
Commit: 0efce9185ea127bad7e93585efef852fc0fe91c0
Parents: a3294bc
Author: Andy Wenk <an...@apache.org>
Authored: Fri Apr 25 15:41:39 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Fri Apr 25 15:41:39 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/0efce918/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index 68690bf..2d09617 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -67,10 +67,10 @@ Master - Master replication
---------------------------
One replication task will only transfer changes in one direction. To achieve
-master-master replication it is possible to set up two replication tasks in
-different directions. When a change is replication from database A to B by the
-first task, the second will discover that the new change on B already exists in
-A and will wait for further changes.
+master-master replication, it is possible to set up two replication tasks in
+opposite direction. When a change is replicated from database A to B by the
+first task, the second task from B to A will discover that the new change on
+B already exists in A and will wait for further changes.
Controlling which Documents to Replicate
@@ -79,7 +79,7 @@ Controlling which Documents to Replicate
There are two ways for controlling which documents are replicated, and which
are skipped. *Local* documents are never replicated (see :ref:`api/local`).
-Additionally, :ref:`filterfun` can be used in a replication documents (see
+Additionally, :ref:`filterfun` can be used in a replication (see
:ref:`replication-settings`). The replication task will then evaluate
the filter function for each document in the changes feed. The document will
only be replicated if the filter returns `true`.
[12/50] documentation commit: updated refs/heads/import-master to
0efce91
Posted by kx...@apache.org.
update/improve changelog for 1.6
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/ac790b14
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/ac790b14
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/ac790b14
Branch: refs/heads/import-master
Commit: ac790b1491ab043a6c46e513ee9533b37a0e564e
Parents: 024f19f
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Jan 7 15:29:48 2014 +0100
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Jan 7 15:29:48 2014 +0100
----------------------------------------------------------------------
src/whatsnew/1.6.rst | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/ac790b14/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index 28e5ac2..7d93ff6 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -43,12 +43,25 @@ Version 1.6.0
This version is not released yet.
-* :issue:`1922`: Fix CORS exposed headers :commit:`4f619833`
-* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``
+* Fauxton: many improvements in our experimental new user interface, including
+ switching the code editor from CodeMirror to Ace as well as better support
+ for various browsers.
+* :issue:`1922`: fix CORS exposed headers. :commit:`4f619833`
+* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``.
:commit:`c66ac4a8`
-* :issue:`1795`: Ensure startup script couchdb clears pid file on termination
+* :issue:`1795`: ensure the startup script clears the pid file on termination.
:commit:`818ef4f9`
-* :issue:`1962`: Various replicator enhancements
- :commit:`1d5fe2aa` write access for checkpoints is not required on source db
- :commit:`0693f98e` make the replication checkpoint interval configurable
- :issue:`2025`: Support SOCKS5 protocol for replication sources and targets
+* :issue:`1962`: replication can now be performed without having write access
+ to the source database (:commit:`1d5fe2aa`), the replication checkpoint
+ interval is now configurable (:commit:`0693f98e`).
+* :issue:`2025`: add support for SOCKS5 proxies for replication.
+ :commit:`fcd76c9`
+* :issue:`1930`: redirect to the correct page after submitting a new document
+ with a different ID than the one suggested by Futon. :commit:`4906b591`
+* :issue:`1923`: add support for `attachments` and `att_encoding_info` options
+ (formerly only available on the documents API) to the view API.
+ :commit:`ca41964b`
+* :issue:`1647`: for failed replications originating from a document in the
+ `_replicator` database, store the failure reason in the document.
+ :commit:`08cac68b`
+* A number of improvements for the documentation.