documentation commit: updated refs/heads/master to d40dcf1

2016-09-08 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master f9e06ed44 -> d40dcf11c


More Mac OS X install updates


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

Branch: refs/heads/master
Commit: d40dcf11c3113aaeb21f970324c1bf8649397a5c
Parents: f9e06ed
Author: Joan Touzet 
Authored: Fri Sep 9 02:52:17 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:52:17 2016 -0400

--
 src/install/mac.rst  | 102 +++---
 src/install/unix.rst |  26 ++--
 2 files changed, 28 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d40dcf11/src/install/mac.rst
--
diff --git a/src/install/mac.rst b/src/install/mac.rst
index c8af2c1..7f9f822 100644
--- a/src/install/mac.rst
+++ b/src/install/mac.rst
@@ -36,74 +36,20 @@ That's all, now CouchDB is installed on your Mac:
 
 #. Run Apache CouchDB application
 #. `Open up Fauxton`_, the CouchDB admin interface
+#. Verify the install by clicking on `Verify`, then `Verify Installation`.
 #. Time to Relax!
 
 .. _Open up Fauxton: http://localhost:5984/_utils
 
 .. _install/mac/homebrew:
 
-Installation with HomeBrew
+Installation with Homebrew
 ==
 
-You can install the build tools by running::
+The `Homebrew`_ build of CouchDB 2.0 is still in development. Check back often
+for updates.
 
-open /Applications/Installers/Xcode\ Tools/XcodeTools.mpkg
-
-To build CouchDB from source on Mac OS X, you will need to install
-the Command Line Tools::
-
-xcode-select --install
-
-You will need `Homebrew`_ installed to use the `brew` command. To install the
-other :ref:`dependencies ` run next commands::
-
-brew install autoconf autoconf-archive automake libtool \
-erlang icu4c spidermonkey curl pkg-config
-
-Now it's time to brew CouchDB::
-
-brew install couchdb
-
-The above Erlang install will use the bottled (pre-compiled) version if you 
are:
-using `/usr/local` for `homebrew`, and on 10.6 or 10.7. If you're not on one of
-these, `homebrew` will build from source, so consider doing::
-
-brew install erlang --no-docs
-
-to trim down compilation time.
-
-If you're hacking on CouchDB, and we hope you will, you may try the current
-git-based master (head) branch, or the next development release using this
-``couchdb`` recipe, using either ``--head`` or ``--devel`` options 
respectively.
-This will allow quick installation of the future release branch when it becomes
-active. If you're not sure if you need this, then you probably don't.
-In both cases we assume you are comfortable identifying bugs, and handling any
-potential upgrades between commits to the codebase. ::
-
-brew install [--devel|--head] couchdb
-
-.. note::
-OS X Lion might hang on the final brew.
-See the thread at https://github.com/mxcl/homebrew/issues/7024 it seems in
-most cases to be resolved by breaking out with ``CTRL-C`` and then 
repeating
-with ``brew install -v couchdb``.
-
-If you wish to have CouchDB run as a daemon then, set up the account,
-using the "User & Groups" preference pane:
-
-- Create a standard user `couchdb` with home directory as
-  `/usr/local/var/lib/couchdb`
-
-- Create a group called `couchdb` and add yourself, the `couchdb` user, and any
-  others you want to be able to edit config or db files directly to it.
-  Use the `advanced` group options to ensure the internal name is also 
correctly
-  called `couchdb`.
-
-Some versions of Mac OS X ship a problematic OpenSSL library. If you're
-experiencing troubles with CouchDB crashing intermittently with a segmentation
-fault or a bus error, you will need to install your own version of OpenSSL.
-
-.. _Homebrew: http://mxcl.github.com/homebrew/
+.. _Homebrew: http://brew.sh/
 
 Running as a Daemon
 ---
@@ -121,41 +67,3 @@ Naturally, you can configure launchd or other init daemons 
to
 launch CouchDB and keep it running using standard configuration files.
 
 Consult your system documentation for more information.
-
-.. _install/mac/macports:
-
-Installation from MacPorts
-==
-
-To install CouchDB using MacPorts you have 2 package choices:
-
-- ``couchdb`` - the latest release version
-- ``couchdb-devel`` - updated every few weeks with the latest from the master
-  branch
-
-::
-
-$ sudo port install couchdb
-
-should be enough. MacPorts takes care of installing all necessary dependencies.
-If you have already installed some of the CouchDB dependencies

