couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/replicator-redesign to 066d69b
Date Tue, 01 Oct 2013 13:46:51 GMT
Make HTTP domain default one.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5522488e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5522488e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5522488e

Branch: refs/heads/replicator-redesign
Commit: 5522488e8c2e0772aa5f2844d0c557f3f17c5586
Parents: 598ccd4
Author: Alexander Shorin <kxepal@apache.org>
Authored: Sat Sep 28 13:33:53 2013 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Sat Sep 28 13:33:53 2013 +0400

----------------------------------------------------------------------
 share/doc/src/api/database/bulk-api.rst    |  2 +-
 share/doc/src/api/database/changes.rst     |  6 ++---
 share/doc/src/api/database/common.rst      |  4 ++--
 share/doc/src/api/database/compact.rst     | 10 ++++----
 share/doc/src/api/database/misc.rst        |  2 +-
 share/doc/src/api/database/security.rst    |  2 +-
 share/doc/src/api/ddoc/common.rst          | 24 +++++++++----------
 share/doc/src/api/ddoc/rewrites.rst        |  2 +-
 share/doc/src/api/ddoc/views.rst           | 10 ++++----
 share/doc/src/api/document/attachments.rst | 22 ++++++++---------
 share/doc/src/api/document/common.rst      | 32 ++++++++++++-------------
 share/doc/src/api/local.rst                |  8 +++----
 share/doc/src/api/server/common.rst        |  4 ++--
 share/doc/src/conf.py                      |  2 ++
 share/doc/src/config/compaction.rst        |  2 +-
 share/doc/src/intro/api.rst                |  1 -
 share/doc/src/maintenance/compaction.rst   | 16 ++++++-------
 share/doc/src/maintenance/performance.rst  |  2 --
 share/doc/src/query-server/erlang.rst      |  1 +
 share/doc/src/replication/conflicts.rst    |  6 ++---
 share/doc/src/replication/protocol.rst     | 20 ++++++++--------
 21 files changed, 89 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 eb49a28..87233df 100644
--- a/share/doc/src/api/database/bulk-api.rst
+++ b/share/doc/src/api/database/bulk-api.rst
@@ -137,7 +137,7 @@
 
   The ``POST`` to ``_all_docs`` allows to specify multiple keys to be
   selected from the database. This enables you to request multiple
-  documents in a single request, in place of multiple :http:get:`/{db}/{docid}`
+  documents in a single request, in place of multiple :get:`/{db}/{docid}`
   requests.
 
   The request body should contain a list of the keys to be returned as an

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 f144f33..f2ad9b7 100644
--- a/share/doc/src/api/database/changes.rst
+++ b/share/doc/src/api/database/changes.rst
@@ -39,7 +39,7 @@
     previous connection. Overrides `since` query parameter.
   :query array doc_ids: List of document IDs to filter the changes feed as
    valid JSON array. Used with :ref:`_doc_ids <changes/filter/doc_ids>` filter.
-   Since `length of URL is limited`_, you better use :http:post:`/{db}/_changes`
+   Since `length of URL is limited`_, you better use :post:`/{db}/_changes`
    method instead.
   :query boolean conflicts: Includes `conflicts` information in response.
     Ignored if `include_docs` isn't ``true``. Default is ``false``.
@@ -165,7 +165,7 @@
 .. http:post:: /{db}/_changes
 
   Requests the database changes feed in the same way as
-  :http:get:`/{db}/_changes` does, but this method is widely used with
+  :get:`/{db}/_changes` does, but this method is widely used with
   ``?filter=_doc_ids`` query parameter and allows to pass larger list of
   document IDs to filter.
 
@@ -421,7 +421,7 @@ _doc_ids
 
 This filter accepts only changes for documents which ID in specified in
 ``doc_ids`` query parameter or payload's object array. See
