summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shorin <kxepal@apache.org>2013-10-03 20:16:53 +0400
committerAlexander Shorin <kxepal@apache.org>2013-10-03 20:18:30 +0400
commit97dffb0d648b4e189078b66f9e6ed6403dc75fc9 (patch)
treed5e5088c41ea9ac630e5227e09b8c1494e48c25a
parentc1982716026951ba15f0df09c2cfa8501ed89a50 (diff)
downloadcouchdb-97dffb0d648b4e189078b66f9e6ed6403dc75fc9.tar.gz
Fix build warnings.
-rw-r--r--share/doc/src/experimental.rst8
-rw-r--r--share/doc/src/whatsnew/1.5.rst10
2 files changed, 7 insertions, 11 deletions
diff --git a/share/doc/src/experimental.rst b/share/doc/src/experimental.rst
index d835e512c..3157f534d 100644
--- a/share/doc/src/experimental.rst
+++ b/share/doc/src/experimental.rst
@@ -38,16 +38,12 @@ Setup
You will need to install Node.JS version 0.10.0 or later. See `Node.JS
Downloads <http://nodejs.org/download/>`_ for options.
-1. Install the `couchjs-node` binary. Either from the CouchDB sources:
-
-.. code-block:: shell
+1. Install the `couchjs-node` binary. Either from the CouchDB sources::
cd src/couchjs-node
npm link
-Or via NPM:
-
-.. code-block:: shell
+Or via NPM::
npm install -g couchjs
diff --git a/share/doc/src/whatsnew/1.5.rst b/share/doc/src/whatsnew/1.5.rst
index 7b052dcdd..b5700db92 100644
--- a/share/doc/src/whatsnew/1.5.rst
+++ b/share/doc/src/whatsnew/1.5.rst
@@ -34,17 +34,17 @@ Version 1.5.0
content from other sources have been merged, and the index page
has been rebuilt to make the docs much more accessible.
:commit:`54813a7`
-* :issue: `1888` Fixed an issue where admin users would be restricted by
+* :issue:`1888` Fixed an issue where admin users would be restricted by
the `public_fields` feature.
-* Fixed an issue with the JavaScript CLI test runner. :commit: `be76882`,
- :commit: `be76882`
+* Fixed an issue with the JavaScript CLI test runner. :commit:`be76882`,
+ :commit:`be76882`
* A new administration UI, codenamed Fauxton, has been included as an
experimental preview. It can be accessed at ``/_utils/fauxton/``. There
are too many improvements here to list them all. We are looking for
feedback from the community on this preview release.
-* :issue: `1867` An experimental plugin feature has been added. See
+* :issue:`1867` An experimental plugin feature has been added. See
`src/couch_plugin/README.md` for details. We invite the community to
test and report any findings.
-* :issue: `1894` An experimental Node.js-based query server runtime
+* :issue:`1894` An experimental Node.js-based query server runtime
has been added. See :ref:`experimental` for details. We invite the
community to test and report any findings.