documentation commit: updated refs/heads/master to f9e06ed

2016-09-08 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 669a7d354 -> f9e06ed44


fix syntax and linter errors


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

Branch: refs/heads/master
Commit: f9e06ed44996523498d63aa1dbcda7d3c0e26a89
Parents: 669a7d3
Author: Joan Touzet 
Authored: Fri Sep 9 02:41:59 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:41:59 2016 -0400

--
 src/install/unix.rst | 42 ++
 1 file changed, 18 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f9e06ed4/src/install/unix.rst
--
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 208010a..e76efd8 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -45,8 +45,8 @@ It is recommended that you install Erlang OTP R16B03-1 or 
above where possible.
 You will only need libcurl if you plan to run the JavaScript test suite. And
 help2man is only need if you plan on installing the CouchDB man pages.
 Python and Sphinx are only required for building the online documentation.
-Documentation build can be disabled by adding the `--disable-docs` flag to
-the `configure` script.
+Documentation build can be disabled by adding the ``--disable-docs`` flag to
+the ``configure`` script.
 
 .. seealso::
 
@@ -80,13 +80,14 @@ distributions, it's recommended to use a more recent 
js-devel-1.8.5.
 Mac OS X
 
 
-Follow :ref:`install/mac/homebrew` reference till `brew install couchdb` step.
+Follow :ref:`install/mac/homebrew` reference till ``brew install couchdb``
+step.
 
 FreeBSD
 ---
 
-FreeBSD requires the use of GNU Make. Where `make` is specified in this
-documentation, substitute `gmake`.
+FreeBSD requires the use of GNU Make. Where ``make`` is specified in this
+documentation, substitute ``gmake``.
 
 You can install this by running::
 
@@ -99,7 +100,7 @@ Once you have satisfied the dependencies you should run::
 
 ./configure
 
-If you wish to customize the installation, pass `--help` to this script.
+If you wish to customize the installation, pass ``--help`` to this script.
 
 If everything was successful you should see the following message::
 
@@ -107,19 +108,11 @@ If everything was successful you should see the following 
message::
 
 Relax.
 
-To install CouchDB you should run::
-
-make && sudo make install
-
-You only need to use `sudo` if you're installing into a system directory.
-
-Try `gmake` if `make` is giving you any problems.
-
 To build CouchDB you should run::
 
 make release
 
-Try `gmake` if `make` is giving you any problems.
+Try ``gmake`` if ``make`` is giving you any problems.
 
 If everything was successful you should see the following message::
 
@@ -134,9 +127,10 @@ Relax.
 User Registration and Security
 ==
 
-For OS X, in the steps below, substitute `/Users/couchdb` for `/home/couchdb`.
+For OS X, in the steps below, substitute ``/Users/couchdb`` for 
+``/home/couchdb``.
 
-You should create a special `couchdb` user for CouchDB.
+You should create a special ``couchdb`` user for CouchDB.
 
 On many Unix-like systems you can run::
 
@@ -156,13 +150,13 @@ You must make sure that:
 
 * The user has a working POSIX shell
 * The user's home directory is wherever you have copied the release.
-  As a recommendation, copy the `rel\couchdb` directory into
-  `/home/couchdb` or `/Users/couchdb`.
+  As a recommendation, copy the ``rel/couchdb`` directory into
+  ``/home/couchdb`` or ``/Users/couchdb``.
 
 You can test this by:
 
-* Trying to log in as the `couchdb` user
-* Running `pwd` and checking the present working directory
+* Trying to log in as the ``couchdb`` user
+* Running ``pwd`` and checking the present working directory
 
 Copy the built couchdb release to the new user's home directory::
 
@@ -170,7 +164,7 @@ Copy the built couchdb release to the new user's home 
directory::
 
 Change the ownership of the CouchDB directories by running::
 
-chown -R couchdb:couchdb /home/couchdb/couchdb 
+chown -R couchdb:couchdb /home/couchdb/couchdb
 
 Change the permission of the CouchDB directories by running::
 
@@ -187,7 +181,8 @@ You can start the CouchDB server by running::
 
 sudo -i -u couchdb couchdb/bin/couchdb
 