-:http:post:`/{db}/_changes` for an example.
+:post:`/{db}/_changes` for an example.
 
 
 .. _changes/filter/design:

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 5265919..c374625 100644
--- a/share/doc/src/api/database/common.rst
+++ b/share/doc/src/api/database/common.rst
@@ -376,8 +376,8 @@ the risk of the documents not being stored in the event of a failure,
 since the documents are not written to disk immediately.
 
 To use the batched mode, append the ``batch=ok`` query argument to the
-URL of the ``PUT`` or :http:post:`/{db}` request. The CouchDB server will
-respond with a HTTP :http:statuscode:`202` response code immediately.
+URL of the ``PUT`` or :post:`/{db}` request. The CouchDB server will
+respond with a HTTP :statuscode:`202` response code immediately.
 
 .. note::
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 f7289e5..d2b90d7 100644
--- a/share/doc/src/api/database/compact.rst
+++ b/share/doc/src/api/database/compact.rst
@@ -38,7 +38,7 @@
   You can determine if the compaction process is operating on a database
   by obtaining the database meta information, the ``compact_running``
   value of the returned database structure will be set to true. See
-  :http:get:`/{db}`.
+  :get:`/{db}`.
 
   You can also obtain a list of running processes to determine whether
   compaction is currently running. See :ref:`api/server/active_tasks`.
@@ -53,7 +53,7 @@
   :code 202: Compaction request has been accepted
   :code 400: Invalid database name
   :code 401: CouchDB Server Administrator privileges required
-  :code 415: Bad :http:header:`Content-Type` value
+  :code 415: Bad :header:`Content-Type` value
 
   **Request**:
 
@@ -105,7 +105,7 @@
   :code 400: Invalid database name
   :code 401: CouchDB Server Administrator privileges required
   :code 404: Design document not found
-  :code 415: Bad :http:header:`Content-Type` value
+  :code 415: Bad :header:`Content-Type` value
 
   **Request**:
 
@@ -162,7 +162,7 @@
   :>json boolean ok: Operation status
   :code 201: Commit completed successfully
   :code 400: Invalid database name
-  :code 415: Bad :http:header:`Content-Type` value
+  :code 415: Bad :header:`Content-Type` value
 
   **Request**:
 
@@ -212,7 +212,7 @@
   :code 202: Compaction request has been accepted
   :code 400: Invalid database name
   :code 401: CouchDB Server Administrator privileges required
-  :code 415: Bad :http:header:`Content-Type` value
+  :code 415: Bad :header:`Content-Type` value
 
   **Request**:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 ad46e15..e69ce8a 100644
--- a/share/doc/src/api/database/misc.rst
+++ b/share/doc/src/api/database/misc.rst
@@ -62,7 +62,7 @@
   :>json object purged: Mapping of document ID to list of purged revisions
   :code 200: Request completed successfully
   :code 400: Invalid database name or JSON payload
-  :code 415: Bad :http:header:`Content-Type` value
+  :code 415: Bad :header:`Content-Type` value
 
   **Request**:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 ee95ee4..7bdf88e 100644
--- a/share/doc/src/api/database/security.rst
+++ b/share/doc/src/api/database/security.rst
@@ -53,7 +53,7 @@
 
   If there are any member names or roles defined for a database, then only
   authenticated users having a matching name or role are allowed to
-  read documents from the database (or do a :http:get:`/{db}` call).
+  read documents from the database (or do a :get:`/{db}` call).
 
   .. note::
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 79c7357..16cfffc 100644
--- a/share/doc/src/api/ddoc/common.rst
+++ b/share/doc/src/api/ddoc/common.rst
@@ -23,7 +23,7 @@
 
   .. seealso::
 
-    :http:head:`/{db}/{docid}`
+    :head:`/{db}/{docid}`
 
 
 .. http:get:: /{db}/_design/{ddoc}
@@ -34,12 +34,12 @@
 
   .. seealso::
 
-    :http:get:`/{db}/{docid}`
+    :get:`/{db}/{docid}`
 
 
 .. http:put:: /{db}/_design/{ddoc}
 
