Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 11A95F3CF for ; Tue, 1 Oct 2013 13:47:13 +0000 (UTC) Received: (qmail 82735 invoked by uid 500); 1 Oct 2013 13:46:49 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 81933 invoked by uid 500); 1 Oct 2013 13:46:36 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 80510 invoked by uid 99); 1 Oct 2013 13:46:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Oct 2013 13:46:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3F9058AC810; Tue, 1 Oct 2013 13:46:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Tue, 01 Oct 2013 13:46:31 -0000 Message-Id: In-Reply-To: <088b553bf2854e5f8b45d967c847f1e2@git.apache.org> References: <088b553bf2854e5f8b45d967c847f1e2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] [abbrv] git commit: updated refs/heads/replicator-redesign to 066d69b docs: use sphinx automatic version numbers for protocol responses Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/508b565d Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/508b565d Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/508b565d Branch: refs/heads/replicator-redesign Commit: 508b565d2d425bd31fb155538e2be20647ae0846 Parents: cf4a09b Author: Dave Cottlehuber Authored: Fri Sep 27 14:17:07 2013 +0200 Committer: Alexander Shorin Committed: Fri Sep 27 22:01:49 2013 +0400 ---------------------------------------------------------------------- share/doc/src/api/basics.rst | 4 +-- share/doc/src/api/database/bulk-api.rst | 4 +-- share/doc/src/api/database/changes.rst | 2 +- share/doc/src/api/database/common.rst | 18 ++++++------- share/doc/src/api/database/compact.rst | 8 +++--- share/doc/src/api/database/misc.rst | 10 ++++---- share/doc/src/api/database/security.rst | 4 +-- share/doc/src/api/database/temp-views.rst | 2 +- share/doc/src/api/ddoc/common.rst | 2 +- share/doc/src/api/ddoc/render.rst | 12 ++++----- share/doc/src/api/ddoc/views.rst | 12 ++++----- share/doc/src/api/document/attachments.rst | 6 ++--- share/doc/src/api/document/common.rst | 34 ++++++++++++------------- share/doc/src/api/server/authn.rst | 14 +++++----- share/doc/src/api/server/common.rst | 16 ++++++------ share/doc/src/api/server/configuration.rst | 12 ++++----- share/doc/src/config/auth.rst | 4 +-- share/doc/src/config/couchdb.rst | 2 +- share/doc/src/config/http.rst | 2 +- share/doc/src/config/misc.rst | 2 +- share/doc/src/externals.rst | 4 +-- share/doc/src/intro/api.rst | 8 +++--- share/doc/src/maintenance/compaction.rst | 8 +++--- 23 files changed, 95 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/basics.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/basics.rst b/share/doc/src/api/basics.rst index 74465b6..d05ddb6 100644 --- a/share/doc/src/api/basics.rst +++ b/share/doc/src/api/basics.rst @@ -160,7 +160,7 @@ Request Headers .. code-block:: http - Server: CouchDB/1.0.1 (Erlang OTP/R13B) + Server: CouchDB (Erlang/OTP) Date: Thu, 13 Jan 2011 13:39:34 GMT Content-Type: text/plain;charset=utf-8 Content-Length: 227 @@ -181,7 +181,7 @@ Request Headers .. code-block:: http - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Date: Thu, 13 Jan 2013 13:40:11 GMT Content-Type: application/json Content-Length: 227 http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/bulk-api.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/bulk-api.rst b/share/doc/src/api/database/bulk-api.rst index 148da3d..9017227 100644 --- a/share/doc/src/api/database/bulk-api.rst +++ b/share/doc/src/api/database/bulk-api.rst @@ -85,7 +85,7 @@ Content-Type: application/json Date: Sat, 10 Aug 2013 16:22:56 GMT ETag: "1W2DJUZFZSZD9K78UFA3GZWB4" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -258,7 +258,7 @@ Content-Length: 144 Content-Type: application/json Date: Mon, 12 Aug 2013 00:15:05 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) [ { http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/changes.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/changes.rst b/share/doc/src/api/database/changes.rst index 52a38a7..344a3bb 100644 --- a/share/doc/src/api/database/changes.rst +++ b/share/doc/src/api/database/changes.rst @@ -102,7 +102,7 @@ Content-Type: application/json Date: Mon, 12 Aug 2013 00:54:58 GMT ETag: "6ASLEKEMSRABT0O5XY9UPO9Z" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/common.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/common.rst b/share/doc/src/api/database/common.rst index 2fb525f..ecf31fe 100644 --- a/share/doc/src/api/database/common.rst +++ b/share/doc/src/api/database/common.rst @@ -40,7 +40,7 @@ Cache-Control: must-revalidate Content-Type: application/json Date: Mon, 12 Aug 2013 01:27:41 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) .. http:get:: /{db} @@ -86,7 +86,7 @@ Content-Length: 258 Content-Type: application/json Date: Mon, 12 Aug 2013 01:38:57 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "committed_update_seq": 292786, @@ -152,7 +152,7 @@ Content-Type: application/json Date: Mon, 12 Aug 2013 08:01:45 GMT Location: http://localhost:5984/db - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true @@ -178,7 +178,7 @@ Content-Length: 95 Content-Type: application/json Date: Mon, 12 Aug 2013 08:01:16 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "error": "file_exists", @@ -204,7 +204,7 @@ Content-Length: 194 Content-Type: application/json Date: Mon, 12 Aug 2013 08:02:10 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "error": "illegal_database_name", @@ -245,7 +245,7 @@ Content-Length: 12 Content-Type: application/json Date: Mon, 12 Aug 2013 08:54:00 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true @@ -311,7 +311,7 @@ Date: Tue, 13 Aug 2013 15:19:25 GMT ETag: "1-9c65296036141e575d32ba9c034dd3ee" Location: http://localhost:5984/db/ab39fe0993049b84cfa81acd6ebad09d - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "ab39fe0993049b84cfa81acd6ebad09d", @@ -354,7 +354,7 @@ document with the ID ``FishStew``. Date: Tue, 13 Aug 2013 15:19:25 GMT ETag: "1-9c65296036141e575d32ba9c034dd3ee" Location: http://localhost:5984/db/FishStew - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "FishStew", @@ -411,7 +411,7 @@ respond with a HTTP :http:statuscode:`202` response code immediately. Content-Type: application/json Date: Tue, 13 Aug 2013 15:19:25 GMT Location: http://localhost:5984/db/FishStew - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "FishStew", http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/compact.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/compact.rst b/share/doc/src/api/database/compact.rst index 51e9c3f..42d99eb 100644 --- a/share/doc/src/api/database/compact.rst +++ b/share/doc/src/api/database/compact.rst @@ -73,7 +73,7 @@ Content-Length: 12 Content-Type: application/json Date: Mon, 12 Aug 2013 09:27:43 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true @@ -124,7 +124,7 @@ Content-Length: 12 Content-Type: application/json Date: Mon, 12 Aug 2013 09:36:44 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true @@ -172,7 +172,7 @@ Content-Length: 53 Content-Type: application/json Date: Mon, 12 Aug 2013 10:22:19 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "instance_start_time": "1376269047459338", @@ -219,7 +219,7 @@ Content-Length: 12 Content-Type: application/json Date: Mon, 12 Aug 2013 09:27:43 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/misc.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/misc.rst b/share/doc/src/api/database/misc.rst index b0c3706..d3507a5 100644 --- a/share/doc/src/api/database/misc.rst +++ b/share/doc/src/api/database/misc.rst @@ -82,7 +82,7 @@ Content-Length: 103 Content-Type: application/json Date: Mon, 12 Aug 2013 10:53:24 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "purge_seq":3, @@ -162,7 +162,7 @@ database must be examined. Content-Length: 64 Content-Type: application/json Date: Mon, 12 Aug 2013 10:53:24 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "missed_revs":{ @@ -237,7 +237,7 @@ database must be examined. Content-Length: 88 Content-Type: application/json Date: Mon, 12 Aug 2013 16:56:02 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "190f721ca3411be7aa9477db5f948bbb": { @@ -281,7 +281,7 @@ database must be examined. Content-Length: 5 Content-Type: application/json Date: Mon, 12 Aug 2013 17:27:30 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) 1000 @@ -324,7 +324,7 @@ database must be examined. Content-Length: 12 Content-Type: application/json Date: Mon, 12 Aug 2013 17:47:52 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/security.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/security.rst b/share/doc/src/api/database/security.rst index 1856579..551e5a8 100644 --- a/share/doc/src/api/database/security.rst +++ b/share/doc/src/api/database/security.rst @@ -92,7 +92,7 @@ Content-Length: 109 Content-Type: application/json Date: Mon, 12 Aug 2013 19:05:29 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "admins": { @@ -172,7 +172,7 @@ Content-Length: 12 Content-Type: application/json Date: Tue, 13 Aug 2013 11:26:28 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "ok": true http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/database/temp-views.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/database/temp-views.rst b/share/doc/src/api/database/temp-views.rst index 9bcecb5..0b576b8 100644 --- a/share/doc/src/api/database/temp-views.rst +++ b/share/doc/src/api/database/temp-views.rst @@ -53,7 +53,7 @@ Content-Type: application/json Date: Tue, 13 Aug 2013 12:28:12 GMT ETag: "AU33B3N7S9K4SAZSFA048HVB4" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/ddoc/common.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/ddoc/common.rst b/share/doc/src/api/ddoc/common.rst index 0d6ec17..1e5b183 100644 --- a/share/doc/src/api/ddoc/common.rst +++ b/share/doc/src/api/ddoc/common.rst @@ -172,7 +172,7 @@ Content-Length: 263 Content-Type: application/json Date: Sat, 17 Aug 2013 12:54:17 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "name": "recipe", http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/ddoc/render.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/ddoc/render.rst b/share/doc/src/api/ddoc/render.rst index c87824c..9c6b1c4 100644 --- a/share/doc/src/api/ddoc/render.rst +++ b/share/doc/src/api/ddoc/render.rst @@ -62,7 +62,7 @@ Content-Type: text/html; charset=utf-8 Date: Wed, 21 Aug 2013 12:34:07 GMT Etag: "7Z2TO7FPEMZ0F4GH0RJCRIOAU" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Vary: Accept no doc @@ -120,7 +120,7 @@ Content-Type: text/html; charset=utf-8 Date: Wed, 21 Aug 2013 12:38:08 GMT Etag: "8IEBO8103EI98HDZL5Z4I1T0C" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Vary: Accept An Italian-American dish that usually consists of spaghetti, tomato sauce and meatballs. @@ -181,7 +181,7 @@ Content-Type: text/plain; charset=utf-8 Date: Wed, 21 Aug 2013 12:49:15 GMT Etag: "D52L2M1TKQYDD1Y8MEYJR8C84" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked Vary: Accept @@ -244,7 +244,7 @@ Content-Type: text/plain; charset=utf-8 Date: Wed, 21 Aug 2013 12:49:15 GMT Etag: "5L0975X493R0FB5Z3043POZHD" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked Vary: Accept @@ -306,7 +306,7 @@ Content-Length: 52 Content-Type: application/json Date: Wed, 21 Aug 2013 14:00:58 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "error": "missed", @@ -371,7 +371,7 @@ Content-Length: 16 Content-Type: application/json Date: Wed, 21 Aug 2013 14:11:34 GMT - Server: CouchDB/1.4.0+build.c843cef (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) X-Couch-Id: SpaghettiWithMeatballs X-Couch-Update-NewRev: 12-a5e099df5720988dae90c8b664496baf http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/ddoc/views.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/ddoc/views.rst b/share/doc/src/api/ddoc/views.rst index bb45095..ade789c 100644 --- a/share/doc/src/api/ddoc/views.rst +++ b/share/doc/src/api/ddoc/views.rst @@ -97,7 +97,7 @@ Content-Type: application/json Date: Wed, 21 Aug 2013 09:12:06 GMT ETag: "2FOLSBSW4O6WB798XU4AQYA9B" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -157,7 +157,7 @@ Content-Type: application/json Date: Wed, 21 Aug 2013 09:14:13 GMT ETag: "6R5NM8E872JIJF796VF7WI3FZ" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -339,7 +339,7 @@ content. The basic order of output is as follows: Content-Type: application/json Date: Wed, 21 Aug 2013 10:09:25 GMT ETag: "8LA1LZPQ37B6R9U8BK9BGQH27" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -467,7 +467,7 @@ You can reverse the order of the returned view information by using the Content-Type: application/json Date: Wed, 21 Aug 2013 10:09:25 GMT ETag: "Z4N468R15JBT98OM0AMNSR8U" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -669,7 +669,7 @@ in view: Content-Type: application/json Date: Wed, 21 Aug 2013 09:14:13 GMT ETag: "9Q6Q2GZKPH8D5F8L7PB6DBSS9" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -738,7 +738,7 @@ To omit some records you may use ``skip`` query parameter: Content-Type: application/json Date: Wed, 21 Aug 2013 09:14:13 GMT ETag: "H3G7YZSNIVRRHO5FXPE16NJHN" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/document/attachments.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/document/attachments.rst b/share/doc/src/api/document/attachments.rst index 3f3e8d4..34526fc 100644 --- a/share/doc/src/api/document/attachments.rst +++ b/share/doc/src/api/document/attachments.rst @@ -66,7 +66,7 @@ Content-Type: text/plain Date: Thu, 15 Aug 2013 12:42:42 GMT ETag: "vVa/YgiE1+Gh0WfoFJAcSg==" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) .. http:get:: /{db}/{docid}/{attname} @@ -172,7 +172,7 @@ Date: Thu, 15 Aug 2013 12:38:04 GMT ETag: "2-ce91aed0129be8f9b0f650a2edcfd0a4" Location: http://localhost:5984/recipes/SpaghettiWithMeatballs/recipe.txt - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs", @@ -243,7 +243,7 @@ Content-Type: application/json Date: Wed, 14 Aug 2013 12:23:13 GMT ETag: "7-05185cf5fcdf4b6da360af939431d466" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs", http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/document/common.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/document/common.rst b/share/doc/src/api/document/common.rst index adbf03e..03b1de1 100644 --- a/share/doc/src/api/document/common.rst +++ b/share/doc/src/api/document/common.rst @@ -59,7 +59,7 @@ Content-Type: application/json Date: Tue, 13 Aug 2013 21:35:37 GMT ETag: "12-151bb8678d45aaa949ec3698ef1c7e78" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) .. http:get:: /{db}/{docid} @@ -150,7 +150,7 @@ Content-Type: application/json Date: Tue, 13 Aug 2013 21:35:37 GMT ETag: "1-917fa2381192822767f010b95b45325b" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_id": "SpaghettiWithMeatballs", @@ -227,7 +227,7 @@ Date: Wed, 14 Aug 2013 20:31:39 GMT ETag: "1-917fa2381192822767f010b95b45325b" Location: http://localhost:5984/recipes/SpaghettiWithMeatballs - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs", @@ -299,7 +299,7 @@ Content-Type: application/json Date: Wed, 14 Aug 2013 12:23:13 GMT ETag: "2-056f5f44046ecafc08a2bc2b9c229e20" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "FishStew", @@ -365,7 +365,7 @@ Date: Wed, 14 Aug 2013 14:21:00 GMT ETag: "1-e86fdf912560c2321a5fcefc6264e6d9" Location: http://localhost:5984/recipes/SpaghettiWithMeatballs_Italian - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs_Italian", @@ -429,7 +429,7 @@ Basic Attachments Info Content-Type: application/json Date: Tue, 13 Aug 2013 21:35:37 GMT ETag: "5-fd96acb3256302bf0dd2f32713161f2a" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_attachments": { @@ -491,7 +491,7 @@ It's possible to retrieve document with all attached files content by using Content-Type: application/json Date: Wed, 14 Aug 2013 11:32:40 GMT ETag: "4-f1bcae4bf7bbb92310079e632abfe3f4" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_attachments": { @@ -533,7 +533,7 @@ query parameter: Content-Type: application/json Date: Tue, 13 Aug 2013 21:35:37 GMT ETag: "5-fd96acb3256302bf0dd2f32713161f2a" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_attachments": { @@ -594,7 +594,7 @@ about compressed attachments size and used codec. Content-Type: application/json Date: Tue, 13 Aug 2013 21:35:37 GMT ETag: "5-fd96acb3256302bf0dd2f32713161f2a" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_attachments": { @@ -660,7 +660,7 @@ the ``revs=true`` parameter to the request URL: Content-Type: application/json Date: Wed, 14 Aug 2013 11:38:26 GMT ETag: "5-fd96acb3256302bf0dd2f32713161f2a" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_id": "SpaghettiWithMeatballs", @@ -719,7 +719,7 @@ document by supplying the ``revs_info`` argument to the query: Content-Length: 802 Content-Type: application/json Date: Wed, 14 Aug 2013 11:40:55 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_id": "SpaghettiWithMeatballs", @@ -807,7 +807,7 @@ requested. Content-Length: 271 Content-Type: application/json Date: Wed, 14 Aug 2013 11:40:55 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_id": "SpaghettiWithMeatballs", @@ -847,7 +847,7 @@ response: Content-Length: 41 Content-Type: application/json Date: Wed, 14 Aug 2013 12:23:27 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "error": "not_found", @@ -875,7 +875,7 @@ with :http:get:`/{db}/{docid}` request: Content-Type: application/json Date: Wed, 14 Aug 2013 12:30:22 GMT ETag: "2-056f5f44046ecafc08a2bc2b9c229e20" - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "_deleted": true, @@ -947,7 +947,7 @@ Alternatively, you can supply the current revision number in the Date: Wed, 14 Aug 2013 20:33:56 GMT ETag: "2-790895a73b63fb91dd863388398483dd" Location: http://localhost:5984/recipes/SpaghettiWithMeatballs - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs", @@ -983,7 +983,7 @@ string or :http:header:`If-Match`: Date: Wed, 14 Aug 2013 14:21:00 GMT ETag: "1-917fa2381192822767f010b95b45325b" Location: http://localhost:5984/recipes_old/SpaghettiWithMeatballs_Original - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs_Original", @@ -1019,7 +1019,7 @@ string for the target document by appending the ``rev`` parameter to the Date: Wed, 14 Aug 2013 14:21:00 GMT ETag: "2-62e778c9ec09214dd685a981dcc24074"" Location: http://localhost:5984/recipes_old/SpaghettiWithMeatballs_Original - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "id": "SpaghettiWithMeatballs_Original", http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/server/authn.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/server/authn.rst b/share/doc/src/api/server/authn.rst index 0b44920..ce08277 100644 --- a/share/doc/src/api/server/authn.rst +++ b/share/doc/src/api/server/authn.rst @@ -51,7 +51,7 @@ CouchDB must compute password hash with every request): Content-Length: 177 Content-Type: application/json Date: Mon, 03 Dec 2012 00:44:47 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { "couchdb":"Welcome", @@ -143,7 +143,7 @@ To obtain the first token and thus authenticate a user for the first time, the Content-Length: 43 Content-Type: application/json Date: Mon, 03 Dec 2012 01:23:14 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) Set-Cookie: AuthSession=cm9vdDo1MEJCRkYwMjq0LO0ylOIwShrgt8y-UkhI-c6BGw; Version=1; Path=/; HttpOnly {"ok":true,"name":"root","roles":["_admin"]} @@ -172,7 +172,7 @@ To obtain the first token and thus authenticate a user for the first time, the Content-Type: application/json Date: Mon, 03 Dec 2012 01:32:46 GMT Location: http://localhost:5984/blog/_design/sofa/_rewrite/recent-posts - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) Set-Cookie: AuthSession=cm9vdDo1MEJDMDEzRTp7Vu5GKCkTxTVxwXbpXsBARQWnhQ; Version=1; Path=/; HttpOnly {"ok":true,"name":null,"roles":["_admin"]} @@ -207,7 +207,7 @@ To obtain the first token and thus authenticate a user for the first time, the Content-Length: 175 Content-Type: application/json Date: Fri, 09 Aug 2013 20:27:45 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) Set-Cookie: AuthSession=cm9vdDo1MjA1NTBDMTqmX2qKt1KDR--GUC80DQ6-Ew_XIw; Version=1; Path=/; HttpOnly { @@ -255,7 +255,7 @@ To obtain the first token and thus authenticate a user for the first time, the Content-Length: 12 Content-Type: application/json Date: Fri, 09 Aug 2013 20:30:12 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) Set-Cookie: AuthSession=; Version=1; Path=/; HttpOnly { @@ -317,7 +317,7 @@ headers to CouchDB with related request: Content-Length: 190 Content-Type: application/json Date: Fri, 14 Jun 2013 10:16:03 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) { "info": { @@ -430,7 +430,7 @@ Both snippets produces similar request and response pair: Content-Length : 167 Content-Type : application/json Date : Tue, 23 Jul 2013 06:51:15 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/server/common.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/server/common.rst b/share/doc/src/api/server/common.rst index 22e312d..f58403f 100644 --- a/share/doc/src/api/server/common.rst +++ b/share/doc/src/api/server/common.rst @@ -46,7 +46,7 @@ Content-Length: 179 Content-Type: application/json Date: Sat, 10 Aug 2013 06:33:33 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { "couchdb": "Welcome", @@ -105,7 +105,7 @@ Content-Length: 1690 Content-Type: application/json Date: Sat, 10 Aug 2013 06:37:31 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) [ { @@ -194,7 +194,7 @@ Content-Length: 52 Content-Type: application/json Date: Sat, 10 Aug 2013 06:57:48 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) [ "_users", @@ -253,7 +253,7 @@ Cache-Control: must-revalidate Content-Type: application/json Date: Sat, 10 Aug 2013 07:02:41 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) Transfer-Encoding: chunked { @@ -415,7 +415,7 @@ jumping to ``offset`` bytes towards the beginning of the file first: Content-Length: 692 Content-Type: application/json Date: Sun, 11 Aug 2013 20:38:50 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "history": [ @@ -695,7 +695,7 @@ a 404 error. Content-Length: 12 Content-Type: application/json Date: Sat, 10 Aug 2013 11:33:50 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { "ok": true @@ -738,7 +738,7 @@ a 404 error. Content-Length: 187 Content-Type: application/json Date: Sat, 10 Aug 2013 11:41:11 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { "couchdb": { @@ -939,7 +939,7 @@ structure is as follows: ETag: "DGRWWQFLUDWN5MRKSLKQ425XV" Expires: Fri, 01 Jan 1990 00:00:00 GMT Pragma: no-cache - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) { "uuids": [ http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/api/server/configuration.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/api/server/configuration.rst b/share/doc/src/api/server/configuration.rst index 41270dd..e974328 100644 --- a/share/doc/src/api/server/configuration.rst +++ b/share/doc/src/api/server/configuration.rst @@ -53,7 +53,7 @@ CouchDB instance. Content-Length: 4148 Content-Type: application/json Date: Sat, 10 Aug 2013 12:01:42 GMT - Server: CouchDB/1.4.0 (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "attachments": { @@ -75,7 +75,7 @@ CouchDB instance. "max_document_size": "4294967296", "os_process_timeout": "5000", "uri_file": "/var/lib/couchdb/couch.uri", - "util_driver_dir": "/usr/lib64/couchdb/erlang/lib/couch-1.0.1/priv/lib", + "util_driver_dir": "/usr/lib64/couchdb/erlang/lib/couch-1.5.0/priv/lib", "view_index_dir": "/var/lib/couchdb" }, "daemons": { @@ -188,7 +188,7 @@ CouchDB instance. Content-Length: 444 Content-Type: application/json Date: Sat, 10 Aug 2013 12:10:40 GMT - Server: CouchDB/1.4.0+build.c843cef (Erlang OTP/R16B) + Server: CouchDB (Erlang/OTP) { "allow_jsonp": "false", @@ -239,7 +239,7 @@ CouchDB instance. Content-Length: 8 Content-Type: application/json Date: Sat, 10 Aug 2013 12:12:59 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) "debug" @@ -290,7 +290,7 @@ CouchDB instance. Content-Length: 8 Content-Type: application/json Date: Sat, 10 Aug 2013 12:12:59 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) "debug" @@ -327,6 +327,6 @@ CouchDB instance. Content-Length: 7 Content-Type: application/json Date: Sat, 10 Aug 2013 12:29:03 GMT - Server: CouchDB/1.3.1 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) "info" http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/config/auth.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config/auth.rst b/share/doc/src/config/auth.rst index 279e124..85d0dbb 100644 --- a/share/doc/src/config/auth.rst +++ b/share/doc/src/config/auth.rst @@ -54,7 +54,7 @@ supports querying, deleting or creating new admin accounts: Content-Length: 196 Content-Type: application/json Date: Fri, 30 Nov 2012 11:37:18 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) .. code-block:: json @@ -85,7 +85,7 @@ encrypt it. Content-Length: 89 Content-Type: application/json Date: Fri, 30 Nov 2012 11:39:18 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B02) + Server: CouchDB (Erlang/OTP) "-pbkdf2-43ecbd256a70a3a2f7de40d2374b6c3002918834,921a12f74df0c1052b3e562a23cd227f,10000" http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/config/couchdb.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config/couchdb.rst b/share/doc/src/config/couchdb.rst index c1bd182..d42e5b8 100644 --- a/share/doc/src/config/couchdb.rst +++ b/share/doc/src/config/couchdb.rst @@ -196,7 +196,7 @@ its contents should be readable for the user that runs the CouchDB service. :: [couchdb] - util_driver_dir = /usr/lib/couchdb/erlang/lib/couch-1.3.0/priv/lib + util_driver_dir = /usr/lib/couchdb/erlang/lib/couch-1.5.0/priv/lib .. _config/couchdb/uuid: http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/config/http.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config/http.rst b/share/doc/src/config/http.rst index f225092..68981bf 100644 --- a/share/doc/src/config/http.rst +++ b/share/doc/src/config/http.rst @@ -368,7 +368,7 @@ specify the ``-k`` option as the message reads: .. code-block:: bash shell> curl -k https://127.0.0.1:6984/ - {"couchdb":"Welcome","version":"1.3.0"} + {"couchdb":"Welcome","version":"1.5.0"} All done. http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/config/misc.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config/misc.rst b/share/doc/src/config/misc.rst index 235142d..079f2f4 100644 --- a/share/doc/src/config/misc.rst +++ b/share/doc/src/config/misc.rst @@ -218,4 +218,4 @@ message. This is returned when requesting ``GET /``. [vendor] name = The Apache Software Foundation - version = 1.3.0 + version = 1.5.0 http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/externals.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/externals.rst b/share/doc/src/externals.rst index 9b4530f..9068e75 100644 --- a/share/doc/src/externals.rst +++ b/share/doc/src/externals.rst @@ -233,7 +233,7 @@ And then start CouchDB and try: > < HTTP/1.1 200 < Transfer-Encoding: chunked - < Server: CouchDB/1.3.0 (Erlang OTP/R14B) + < Server: CouchDB (Erlang/OTP) < Date: Mon, 27 Sep 2010 01:13:37 GMT < Content-Type: text/plain < Connection: keep-alive @@ -244,7 +244,7 @@ And then start CouchDB and try: The corresponding CouchDB logs look like:: - Apache CouchDB 1.3.0 (LogLevel=info) is starting. + Apache CouchDB 1.5.0 (LogLevel=info) is starting. Apache CouchDB has started. Time to relax. [info] [<0.31.0>] Apache CouchDB has started on http://127.0.0.1:5984/ [info] [<0.105.0>] 127.0.0.1 - - 'GET' /_hello 200 http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/intro/api.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/intro/api.rst b/share/doc/src/intro/api.rst index f617df0..9779ea9 100644 --- a/share/doc/src/intro/api.rst +++ b/share/doc/src/intro/api.rst @@ -62,9 +62,9 @@ CouchDB replies, all excited to get going: "uuid": "85fb71bf700c17267fef77535820e371", "vendor": { "name": "The Apache Software Foundation", - "version": "1.4.0" + "version": "1.5.0" }, - "version": "1.4.0" + "version": "1.5.0" } You get back a JSON string, that, if parsed into a native object or data @@ -136,7 +136,7 @@ curl elaborates:: > Accept: */* > < HTTP/1.1 201 Created - < Server: CouchDB/0.9.0 (Erlang OTP/R12B) + < Server: CouchDB (Erlang/OTP) < Date: Sun, 05 Jul 2009 22:48:28 GMT < Content-Type: text/plain;charset=utf-8 < Content-Length: 12 @@ -242,7 +242,7 @@ code. :: - < Server: CouchDB/0.10.1 (Erlang OTP/R13B) + < Server: CouchDB (Erlang/OTP) The :header:`Server` header is good for diagnostics. It tells us which CouchDB version and which underlying Erlang version we are talking to. http://git-wip-us.apache.org/repos/asf/couchdb/blob/508b565d/share/doc/src/maintenance/compaction.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/maintenance/compaction.rst b/share/doc/src/maintenance/compaction.rst index c2859bf..a24e008 100644 --- a/share/doc/src/maintenance/compaction.rst +++ b/share/doc/src/maintenance/compaction.rst @@ -58,7 +58,7 @@ On success, HTTP status :http:statuscode:`202` is returned immediately: Content-Length: 12 Content-Type: text/plain; charset=utf-8 Date: Wed, 19 Jun 2013 09:43:52 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) .. code-block:: javascript @@ -76,7 +76,7 @@ for the request. If you don't, you will be aware about with HTTP status Content-Length: 78 Content-Type: application/json Date: Wed, 19 Jun 2013 09:43:44 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) {"error":"bad_content_type","reason":"Content-Type must be application/json"} @@ -92,7 +92,7 @@ information about it via :ref:`database information resource `:: Content-Length: 246 Content-Type: application/json Date: Wed, 19 Jun 2013 16:51:20 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) { "committed_update_seq": 76215, @@ -122,7 +122,7 @@ is actually running. To track the compaction progress you may query the Content-Length: 175 Content-Type: application/json Date: Wed, 19 Jun 2013 16:27:23 GMT - Server: CouchDB/1.3.0 (Erlang OTP/R15B03) + Server: CouchDB (Erlang/OTP) [ {