-This uses the `sudo` command to run the `couchdb` command as the `couchdb` 
user.
+This uses the ``sudo`` command to run the ``couchdb`` command as the
+``couchdb`` user.
 
 When CouchDB starts it should eventually display the following message::
 
@

couchdb commit: updated refs/heads/master to aae4ff7

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master caa308f91 -> aae4ff745


Pull verify URL in from docs repo


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

Branch: refs/heads/master
Commit: aae4ff745dc31b96b7130b4e0b17026dec802937
Parents: caa308f
Author: Joan Touzet 
Authored: Fri Sep 9 02:34:08 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:34:08 2016 -0400

--
 INSTALL.Unix.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/aae4ff74/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 9ff43bf..2b93c97 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -209,8 +209,9 @@ To check that everything has worked, point your web browser 
to:
 
 http://127.0.0.1:5984/_utils/
 
-From here you should click "Verify" then "Verify Installation" to
-validate CouchDB is working as expected.
+From here you should verify your installation by pointing your web browser to:
+
+http://localhost:5984/_utils/verify_install.html
 
 ## Running as a Daemon

documentation commit: updated refs/heads/master to 669a7d3

2016-09-08 Thread wohali 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master d0c36a7d2 -> 669a7d354


Port INSTALL.UNIX changes over from main repo


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

Branch: refs/heads/master
Commit: 669a7d3545156a5164e85ccb842d8c0a460fa990
Parents: d0c36a7
Author: Joan Touzet 
Authored: Fri Sep 9 02:32:51 2016 -0400
Committer: Joan Touzet 
Committed: Fri Sep 9 02:33:04 2016 -0400

--
 src/install/mac.rst  |  62 +--
 src/install/unix.rst | 187 --
 2 files changed, 98 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/669a7d35/src/install/mac.rst
--
diff --git a/src/install/mac.rst b/src/install/mac.rst
index de786c8..c8af2c1 100644
--- a/src/install/mac.rst
+++ b/src/install/mac.rst
@@ -35,10 +35,10 @@ application. Just follow the below instructions:
 That's all, now CouchDB is installed on your Mac:
 
 #. Run Apache CouchDB application
-#. `Open up Futon`_, the CouchDB admin interface
+#. `Open up Fauxton`_, the CouchDB admin interface
 #. Time to Relax!
 
-.. _Open up Futon: http://localhost:5984/_utils
+.. _Open up Fauxton: http://localhost:5984/_utils
 
 .. _install/mac/homebrew:
 
@@ -49,26 +49,16 @@ You can install the build tools by running::
 
 open /Applications/Installers/Xcode\ Tools/XcodeTools.mpkg
 
-You will need `Homebrew`_ installed to use the `brew` command. To install the
-other :ref:`dependencies ` run next commands::
-
-brew install autoconf
-brew install autoconf-archive
-brew install automake
-brew install libtool
-brew install erlang
-brew install icu4c
-brew install spidermonkey
-brew install curl
+To build CouchDB from source on Mac OS X, you will need to install
+the Command Line Tools::
 
-You may want to link ICU so that CouchDB can find the header files
-automatically::
+xcode-select --install
 
-brew link icu4c
-
-The same is true for recent versions of Erlang::
+You will need `Homebrew`_ installed to use the `brew` command. To install the
+other :ref:`dependencies ` run next commands::
 
-brew link erlang
+brew install autoconf autoconf-archive automake libtool \
+erlang icu4c spidermonkey curl pkg-config
 
 Now it's time to brew CouchDB::
 
@@ -118,33 +108,17 @@ fault or a bus error, you will need to install your own 
version of OpenSSL.
 Running as a Daemon
 ---
 
-You can use the `launchctl` command to control the CouchDB daemon.
-
-You can load the configuration by running::
-
-sudo launchctl load \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+CouchDB no longer ships with any daemonization scripts.
 
-You can stop the CouchDB daemon by running::
-
-sudo launchctl unload \
- /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
-
-You can start CouchDB by running::
-
-sudo launchctl start org.apache.couchdb
-
-You can restart CouchDB by running::
-
-sudo launchctl stop org.apache.couchdb
-
-You can edit the launchd configuration by running::
-
-open /usr/local/Library/LaunchDaemons/org.apache.couchdb.plist
+You can use the `launchctl` command to control the CouchDB daemon.
 