-  The :http:method:`PUT` method creates a new named design document, or creates
+  The :method:`PUT` method creates a new named design document, or creates
   a new revision of the existing design document.
 
   The design documents have some agreement upon their fields and structure.
@@ -64,7 +64,7 @@
 
   .. seealso::
 
-    :http:put:`/{db}/{docid}`
+    :put:`/{db}/{docid}`
 
 
 .. http:delete:: /{db}/_design/{ddoc}
@@ -75,11 +75,11 @@
 
   .. seealso::
 
-    :http:delete:`/{db}/{docid}`
+    :delete:`/{db}/{docid}`
 
 .. http:copy:: /{db}/_design/{ddoc}
 
-  The :http:method:`COPY` (which is non-standard HTTP) copies an existing
+  The :method:`COPY` (which is non-standard HTTP) copies an existing
   design document to a new or existing one.
 
   .. note::
@@ -89,7 +89,7 @@
 
   .. seealso::
 
-    :http:copy:`/{db}/{docid}`
+    :copy:`/{db}/{docid}`
 
 
 .. _api/ddoc/attachment:
@@ -104,7 +104,7 @@
 
   .. seealso::
 
-    :http:head:`/{db}/{docid}/{attname}`
+    :head:`/{db}/{docid}/{attname}`
 
 .. http:get:: /{db}/_design/{ddoc}/{attname}
 
@@ -114,7 +114,7 @@
 
   .. seealso::
 
-    :http:get:`/{db}/{docid}/{attname}`
+    :get:`/{db}/{docid}/{attname}`
 
 .. http:put:: /{db}/_design/{ddoc}/{attname}
 
@@ -123,7 +123,7 @@
 
   .. seealso::
 
-    :http:put:`/{db}/{docid}/{attname}`
+    :put:`/{db}/{docid}/{attname}`
 
 .. http:delete:: /{db}/_design/{ddoc}/{attname}
 
@@ -131,7 +131,7 @@
 
   .. seealso::
 
-    :http:delete:`/{db}/{docid}/{attname}`
+    :delete:`/{db}/{docid}/{attname}`
 
 
 .. _api/ddoc/info:
@@ -196,7 +196,7 @@
 View Index Information
 ----------------------
 
-The response from :http:get:`/{db}/_design/{ddoc}/_info` contains
+The response from :get:`/{db}/_design/{ddoc}/_info` contains
 ``view_index`` (*object*) field with the next structure:
 
 * **compact_running** (*boolean*):  Indicates whether a compaction routine

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/api/ddoc/rewrites.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/ddoc/rewrites.rst b/share/doc/src/api/ddoc/rewrites.rst
index 61eebed..d6e83a9 100644
--- a/share/doc/src/api/ddoc/rewrites.rst
+++ b/share/doc/src/api/ddoc/rewrites.rst
@@ -52,7 +52,7 @@
   The pattern matching is done by first matching the request method to a rule.
   By default all methods match a rule. (method is equal to ``"*"`` by default).
   Then It will try to match the path to one rule. If no rule match, then a
-  :http:statuscode:`404` response returned.
+  :statuscode:`404` response returned.
 
   Once a rule is found we rewrite the request url using the ``to`` and ``query``
   fields. The identified token are matched to the rule and will replace var.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 7834539..8683085 100644
--- a/share/doc/src/api/ddoc/views.rst
+++ b/share/doc/src/api/ddoc/views.rst
@@ -126,11 +126,11 @@
 .. http:post:: /{db}/_design/{ddoc}/_view/{view}
 
   Executes the specified view function from the specified design document.
-  Unlike the :http:get:`/{db}/_design/{ddoc}/_view/{view}`  method
-  for accessing views, the :http:method:`POST` method supports the specification
+  Unlike the :get:`/{db}/_design/{ddoc}/_view/{view}`  method
+  for accessing views, the :method:`POST` method supports the specification
   of explicit keys to be retrieved from the view results. The remainder of the
