You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by GitBox <gi...@apache.org> on 2017/10/19 23:12:55 UTC

[GitHub] wohali closed pull request #179: Minor changes

wohali closed pull request #179: Minor changes
URL: https://github.com/apache/couchdb-documentation/pull/179
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/api/database/changes.rst b/src/api/database/changes.rst
index 2a740f1..d48a9a6 100644
--- a/src/api/database/changes.rst
+++ b/src/api/database/changes.rst
@@ -684,8 +684,7 @@ amount of duplicated code.
 .. warning::
     While :ref:`map functions <mapfun>` doesn't process the design documents,
     using ``_view`` filter forces them to do this. You need to be sure, that
-    they are ready to handle documents with *alien* structure without panic
-    crush.
+    they are ready to handle documents with *alien* structure without panic.
 
 .. note::
     Using ``_view`` filter doesn't queries the view index files, so you cannot
diff --git a/src/cluster/setup.rst b/src/cluster/setup.rst
index 4cb6570..f8e238b 100644
--- a/src/cluster/setup.rst
+++ b/src/cluster/setup.rst
@@ -24,7 +24,7 @@ Firewall
 
 If you do not have a firewall between your servers, then you can skip this.
 
-CouchDB in cluster mode uses the port ``5984`` just as standalone, but is also
+CouchDB in cluster mode uses the port ``5984`` just as standalone, but it also
 uses ``5986`` for node-local APIs.
 
 Erlang uses TCP port ``4369`` (EPMD) to find other nodes, so all servers must be
diff --git a/src/config/http.rst b/src/config/http.rst
index 7016317..f38a31f 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -32,7 +32,7 @@ HTTP Server Options
             [httpd]
             allow_jsonp = false
 
-        .. _JSONP: http://www.json-p.org/
+        .. _JSONP: https://en.wikipedia.org/wiki/JSONP
 
     .. config:option:: bind_address :: Listen IP address
 
diff --git a/src/config/logging.rst b/src/config/logging.rst
index e6c83c8..8aa9c35 100644
--- a/src/config/logging.rst
+++ b/src/config/logging.rst
@@ -90,7 +90,7 @@ Logging options
         - ``warning`` or ``warn``: Warning messages are alerts about edge situations that
           may lead to errors. For instance, compaction daemon alerts about low
           or insufficient disk space at this level.
-        - ``error`` or ``err``: Error level includes only things that going wrong, crush
+        - ``error`` or ``err``: Error level includes only things that go wrong, like crash
           reports and HTTP error responses (5xx codes).
         - ``critical`` or ``crit``
         - ``alert``


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services