-To start the daemon on boot, copy the configuration file to::
+The couchdb team recommends `runit `_ to
+run CouchDB persistently and reliably. Configuration of runit is
+straightforward; if you have questions, reach out to the CouchDB
+user mailing list.
 
-/Library/LaunchDaemons
+Naturally, you can configure launchd or other init daemons to
+launch CouchDB and keep it running using standard configuration files.
 
 Consult your system documentation for more information.
 
@@ -176,7 +150,7 @@ the launchd configuration which comes with the project, 
with this command::
 
 $ sudo port load couchdb
 
-and it should be up and accessible via Futon at http://127.0.0.1:5984/_utils.
+and it should be up and accessible via Fauxton at http://127.0.0.1:5984/_utils.
 It should also be restarted automatically after reboot.
 
 Updating the ports collection. The collection of port files has to be updated

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/669a7d35/src/install/unix.rst
--
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 028d3d2..208010a 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -16,9 +16,10 @@
 Installation on Unix-l

couchdb commit: updated refs/heads/master to caa308f

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 87139518c -> caa308f91


Further OSX specific updates to install doc


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

Branch: refs/heads/master
Commit: caa308f91cac6bfd6026d64fe1bf27482f55b513
Parents: 8713951
Author: Joan Touzet 
Authored: Thu Sep 8 23:53:18 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:53:18 2016 -0400

--
 INSTALL.Unix.md | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/caa308f9/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index bbadcbb..9ff43bf 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -141,6 +141,8 @@ Relax.
 
 ## User Registration
 
+For OS X, in the steps below, substitute `/Users/couchdb` for `/home/couchdb`.
+
 You should create a special `couchdb` user for CouchDB.
 
 On many Unix-like systems you can run:
@@ -151,9 +153,11 @@ On many Unix-like systems you can run:
 --group --gecos \
 "CouchDB Administrator" couchdb
 
-On Mac OS X you can use the Workgroup Manager to create users. Links to
-download the Workgroup Manager vary by OS version; search Apple's support
-site to find the download appropriate for your system.
+On Mac OS X you can use the Workgroup Manager to create users up to version
+10.9, and dscl or sysadminctl after version 10.9. Search Apple's support
+site to find the documentation appropriate for your system. As of recent
+versions of OS X, this functionality is also included in Server.app,
+available through the App Store only as part of OS X Server.
 
 You must make sure that:
 
@@ -161,7 +165,7 @@ You must make sure that:
 
 * The user's home directory is wherever you have copied the release.
   As a recommendation, copy the `rel\couchdb` directory into
-  `/home/couchdb`.
+  `/home/couchdb` or `/Users/couchdb`.
 
 You can test this by:
 
@@ -175,7 +179,7 @@ Copy the built couchdb release to the new user's home 
directory:
 
 Change the ownership of the CouchDB directories by running:
 
-chown -R couchdb:couchdb /home/couchdb/couchdb
+chown -R couchdb:couchdb /home/couchdb/couchdb 
 
 Change the permission of the CouchDB directories by running:

couchdb commit: updated refs/heads/master to 8713951

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 248c46593 -> 87139518c


Remove reference to /usr/local in UNIX install instructions


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

Branch: refs/heads/master
Commit: 87139518cfd9689099d608872895af56891997eb
Parents: 248c465
Author: Joan Touzet 
Authored: Thu Sep 8 23:23:25 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:23:25 2016 -0400

--
 INSTALL.Unix.md | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/87139518/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 65f2c0b..bbadcbb 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -116,9 +116,6 @@ Once you have satisfied the dependencies you should run:
 
 ./configure
 
-This script will configure CouchDB to be installed into `/usr/local`
-by default.
-
 If you wish to customize the installation, pass `--help` to this
 script.

couchdb commit: updated refs/heads/master to 248c465

2016-09-08 Thread wohali 
Repository: couchdb
Updated Branches:
  refs/heads/master 0715db5e1 -> 248c46593


Update UNIX install instructions


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

Branch: refs/heads/master
Commit: 248c4659328e7d228b3df5001d06f61f8ca5c923
Parents: 0715db5
Author: Joan Touzet 
Authored: Thu Sep 8 23:19:13 2016 -0400
Committer: Joan Touzet 
Committed: Thu Sep 8 23:19:13 2016 -0400