-  :http:method:`POST` view functionality is identical to the
-  :http:get:`/{db}/_design/{ddoc}/_view/{view}` API.
+  :method:`POST` view functionality is identical to the
+  :get:`/{db}/_design/{ddoc}/_view/{view}` API.
 
   **Request**:
 
@@ -295,7 +295,7 @@ In addition to using stale views, you can also make use of the
 view information including the update sequence of the database from
 which the view was generated. The returned value can be compared this to
 the current update sequence exposed in the database information
-(returned by :http:get:`/{db}`).
+(returned by :get:`/{db}`).
 
 
 .. _api/ddoc/view/sorting:

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 34526fc..c26b561 100644
--- a/share/doc/src/api/document/attachments.rst
+++ b/share/doc/src/api/document/attachments.rst
@@ -20,9 +20,9 @@
 
   Returns the HTTP headers containing a minimal amount of information
   about the specified attachment. The method supports the same query
-  arguments as the :http:get:`/{db}/{docid}/{attname}` method, but only
+  arguments as the :get:`/{db}/{docid}/{attname}` method, but only
   the header information (including attachment size, encoding and the MD5 hash
-  as an :http:header:`ETag`), is returned.
+  as an :header:`ETag`), is returned.
 
   :param db: Database name
   :param docid: Document ID
@@ -41,8 +41,8 @@
   :>header Content-MD5: Base64 encoded MD5 binary digest
   :>header ETag: Double quoted base64 encoded MD5 binary digest
   :code 200: Attachment exists
-  :code 304: Attachment wasn't modified if :http:header:`ETag` equals specified
-    :http:header:`If-None-Match` header
+  :code 304: Attachment wasn't modified if :header:`ETag` equals specified
+    :header:`If-None-Match` header
   :code 401: Read privilege required
   :code 404: Specified database, document or attachment was not found
 
@@ -73,7 +73,7 @@
 
   Returns the file attachment associated with the document.
   The raw data of the associated attachment is returned (just as if you were
-  accessing a static file. The returned :http:header:`Content-Type`
+  accessing a static file. The returned :header:`Content-Type`
   will be the same as the content type set when the document attachment
   was submitted into the database.
 
@@ -95,8 +95,8 @@
   :>header ETag: Double quoted base64 encoded MD5 binary digest
   :response: Stored content
   :code 200: Attachment exists
-  :code 304: Attachment wasn't modified if :http:header:`ETag` equals specified
-    :http:header:`If-None-Match` header
+  :code 304: Attachment wasn't modified if :header:`ETag` equals specified
+    :header:`If-None-Match` header
   :code 401: Read privilege required
   :code 404: Specified database, document or attachment was not found
 
@@ -105,7 +105,7 @@
 
   Uploads the supplied content as an attachment to the specified document.
   The attachment name provided must be a URL encoded string. You must also
-  supply either the ``rev`` query argument or the :http:header:`If-Match`
+  supply either the ``rev`` query argument or the :header:`If-Match`
   HTTP header for validation, and the HTTP headers (to set the attachment
   content type).
 
@@ -184,7 +184,7 @@
 .. http:delete:: /{db}/{docid}/{attname}
 
   Deletes the attachment ``attachment`` of the specified ``doc``. You must
-  supply the ``rev`` query parameter or :http:header:`If-Match` with the current
+  supply the ``rev`` query parameter or :header:`If-Match` with the current
   revision to delete the attachment.
 
   .. note::
@@ -224,7 +224,7 @@
     Host: localhost:5984
 
   Alternatively, instead of ``rev`` query parameter you may use
-  :http:header:`If-Match` header:
+  :header:`If-Match` header:
 
   .. code-block:: http
 
@@ -265,7 +265,7 @@ This is just a real quick run through how this looks under the hood.
 Usually, you will have larger binary files to serve from CouchDB, like
 MP3s and videos, but to make things a little more obvious, I use a text
 file here (Note that I use the :mimetype:`application/octet-stream`
-:http:header`Content-Type` instead of :mimetype:`text/plain`).
+:header`Content-Type` instead of :mimetype:`text/plain`).
 
 .. code-block:: bash
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 4ad854e..6687ebc 100644
--- a/share/doc/src/api/document/common.rst
+++ b/share/doc/src/api/document/common.rst
@@ -20,15 +20,15 @@
 
   Returns the HTTP Headers containing a minimal amount of information
   about the specified document. The method supports the same query