--
 INSTALL.Unix.md | 188 ++-
 1 file changed, 49 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/248c4659/INSTALL.Unix.md
--
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 643dddb..65f2c0b 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -1,5 +1,4 @@
-Apache CouchDB INSTALL.Unix
-==
+# Apache CouchDB INSTALL.Unix
 
 A high-level guide to Unix-like systems, inc. Mac OS X and Ubuntu.
 
@@ -17,8 +16,7 @@ update their archives. If you're running into trouble, be 
sure to
 check out the wiki. If you have any tips to share, please also update
 the wiki so that others can benefit from your experience.
 
-Troubleshooting

+## Troubleshooting
 
 There is a troubleshooting guide:
 
@@ -34,8 +32,7 @@ There are collection of friendly mailing lists:
 
 Please work through these in order if you experience any problems.
 
-Dependencies
-
+## Dependencies
 
 You should have the following installed:
 
@@ -54,10 +51,14 @@ It is recommended that you install Erlang OTP R16B03-1 or 
above where
 possible.  You will only need libcurl if you plan to run the
 JavaScript test suite. And help2man is only need if you plan on
 installing the CouchDB man pages.  Python and Sphinx are only required
-for building the online documentation.
+for building the online documentation. Documentation build can be disabled
+by adding the `--disable-docs` flag to the `configure` script.
 
-Debian-based Systems
-
+For up to date instructions, please see:
+
+  https://cwiki.apache.org/confluence/display/COUCHDB/Installing+CouchDB
+
+### Debian-based Systems
 
 You can install the dependencies by running:
 
@@ -68,31 +69,16 @@ You can install the dependencies by running:
 Be sure to update the version numbers to match your system's available
 packages.
 
-For up to date instructions, please see:
-
-  http://wiki.apache.org/couchdb/Installing_on_Debian
-
-  http://wiki.apache.org/couchdb/Installing_on_Ubuntu
-
-Unfortunately, it seems that installing dependencies on Ubuntu is
-troublesome.
-
-RedHat-based (Fedora, Centos, RHEL) Systems
-~~~
+### RedHat-based (Fedora, Centos, RHEL) Systems
 
 You can install the dependencies by running:
 
 sudo yum install autoconf autoconf-archive automake \
 curl-devel erlang-asn1 erlang-erts erlang-eunit \
 erlang-os_mon erlang-xmerl help2man \
-js-devel libicu-devel libtool perl-Test-Harness
-
-While CouchDB builds against the default js-devel-1.7.0 included in
-some distributions, it's recommended to use a more recent
-js-devel-1.8.5.
+js-devel-1.8.5 libicu-devel libtool perl-Test-Harness
 
-Mac OS X
-
+### Mac OS X
 
 To build CouchDB from source on Mac OS X, you will need to install
 the Command Line Tools:
@@ -113,11 +99,9 @@ Learn more about Homebrew at:
 Some versions of Mac OS X ship a problematic OpenSSL library. If
 you're experiencing troubles with CouchDB crashing intermittently with
 a segmentation fault or a bus error, you will need to install your own
-version of OpenSSL. See the troubleshooting guide, mentioned above,
-for more information.
+version of OpenSSL. See the wiki, mentioned above, for more information.
 
-FreeBSD

+### FreeBSD
 
 FreeBSD requires the use of GNU Make. Where `make` is specified in this
 documentation, substitute `gmake`.
@@ -126,8 +110,7 @@ You can install this by running:
 
 pkg install gmake
 
-Installing
---
+## Installing
 
 Once you have satisfied the dependencies you should run:
 
@@ -145,43 +128,43 @@ If everything was successful you should see the following 
message:
 
 Relax.
 
-To install CouchDB you should run:
+To build CouchDB you should run:
 
-make && sudo make install
-
-You only need to use `sudo` if you're installing into a system directory.
+make release
 
 Try `gmake` if `make` is giving you any problems.
 
 If everything was successful you should see the following message:
 
-You have installed Apache CouchDB, time to relax.
+... done
+You can now copy the rel/couchdb di

couchdb commit: updated refs/heads/master to 0715db5