-  arguments as the :http:get:`/{db}/{docid}` method, but only the header
+  arguments as the :get:`/{db}/{docid}` method, but only the header
   information (including document size, and the revision as an ETag), is
   returned.
 
-  The :http:header:`ETag` header shows the current revision for the requested
-  document, and the :http:header:`Content-Length` specifies the length of the
+  The :header:`ETag` header shows the current revision for the requested
+  document, and the :header:`Content-Length` specifies the length of the
   data, if the document were requested in full.
 
-  Adding any of the query arguments (see :http:get:`/{db}/{docid}`), then the
+  Adding any of the query arguments (see :get:`/{db}/{docid}`), then the
   resulting HTTP Headers will correspond to what would be returned.
 
   :param db: Database name
@@ -166,8 +166,8 @@
 
 .. http:put:: /{db}/{docid}
 
-  The :http:method:`PUT` method creates a new named document, or creates a new
-  revision of the existing document. Unlike the :http:post:`/{db}` method, you
+  The :method:`PUT` method creates a new named document, or creates a new
+  revision of the existing document. Unlike the :post:`/{db}` method, you
   must specify the document ID in the request URL.
 
   :param db: Database name
@@ -280,7 +280,7 @@
     Host: localhost:5984
 
   Alternatively, instead of ``rev`` query parameter you may use
-  :http:header:`If-Match` header:
+  :header:`If-Match` header:
 
   .. code-block:: http
 
@@ -310,11 +310,11 @@
 
 .. http:copy:: /{db}/{docid}
 
-  The :http:method:`COPY` (which is non-standard HTTP) copies an existing
+  The :method:`COPY` (which is non-standard HTTP) copies an existing
   document to a new or existing document.
 
   The source document is specified on the request line, with the
-  :http:header:`Destination` header of the request specifying the target
+  :header:`Destination` header of the request specifying the target
   document.
 
   :param db: Database name
@@ -718,11 +718,11 @@ just inline base64 encoded attachments data into the document body:
 Alternatively, you can upload a document with attachments more efficiently in
 :mimetype:`multipart/related` format. This avoids having to Base64-encode
 the attachments, saving CPU and bandwidth. To do this, set the
-:http:header:`Content-Type` header of the :http:put:`/{db}/{docid}` request to
+:header:`Content-Type` header of the :put:`/{db}/{docid}` request to
 :mimetype:`multipart/related`.
 
 The first MIME body is the document itself, which should have its own
-:http:header:`Content-Type` of :mimetype:`application/json"`. It also should
+:header:`Content-Type` of :mimetype:`application/json"`. It also should
 include  an ``_attachments`` metadata object in which each attachment object
 has a key ``follows`` with value ``true``.
 
@@ -975,9 +975,9 @@ requested.
 Retrieving Deleted Documents
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-CouchDB doesn't actually deletes documents via :http:delete:`/{db}/{docid}`.
+CouchDB doesn't actually deletes documents via :delete:`/{db}/{docid}`.
 Instead of this, it leaves tombstone with very basic information about document.
-If you just :http:get:`/{db}/{docid}` CouchDB returns :http:statuscode:`404`
+If you just :get:`/{db}/{docid}` CouchDB returns :statuscode:`404`
 response:
 
 **Request**:
@@ -1005,7 +1005,7 @@ response:
   }
 
 However, you may retrieve document's tombstone by using ``rev`` query parameter
-with :http:get:`/{db}/{docid}` request:
+with :get:`/{db}/{docid}` request:
 
 **Request**:
 
@@ -1110,7 +1110,7 @@ Copying from a Specific Revision
 --------------------------------
 
 To copy *from* a specific version, use the ``rev`` argument to the query
-string or :http:header:`If-Match`:
+string or :header:`If-Match`:
 
 **Request**:
 
@@ -1147,7 +1147,7 @@ Copying to an Existing Document
 
 To copy to an existing document, you must specify the current revision
 string for the target document by appending the ``rev`` parameter to the
-:http:header:`Destination` header string.
+:header:`Destination` header string.
 
 **Request**:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/api/local.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/api/local.rst b/share/doc/src/api/local.rst
index 0fb6d6c..970523e 100644
--- a/share/doc/src/api/local.rst
+++ b/share/doc/src/api/local.rst
@@ -59,22 +59,22 @@ A list of the available methods and URL paths are provided below:
 
   Gets the specified local document. The semantics are identical to
   accessing a standard document in the specified database, except that the
-  document is not replicated. See :http:get:`/{db}/{docid}`.
+  document is not replicated. See :get:`/{db}/{docid}`.
 
 .. http:put:: /{db}/_local/{docid}
 
   Stores the specified local document. The semantics are identical to
   storing a standard document in the specified database, except that the
-  document is not replicated. See :http:put:`/{db}/{docid}`.
+  document is not replicated. See :put:`/{db}/{docid}`.
 
 .. http:delete:: /{db}/_local/{docid}
 
   Deletes the specified local document. The semantics are identical to
   deleting a standard document in the specified database, except that the
-  document is not replicated. See :http:delete:`/{db}/{docid}`.
+  document is not replicated. See :delete:`/{db}/{docid}`.
 
 .. http:copy:: /{db}/_local/{docid}
 
   Copies the specified local document. The semantics are identical to
   copying a standard document in the specified database, except that the
-  document is not replicated. See :http:copy:`/{db}/{docid}`.
+  document is not replicated. See :copy:`/{db}/{docid}`.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/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 3c0686c..fda74f5 100644
--- a/share/doc/src/api/server/common.rst
+++ b/share/doc/src/api/server/common.rst
@@ -676,7 +676,7 @@ a 404 error.
   :code 202: Server goes to restart (there is no guarantee that it will be
     alive after)
   :code 401: CouchDB Server Administrator privileges required
-  :code 415: Bad request`s :http:header:`Content-Type`
+  :code 415: Bad request`s :header:`Content-Type`
 
   **Request**:
 
@@ -892,7 +892,7 @@ structure is as follows:
   Accesses the built-in Futon administration interface for CouchDB.
 
   :>header Location: New URI location