2016-09-08 Thread rnewson 
Repository: couchdb
Updated Branches:
  refs/heads/master ba5c948df -> 0715db5e1


pull fixes in dependencies

docs - remove references to temporary views
fabric - clarify error when all_or_nothing attempted


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

Branch: refs/heads/master
Commit: 0715db5e13e0a3574537d885d668449f19465a54
Parents: ba5c948
Author: Robert Newson 
Authored: Thu Sep 8 19:07:20 2016 +0100
Committer: Robert Newson 
Committed: Thu Sep 8 19:07:20 2016 +0100

--
 rebar.config.script | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0715db5e/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 95fbdf3..cece0f9 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -38,10 +38,10 @@ DepDescs = [
 {couch_stats,  "couch-stats",  
"7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
 {couch_peruser,"peruser",  
"4eea9571171a5b41d832da32204a1122a01f4b0e"},
 {couch_tests,   "erlang-tests",
"37b3bfeb4b1a48a592456e67991362e155ed81e0"},
-{docs, "documentation",
"968b874ea76d5ee71647f7e7ebba8b1bdbef2ac8", [raw]},
+{docs, "documentation",
"d0c36a7d277fc3e36caff4144a0bfb3f2a1ae6e9", [raw]},
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
-{fabric,   "fabric",   
"c7214fd2fef2fdbbf47964f6017c71ec8e8196ca"},
+{fabric,   "fabric",   
"f84750e3d31accf7bcadb0ba05249c23ce920521"},
 {fauxton,  "fauxton",  {tag, "v1.1.9"}, [raw]},
 {folsom,   "folsom",   
"a5c95dec18227c977029fbd3b638966d98f17003"},
 {global_changes,   "global-changes",   
"f6e4c5629a7d996d284e4489f1897c057823f846"},

documentation commit: updated refs/heads/master to d0c36a7

2016-09-08 Thread rnewson 
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 968b874ea -> d0c36a7d2


remove references to temporary views

refs COUCHDB-3120


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

Branch: refs/heads/master
Commit: d0c36a7d277fc3e36caff4144a0bfb3f2a1ae6e9
Parents: 968b874
Author: Will Holley 
Authored: Wed Sep 7 15:54:55 2016 +0100
Committer: Will Holley 
Committed: Wed Sep 7 17:02:17 2016 +0100

--
 src/api/database/index.rst  |  1 -
 src/api/database/security.rst   |  6 +--
 src/api/database/temp-views.rst | 80 
 src/config/http-handlers.rst|  7 
 src/intro/security.rst  |  2 -
 src/query-server/index.rst  |  3 +-
 src/whatsnew/2.0.rst|  2 +
 7 files changed, 6 insertions(+), 95 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d0c36a7d/src/api/database/index.rst
--
diff --git a/src/api/database/index.rst b/src/api/database/index.rst
index a09a75a..1846166 100644
--- a/src/api/database/index.rst
+++ b/src/api/database/index.rst
@@ -43,5 +43,4 @@ Where ``db`` is the name of any database.
 changes
 compact
 security
-temp-views
 misc

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d0c36a7d/src/api/database/security.rst
--
diff --git a/src/api/database/security.rst b/src/api/database/security.rst
index fc0315d..f34139a 100644
--- a/src/api/database/security.rst
+++ b/src/api/database/security.rst
@@ -30,9 +30,9 @@
 
 - ``admins``: they have all the privileges of ``members`` plus the
   privileges: write (and edit) design documents, add/remove database admins
-  and members, set the :ref:`database revisions limit `
-  and execute :ref:`temporary views ` against the
-  database. They can not create a database nor delete a database.
+  and members and set the :ref:`database revisions limit
+  `. They can not create a database nor delete a
+  database.
 
 Both ``members`` and ``admins`` objects are contains two array-typed
 fields:

http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d0c36a7d/src/api/database/temp-views.rst
--
diff --git a/src/api/database/temp-views.rst b/src/api/database/temp-views.rst
deleted file mode 100644
index ffabc00..000
--- a/src/api/database/temp-views.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-.. 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.
-
-.. _api/db/temp_view:
-
-==
-``/db/_temp_view``
-==
-
-.. http:post:: /{db}/_temp_view
-:synopsis: Executes a given view function for all documents and returns
-   the result
-
-Creates (and executes) a temporary view based on the view function
-supplied in the JSON request.
-
-The arguments also available to standard view requests also apply to
-temporary views, but the execution of the view may take some time as it
-relies on being executed at the time of the request. This means that for
-every temporary view you create, the entire database will be read
-one doc at a time and passed through the view function.
-
-This should not be used on production CouchDB instances, and is purely a
-convenience function for quick development testing. You should use a
-defined view if you want to achieve the best performance.
-
-See :ref:`api/ddoc/view` for more info.
-
-**Request**:
-
-.. code-block:: http
-
-POST /db/_temp_view?group=true HTTP/1.1
-Accept: application/json
-Content-Length: 92
-Content-Type: application/json
-Host: localhost:5984
-
-{
-"map": "function(doc) { if (doc.value) { emit(doc.value, null); } 
}",
-"reduce": "_count"
-}
-
-**Response**:
-
-.. code-block:: http
-
-HTTP/1.1 200 OK
-Cache-Control: must-revali

[2/2] fabric commit: updated refs/heads/master to f84750e

2016-09-08 Thread rnewson 
Merge remote-tracking branch 'will/all_or_nothing_error'


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

Branch: refs/heads/master
Commit: f84750e3d31accf7bcadb0ba05249c23ce920521
Parents: c7214fd a6cd3b2
Author: Robert Newson 
Authored: Thu Sep 8 19:05:24 2016 +0100
Committer: Robert Newson 
Committed: Thu Sep 8 19:05:24 2016 +0100

--
 src/fabric_doc_update.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] fabric commit: updated refs/heads/master to f84750e