-  :code 301: Redirects to :http:get:`/_utils/`
+  :code 301: Redirects to :get:`/_utils/`
 
 .. http:get:: /_utils/
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 6cdb9ef..805f87d 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -64,6 +64,8 @@ copyright = '%d, %s' % (
 
 highlight_language = "json"
 
+primary_domain = "http"
+
 pygments_style = "sphinx"
 
 html_theme = "couchdb"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/config/compaction.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/compaction.rst b/share/doc/src/config/compaction.rst
index 737c29d..0393d8c 100644
--- a/share/doc/src/config/compaction.rst
+++ b/share/doc/src/config/compaction.rst
@@ -76,7 +76,7 @@ Possible parameters:
     (file_size - data_size) / file_size * 100
 
   The data_size and file_size values can be obtained when
-  querying :http:get:`/{db}`.
+  querying :get:`/{db}`.
 
 - ``view_fragmentation``: If the ratio of legacy data, including metadata, to
   current data in a view index file size is equal to or greater then this

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/intro/api.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/intro/api.rst b/share/doc/src/intro/api.rst
index 9779ea9..67c8f5b 100644
--- a/share/doc/src/intro/api.rst
+++ b/share/doc/src/intro/api.rst
@@ -10,7 +10,6 @@
 .. License for the specific language governing permissions and limitations under
 .. the License.
 
-.. default-domain:: http
 
 .. _intro/api:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/maintenance/compaction.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/maintenance/compaction.rst b/share/doc/src/maintenance/compaction.rst
index a24e008..3e3ddfc 100644
--- a/share/doc/src/maintenance/compaction.rst
+++ b/share/doc/src/maintenance/compaction.rst
@@ -40,16 +40,16 @@ Database compaction compresses the database file by removing unused file
 sections created during updates. Old documents revisions are replaced with
 small amount of metadata called `tombstone` which are used for conflicts
 resolution during replication. The number of stored revisions
-(and their `tombstones`) can be configured by using the :http:get:`_revs_limit
+(and their `tombstones`) can be configured by using the :get:`_revs_limit
 </{db}/_revs_limit>` URL endpoint.
 
 Compaction is manually triggered operation per database and runs as a background
 task. To start it for specific database there is need to send HTTP
-:http:post:`/{db}/_compact` sub-resource of the target database::
+:post:`/{db}/_compact` sub-resource of the target database::
 
   curl -H "Content-Type: application/json" -X POST http://localhost:5984/my_db/_compact
 
-On success, HTTP status :http:statuscode:`202` is returned immediately:
+On success, HTTP status :statuscode:`202` is returned immediately:
 
 .. code-block:: http
 
@@ -65,9 +65,9 @@ On success, HTTP status :http:statuscode:`202` is returned immediately:
   {"ok":true}
 
 Although the request body is not used you must still specify
-:http:header:`Content-Type` header with :mimetype:`application/json` value
+:header:`Content-Type` header with :mimetype:`application/json` value
 for the request. If you don't, you will be aware about with HTTP status
-:http:statuscode:`415` response:
+:statuscode:`415` response:
 
 .. code-block:: http
 
@@ -111,7 +111,7 @@ information about it via :ref:`database information resource <api/db>`::
 
 Note that ``compaction_running`` field is ``true`` indicating that compaction
 is actually running. To track the compaction progress you may query the
-:http:get:`_active_tasks </_active_tasks>` resource::
+:get:`_active_tasks </_active_tasks>` resource::
 
   curl http://localhost:5984/my_db
 
@@ -145,7 +145,7 @@ Views Compaction
 
 `Views` are also need compaction like databases, unlike databases views
 are compacted by groups per `design document`. To start their compaction there
-is need to send HTTP :http:post:`/{db}/_compact/{ddoc}` request::
+is need to send HTTP :post:`/{db}/_compact/{ddoc}` request::
 
   curl -H "Content-Type: application/json" -X POST http://localhost:5984/dbname/_compact/designname
 
@@ -154,7 +154,7 @@ is need to send HTTP :http:post:`/{db}/_compact/{ddoc}` request::
   {"ok":true}
 
 This compacts the view index from the current version of the specified design
-document. The HTTP response code is :http:statuscode:`202`
+document. The HTTP response code is :statuscode:`202`
 (like :ref:`compaction for databases <compact/db>`) and a compaction background
 task will be created.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/maintenance/performance.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/maintenance/performance.rst b/share/doc/src/maintenance/performance.rst
index 918b1cf..9495cb1 100644
--- a/share/doc/src/maintenance/performance.rst
+++ b/share/doc/src/maintenance/performance.rst
@@ -10,8 +10,6 @@
 .. License for the specific language governing permissions and limitations under
 .. the License.
 
-.. default-domain:: http
-
 
 .. _performance:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/query-server/erlang.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/query-server/erlang.rst b/share/doc/src/query-server/erlang.rst
index 21f2399..165a341 100644
--- a/share/doc/src/query-server/erlang.rst
+++ b/share/doc/src/query-server/erlang.rst
@@ -10,6 +10,7 @@
 .. License for the specific language governing permissions and limitations under
 .. the License.
 
+.. default-domain:: js
 
 .. _query-server/erlang:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/replication/conflicts.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/conflicts.rst b/share/doc/src/replication/conflicts.rst
index 354c286..2d01a8c 100644
--- a/share/doc/src/replication/conflicts.rst
+++ b/share/doc/src/replication/conflicts.rst
@@ -109,10 +109,10 @@ Conflict avoidance
 ==================
 
 When working on a single node, CouchDB will avoid creating conflicting revisions
-by returning a :http:statuscode:`409` error. This is because, when you
+by returning a :statuscode:`409` error. This is because, when you
 PUT a new version of a document, you must give the ``_rev`` of the previous
 version. If that ``_rev`` has already been superseded, the update is rejected
-with a  :http:statuscode:`409` response.
+with a  :statuscode:`409` response.
 
 So imagine two users on the same node are fetching Bob's business card, updating
 it concurrently, and writing it back:
@@ -238,7 +238,7 @@ arbitrarily large.
 Working with conflicting documents
 ==================================
 
-The basic :http:get:`/{doc}/{docid}` operation will not show you any
+The basic :get:`/{doc}/{docid}` operation will not show you any
 information about conflicts. You see only the deterministically-chosen winner,
 and get no indication as to whether other conflicting revisions exist or not:
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5522488e/share/doc/src/replication/protocol.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/replication/protocol.rst b/share/doc/src/replication/protocol.rst
index 3aae5c1..10ba243 100644
--- a/share/doc/src/replication/protocol.rst
+++ b/share/doc/src/replication/protocol.rst
@@ -151,26 +151,26 @@ Optimisations
 API Reference
 -------------
 
-- :http:head:`/{db}` -- Check Database existence
-- :http:post:`/{db}/_ensure_full_commit` -- Ensure that all changes are stored
+- :head:`/{db}` -- Check Database existence
+- :post:`/{db}/_ensure_full_commit` -- Ensure that all changes are stored
   on disk
-- :http:get:`/{db}/_local/{id}` -- Read the last Checkpoint
-- :http:put:`/{db}/_local/{id}` -- Save a new Checkpoint
+- :get:`/{db}/_local/{id}` -- Read the last Checkpoint
+- :put:`/{db}/_local/{id}` -- Save a new Checkpoint
 
 Push Only
 ~~~~~~~~~
 
-- :http:put:`/{db}` -- Create Target if it not exists and option was provided
-- :http:post:`/{db}/_revs_diff` -- Locate Revisions that are not known to the
+- :put:`/{db}` -- Create Target if it not exists and option was provided
+- :post:`/{db}/_revs_diff` -- Locate Revisions that are not known to the
   Target
-- :http:post:`/{db}/_bulk_docs` -- Upload Revisions to the Target
-- :http:put:`/{db}/{docid}`?new_edits=false -- Upload a single Document with
+- :post:`/{db}/_bulk_docs` -- Upload Revisions to the Target
+- :put:`/{db}/{docid}`?new_edits=false -- Upload a single Document with
   attachments to the Target
 
 Pull Only
 ~~~~~~~~~
 
-- :http:get:`/{db}/_changes` -- Locate changes since on Source the last pull.
+- :get:`/{db}/_changes` -- Locate changes since on Source the last pull.
   The request uses next query parameters:
 
   - ``style=all_docs``
@@ -179,7 +179,7 @@ Pull Only
   - ``limit=limit``
   - ``heartbeat=heartbeat``
 
-- :http:get:`/{db}/{docid}` -- Retrieve a single Document from Source with attachments.
+- :get:`/{db}/{docid}` -- Retrieve a single Document from Source with attachments.
   The request uses next query parameters:
 
   - ``open_revs=revid`` - where ``revid`` is the actual Document Revision at the


Mime
View raw message