2016-09-08 Thread rnewson 
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master c7214fd2f -> f84750e3d


clarify error when all_or_nothing attempted

change the error message so that it doesn't imply
that all_or_nothing is a feature that will be
implemented in the future.


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

Branch: refs/heads/master
Commit: a6cd3b21518a29af491c7174aa8c22d28b0119ee
Parents: 78eb096
Author: Will Holley 
Authored: Wed Sep 7 17:10:05 2016 +0100
Committer: Will Holley 
Committed: Wed Sep 7 17:12:50 2016 +0100

--
 src/fabric_doc_update.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/a6cd3b21/src/fabric_doc_update.erl
--
diff --git a/src/fabric_doc_update.erl b/src/fabric_doc_update.erl
index 2624c47..10e254f 100644
--- a/src/fabric_doc_update.erl
+++ b/src/fabric_doc_update.erl
@@ -207,7 +207,7 @@ validate_atomic_update(_DbName, AllDocs, true) ->
 % TODO actually perform the validation.  This requires some hackery, we 
need
 % to basically extract the prep_and_validate_updates function from couch_db
 % and only run that, without actually writing in case of a success.
-Error = {not_implemented, <<"all_or_nothing is not supported yet">>},
+Error = {not_implemented, <<"all_or_nothing is not supported">>},
 PreCommitFailures = lists:map(fun(#doc{id=Id, revs = {Pos,Revs}}) ->
 case Revs of [] -> RevId = <<>>; [RevId|_] -> ok end,
 {{Id, {Pos, RevId}}, Error}

couchdb commit: updated refs/heads/master to ba5c948

2016-09-08 Thread garren 
Repository: couchdb
Updated Branches:
  refs/heads/master 78148d85d -> ba5c948df


Upgrade Fauxton to 1.1.9


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

Branch: refs/heads/master
Commit: ba5c948dffdac9a8bf9fd13b3ef99007952fd6d1
Parents: 78148d8
Author: Garren Smith 
Authored: Thu Sep 8 19:11:04 2016 +0200
Committer: Garren Smith 
Committed: Thu Sep 8 19:11:04 2016 +0200

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ba5c948d/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index 00739e5..95fbdf3 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,7 +42,7 @@ DepDescs = [
 {ddoc_cache,   "ddoc-cache",   
"c762e90a33ce3cda19ef142dd1120f1087ecd876"},
 {ets_lru,  "ets-lru",  
"c05488c8b1d7ec1c3554a828e0c9bf2888932ed6"},
 {fabric,   "fabric",   
"c7214fd2fef2fdbbf47964f6017c71ec8e8196ca"},
-{fauxton,  "fauxton",  {tag, "v1.1.8"}, [raw]},
+{fauxton,  "fauxton",  {tag, "v1.1.9"}, [raw]},
 {folsom,   "folsom",   
"a5c95dec18227c977029fbd3b638966d98f17003"},
 {global_changes,   "global-changes",   
"f6e4c5629a7d996d284e4489f1897c057823f846"},
 {ibrowse,  "ibrowse",  
"4af2d408607874d124414ac45df1edbe3961d1cd"},

fauxton commit: updated refs/heads/master to 0fb3a19

2016-09-08 Thread garren 
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master eb48fdbe0 -> 0fb3a19e0
Updated Tags:  refs/tags/v1.1.9 [created] cb6737cc1


1.1.9


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

Branch: refs/heads/master
Commit: 0fb3a19e0d1ae6d037ee9018c625dfdfedd21662
Parents: eb48fdb
Author: Garren Smith 
Authored: Thu Sep 8 19:06:37 2016 +0200
Committer: Garren Smith 
Committed: Thu Sep 8 19:06:37 2016 +0200

--
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fb3a19e/package.json
--
diff --git a/package.json b/package.json
index f2af97d..7dfd465 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fauxton",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Fauxton is a modular CouchDB dashboard and Futon 
replacement.",
   "main": "./index.js",
   "directories": {

couchdb commit: updated refs/heads/master to 78148d8

2016-09-08 Thread rnewson 
Repository: couchdb
Updated Branches:
  refs/heads/master 933d49c58 -> 78148d85d


Add op_field term to fix special  case (mango)


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

Branch: refs/heads/master
Commit: 78148d85d0555da83e437eb636382799f92bcbe6
Parents: 933d49c
Author: Robert Newson 
Authored: Thu Sep 8 17:10:57 2016 +0100
Committer: Robert Newson 
Committed: Thu Sep 8 17:10:57 2016 +0100

--
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/78148d85/rebar.config.script
--
diff --git a/rebar.config.script b/rebar.config.script
index e7b707c..00739e5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -49,7 +49,7 @@ DepDescs = [
 {ioq,  "ioq",  
"ba99ec70d31cf82fe4868ab4bb92b0978f4fe67f"},
 {jiffy,"jiffy",
"d3c00e19d8fa20c21758402231247602190988d3"},
 {khash,"khash",
"7c6a9cd9776b5c6f063ccafedfa984b00877b019"},
-{mango,"mango",
"01252f971bef0c8da1d78bf5a7b506b71926ce1b"},
+{mango,"mango",
"1a421567886a039628e3ec66d44a515ec324d26d"},
 {mem3, "mem3", 
"252467cb4a27637090b5f9006483f5b7ab551699"},
 {mochiweb, "mochiweb", 
"bd6ae7cbb371666a1f68115056f7b30d13765782"},
 {oauth,"oauth",
"099057a98e41f3aff91e77e3cf496d6c6fd901df"},

couchdb commit: updated refs/heads/master to 933d49c

2016-09-08 Thread rnewson 
Repository: couchdb
Updated Branches:
  refs/heads/master 43f4873e6 -> 933d49c58


beginnings of the known issues doc


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

Branch: refs/heads/master
Commit: 933d49c58923921578ec13f58e0999573b083dbb
Parents: 43f4873
Author: Robert Newson 
Authored: Thu Sep 8 13:44:15 2016 +0100
Committer: Robert Newson 
Committed: Thu Sep 8 13:44:15 2016 +0100

--
 KNOWN_ISSUES | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/933d49c5/KNOWN_ISSUES
--
diff --git a/KNOWN_ISSUES b/KNOWN_ISSUES
new file mode 100644
index 000..4f517ee
--- /dev/null
+++ b/KNOWN_ISSUES
@@ -0,0 +1,14 @@
+* Replicator
+
+The replicator (whether invoked via _replicate or a document stored in
+the _replicator database) understands two kinds of source and target;
+
+1. A url (e.g, "https://foo:b...@foo.com/db1";), called a "remote" 
source/target.
+2. a database name (e.g, "db1"), called a "local" source/target.
+
+Whenever the latter type is used, this refers to a local unclustered
+database, not a clustered one.
+
+In a future release we hope to support "local" source/target to
+clustered databases but for now you recommend always using the url
+format for source and target.