Merge lp:~jderose/ubuntu/trusty/couchdb/1.5.0 into lp:ubuntu/trusty/couchdb

[Jason Gerard DeRose]

For background, please see this bug:
https://bugs.launchpad.net/ubuntu/+source/couchdb/+bug/1254371

Currently CouchDB 1.4.0 wont build on Trusty (same is true with CouchDB 1.5.0 on Trusty). The fix is to add a Build-Depends on `install-info`. Somehow this was getting pulled in on Raring (perhaps because `build-essential` depended on it), but isn't on Trusty.

However, after reviewing the actual content in the `couchdb` info page, I think it's best to neither build nor install this info page as it has the exact same content as the `couchdb` man page.

To aid the review, here's the result of `bzr diff debian/ -r 73..`:

=== modified file 'debian/changelog'
--- debian/changelog 2013-08-28 16:28:32 +0000
+++ debian/changelog 2013-11-30 20:52:48 +0000
@@ -1,3 +1,17 @@
+couchdb (1.5.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release (LP: #1254371)
+ * Don't include `couchdb` info page in `couchdb-bin` binary package as it
+ provides no meaningful benefit over the `couchdb` man page (note this change
+ means we don't need to add a Build-Depends on `install-info` for Trusty)
+ * Remove Build-Depends: texlive-latex-base, texlive-latex-recommended,
+ texlive-latex-extra, texlive-fonts-recommended, texinfo (as documentation
+ thus produced doesn't get included in binary the packages anyway)
+ * debian/rules: don't call ./configure with --enable-strictness as we dropped
+ Build-Depends on `texlive-*`, `texinfo`, plus didn't add `install-info`
+
+ -- Jason Gerard DeRose <email address hidden> Sat, 30 Nov 2013 13:52:40 -0700
+
 couchdb (1.4.0-0ubuntu1) saucy; urgency=low

   * New upstream release (LP: #1212481)

=== modified file 'debian/control'
--- debian/control 2013-08-28 16:28:32 +0000
+++ debian/control 2013-11-24 20:37:16 +0000
@@ -17,11 +17,6 @@
                libicu-dev,
                libmozjs185-dev,
                python-sphinx (>= 1.1.3),
- texlive-latex-base,
- texlive-latex-recommended,
- texlive-latex-extra,
- texlive-fonts-recommended,
- texinfo,
 Homepage: http://couchdb.apache.org/

 Package: couchdb-common

=== modified file 'debian/couchdb-bin.install'
--- debian/couchdb-bin.install 2013-08-28 16:28:32 +0000
+++ debian/couchdb-bin.install 2013-11-24 03:49:29 +0000
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin
 debian/tmp/usr/lib
 debian/tmp/usr/share/man
-debian/tmp/usr/share/info
 debian/tmp/etc/couchdb/default.ini
 debian/tmp/etc/couchdb/default.d

=== modified file 'debian/rules'
--- debian/rules 2013-08-28 16:28:32 +0000
+++ debian/rules 2013-11-24 20:36:04 +0000
@@ -4,7 +4,7 @@
  dh $@

 override_dh_auto_configure:
- dh_auto_configure -- --enable-strictness --disable-init
+ dh_auto_configure -- --disable-init

 override_dh_auto_install:
  dh_auto_install

[lp:~jderose/ubuntu/trusty/couchdb/1.5.0]

83. By Jason Gerard DeRose on 2013-11-30

Fix debian/changelog typo: 'binary the packages' => 'the binary packages'

[Dave Cottlehuber (skunkwerks)]

LGTM overall, will take a while to digest details.

The official tarball (which I assume the upstream debian package is built from) has documentation and manpages etc prebuilt.

This means none of the python, texlive*, texinfo packages are needed either at build (nor at runtime).

I'll put a couple further actionable comments into separate review below.

[Dave Cottlehuber (skunkwerks)]

Please add vendor information into default.ini.

See my comment on https://code.launchpad.net/~yolanda.robla/ubuntu/trusty/couchdb/add_distribution/+merge/195788, included here for simplicity:

Great idea -- luckily CouchDB already provides functionality to do this without needing an erlang patch;

You should use the dict `vendor` option and store this in the default.ini file. There are name and version files specifically for that.

# $SOURCE/etc/couchdb/default.ini.tpl.in
[vendor]
name = Ubuntu
version = Trusty 14.04

Obviously you have a better idea of what these fields should be than me.

You should get something like this back after installing CouchDB:

GET / HTTP/1.1
Accept: application/json
Accept-Encoding: gzip, deflate, compress
Content-Type: application/json; charset=utf-8
Host: localhost:5984
User-Agent: HTTPie/0.8.0-dev

HTTP/1.1 200 OK
Cache-Control: must-revalidate
Content-Length: 145
Content-Type: application/json
Date: Sat, 30 Nov 2013 21:14:03 GMT
Server: CouchDB/1.5.0 (Erlang OTP/R16B02)

{
    "couchdb": "Welcome",
    "version": "1.5.0"
    "uuid": "24ca0e5e74a4e40356e498dcfb0575b1",
    "vendor": {
        "name": "Ubuntu",
        "version": "Trusty-14.04"
    },
}

The UUID entry is unique per couchdb installation, its shown here for completeness but shouldn't be part of the ubuntu package.

A gentle reminder to all reviewers, Apache CouchDB would love to hear more from downstream / packaging teams. We're here to help you help us!

review: Needs Fixing

[Dave Cottlehuber (skunkwerks)]

I put together an upstart script recently for couchdb; I found this:

    start on started networking and filesystem

was the thing that stopped the infamous respawn bug that has been present in debian packages. Would this be more appropriate than the simple runlevel check?

review: Needs Fixing

[Jason Gerard DeRose (jderose)]

Dave,

Thanks for the review! I didn't realize that was the intent of the "vendor" information (I thought it was to differentiate between say, rcouch, BigCouch, etc). I'll add that in ASAP.

As far as using the pre-built docs, I personally feel it's more correct to build the docs from their source during the package build. I recall getting dinged for using pre-built docs when I was trying to get pyskein into Debian. To do things the correct Debian way, all Sphinx docs should reference the common JavaScript in the `libjs-sphinxdoc` package, which means you need to build the docs from source so all the versions match up and whatnot. I've had good luck using dh_sphinxdoc for this[1], but I didn't get that working in time for the 1.4.0 package in Saucy. So thanks for reminding me that I still need to do this :)

As far as the Upstart script, I think your "start on" stanza is more correct than what I'm currently using, but as far as I know, my current Upstart script hasn't suffered from the infamous respawn bug. The reason is I'm not calling `couchdb` with the "-b -r 5" options the way the upstream init script does. Instead, I'm letting Upstart do all the process lifecycle management (including respawning if needed). Since switching to Upstart in couchdb 1.4.0-0ubuntu1, I've never encountered a situation where `sudo stop couchdb` didn't work correctly (including when removing or purging the `couchdb` package, something that still plagues the 1.2.0 package). Anyway, I'll incorporate your suggestion into the Upstart script.

Lastly, as far as packaging issues I'd like upstream to be aware of:

1) I'd like to see per-user CouchDB instances (rather than just the system-wide one) become a more official use case upstream; Ubuntu originally diverged from the Debian packaging because they needed to split things into the `couchdb` and `couchdb-bin` packages so desktopcouch could start per-user CouchDB instances without having a system-wide CouchDB instance needlessly running; although desktopcouch is no more, Novacut still has similar needs, just now Dmedia[2] starts CouchDB itself using UserCouch[3]; I think if this was a blessed use case upstream, it would be easier to get Debian (and other distros) on the same page

2) From a security perspective, I really don't like that CouchDB requires write access to its own config file (/etc/couchdb/local.ini); not sure what the correct solution is, but the current situation does *not* give me warm fuzzy feelings :P

Thanks again!

[1] dh_sphinxdoc example: http://bazaar.launchpad.net/~dmedia/dbase32/trunk/view/head:/debian/rules
[2] Dmedia: https://launchpad.net/dmedia
[3] UserCouch: https://launchpad.net/usercouch

[Jason Gerard DeRose (jderose)]

Dave: quick question, as far as setting [vendor] info, what is the recommended way of doing this? Is there a ./configure option, or should I just modify default.ini.tpl.in at the appropriate stage?

[lp:~jderose/ubuntu/trusty/couchdb/1.5.0]

84. By Jason Gerard DeRose on 2013-12-01

Add Build-Depends lsb-release, dh-autoreconf, autoconf-archive; debian/rules: use --with autoreconf

[Dave Cottlehuber (skunkwerks)]

@Jason good point, actually I don't know :-). I'll check with nslater, the original autoconf package author for CouchDB what makes sense, but ATM I'd simply add that to the tpl.in file directly. Any change to autoconf will need tweaks and I don't think we'll put that in 1.6.

If there's a need from downstream to set specific vendor information (like Yolanda wants) then [vendor] is the place to do it. The intent in the original ticket was to allow us to start communicating feature sets under that key, for example cloudant might say "we are cloudant, we support this search interface v2, and geofeatures". An iriscouch/nodejitsu instance might say "geocouch 1.3" but not have search.

lsb-release will be used by build scripts to extract ubuntu release & version viz `lsb_release -a` or similar.

autoconf-archive is required by couchdb for building from tarball now, but shouldn't be needed for normal build.

see https://github.com/apache/couchdb/blob/master/INSTALL.Unix and https://github.com/apache/couchdb/blob/master/DEVELOPERS for tarball & git checkout info respectively.

I can't speak for the rest, but I'm keen to learn more about how the packaging works.

[Dave Cottlehuber (skunkwerks)]

@Jason thanks for the reply,

Re building docs etc, it doesn't really matter, whatever makes sense here. I'm merely pointing out that a large chunk of the dependencies are simply required to build docs, and by using the pre-built tarball that's avoided. Up to you! I do think that python pygments is required for highlighting, but that's not in the list AFAICT.

You're 100% right on the options being a large part of the (re)spwaning issue BTW. This is the right thing to do.

1) per-user instances are already supported, I suspect this will be a matter of documentation and/or config. I've used it for a while, so I suggest you open a JIRA over in CouchDB, we'll nut out what is technically required, fix doc/configs, and you are good to go.

2) only a couchdb admin can modify the local.ini. It stores local admin passwords, the per-instance UUID (used to help replication), and nothing a normal user can modify. This ini file can actually be put anywhere, and the *last* entry in the loaded configuration files is where writable entries need to go. So you can actually put that anywhere you like.

use `couchdb -c` to seee the current config chain:

/usr/local/etc/couchdb/default.ini
/usr/local/etc/couchdb/local.ini

and `couchdb -a /my/config.ini` or `couchdb -A /my/config/dir/` as required.

This is also the answer to (1) above BTW :-)

- install a "normal" couchdb config, don't have the service start up automatically, and then use your own (e.g. upstart's per-user config file http://upstart.ubuntu.com/cookbook/#id97) to set up a per user one, that puts an additional `-a ...` file in there. These settings will over-ride earlier set ones, so you can redirect pidfile, db location, view files, even view servers if you want.

[lp:~jderose/ubuntu/trusty/couchdb/1.5.0]

85. By Jason Gerard DeRose on 2013-12-01

First attempt at setting proper [vendor] info in default.ini

86. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: start on filesystem and static-network-up, stop deconfiguring-networking

87. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: heck, might as well add 'author', all the cool kids are

88. By Jason Gerard DeRose on 2013-12-01

Till I understand Yolanda Robla's reasoning, drop Build-Depends dh-autoreconf and autoconf-archive, don't use --with autoreconf

89. By Jason Gerard DeRose on 2013-12-01

Update changelog

[Jason Gerard DeRose (jderose)]

Dave, okay, I finished the requested changes, and am ready for another review. I made two important changes:

1) The default.ini file now gets the appropriate [vendor] info from `lsb_release`

I'd really like to see an easier way of doing this implemented upstream, but I think my approach is workable for now, though a bit hacky.

2) I tweaked the couchdb.upstart config mostly based on your suggestions

Based on my reading of this:
http://upstart.ubuntu.com/cookbook/#ubuntu-well-known-events-ubuntu-specific

I feel it's most correct to:
  start on filesystem and static-network-up
  stop on deconfiguring-networking

I've tested start/stop, stop via apt-get remove/purge, and respawn (by manually killing the couchdb process).

review: Needs Resubmitting

[Dave Cottlehuber (skunkwerks)]

awesome! I'm partway through pulling this "back" to work on precise
too. I'll send more details through when I'm past the stupid error
stage..

(1) this is quite linux specific and vendor-specific. I'm +0 on
teaching couchdb configure scripts to handle different distros but if
lsb_release is available (at least as a package) on all linux flavours
then its not unreasonable.

(2) seems pretty sensible. some caveats:

upstart is not clear if static-network-up is available on dhcp or
not; according to man upstart-events in precise, its emitted when the
last static interface is up.

deconfiguring-networking; would this break a couchdb instance being
used as an offline-capable application? FWIW it isn't available on
precise but that shouldn't matter if it works for you.

A+
Dave

On 2 December 2013 05:05, Jason Gerard DeRose <email address hidden> wrote:
> Review: Resubmit
>
> Dave, okay, I finished the requested changes, and am ready for another review. I made two important changes:
>
> 1) The default.ini file now gets the appropriate [vendor] info from `lsb_release`
>
> I'd really like to see an easier way of doing this implemented upstream, but I think my approach is workable for now, though a bit hacky.
>
> 2) I tweaked the couchdb.upstart config mostly based on your suggestions
>
> Based on my reading of this:
> http://upstart.ubuntu.com/cookbook/#ubuntu-well-known-events-ubuntu-specific
>
> I feel it's most correct to:
> start on filesystem and static-network-up
> stop on deconfiguring-networking
>
> I've tested start/stop, stop via apt-get remove/purge, and respawn (by manually killing the couchdb process).
> --
> https://code.launchpad.net/~jderose/ubuntu/trusty/couchdb/1.5.0/+merge/197291
> You are reviewing the proposed merge of lp:~jderose/ubuntu/trusty/couchdb/1.5.0 into lp:ubuntu/couchdb.

[Dave Cottlehuber (skunkwerks)]

LGTM, I've reused a lot of this for a precise-based package & very happy with the results -- thanks Jason & Yolanda!

Let's merge this puppy :D

review: Approve

[Iain Lane (laney)]

Cheers. I'll upload these - please keep an eye on bug reports for any problems.

review: Approve

[Iain Lane (laney)]

s/these/this/

[Jason Gerard DeRose (jderose)]

Thanks, Iain! And yes, I'll keep an eye on things. I'm subscribed to all the bug reports, and I'm regularly using CouchDB 1.5.0 myself on Trusty now.

Unmerged revisions

89. By Jason Gerard DeRose on 2013-12-01

Update changelog

88. By Jason Gerard DeRose on 2013-12-01

Till I understand Yolanda Robla's reasoning, drop Build-Depends dh-autoreconf and autoconf-archive, don't use --with autoreconf

87. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: heck, might as well add 'author', all the cool kids are

86. By Jason Gerard DeRose on 2013-12-01

couchdb.upstart: start on filesystem and static-network-up, stop deconfiguring-networking

85. By Jason Gerard DeRose on 2013-12-01

First attempt at setting proper [vendor] info in default.ini

84. By Jason Gerard DeRose on 2013-12-01

Add Build-Depends lsb-release, dh-autoreconf, autoconf-archive; debian/rules: use --with autoreconf

83. By Jason Gerard DeRose on 2013-11-30

Fix debian/changelog typo: 'binary the packages' => 'the binary packages'

82. By Jason Gerard DeRose on 2013-11-30

Update 1.5.0-0ubuntu1 changelog timestamp in prep for merge proposal

81. By Jason Gerard DeRose on 2013-11-24

Update/clean-up changelog

80. By Jason Gerard DeRose on 2013-11-24

Drop Build-Depends on texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended, texinfo

=== modified file 'LICENSE'
--- LICENSE	2013-08-28 18:21:32 +0000
+++ LICENSE	2013-12-01 23:56:33 +0000
@@ -896,6 +896,9 @@
 
   Apache 2 License, see above.
 
+If not otherwise noted, the extensions in this package are licensed
+under the following license.
+
 For src/fauxton/test/mocha/mocha.js and src/fauxton/test/mocha/mocha.js
 
   Copyright (c) 2011-2013 TJ Holowaychuk <[e-mail]>
@@ -980,3 +983,146 @@
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
+
+
+for src/fauxton/assets/img/font-awesome.*
+
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
+for src/fauxton/assets/less/bootstrap/font-awesome/*
+
+The MIT License (MIT)
+
+Copyright (c) 2013  Dave Gandy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For share/doc/ext/httpdomain.py
+
+Copyright (c) 2010 by the contributors Hong Minhee <[e-mail]>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
=== modified file 'Makefile.am'
--- Makefile.am	2013-08-28 16:28:32 +0000
+++ Makefile.am	2013-12-01 23:56:33 +0000
@@ -113,6 +113,7 @@
 	mkdir -p $(top_builddir)/tmp/lib
 	mkdir -p $(top_builddir)/tmp/log
 	mkdir -p $(top_builddir)/tmp/run/couchdb
+	mkdir -p $(top_builddir)/tmp/plugins
 endif
 
 install-data-hook:
 
=== modified file 'Makefile.in'
--- Makefile.in	2013-08-28 16:28:32 +0000
+++ Makefile.in	2013-12-01 23:56:33 +0000
@@ -199,6 +199,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -287,6 +288,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -984,6 +987,7 @@
 @TESTS_TRUE@	mkdir -p $(top_builddir)/tmp/lib
 @TESTS_TRUE@	mkdir -p $(top_builddir)/tmp/log
 @TESTS_TRUE@	mkdir -p $(top_builddir)/tmp/run/couchdb
+@TESTS_TRUE@	mkdir -p $(top_builddir)/tmp/plugins
 
 install-data-hook:
 	@echo
 
=== modified file 'NOTICE'
--- NOTICE	2013-08-28 16:28:32 +0000
+++ NOTICE	2013-12-01 23:56:33 +0000
@@ -146,7 +146,7 @@
    
    Copyright 2012, Benoît Chesneau <[e-mail]>
  
-* mocha.js (https://github.com/visionmedia/mocha)
+ * mocha.js (https://github.com/visionmedia/mocha)
   
    Copyright (c) 2011-2013 TJ Holowaychuk <[e-mail]>
 
@@ -161,3 +161,35 @@
  * spin.js
 
    Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
+ 
+ * font-awesome http://fortawesome.github.io/Font-Awesome/
+
+   Copyright (c) 2013 Dave Gandy
+
+ * httpdomain.py (https://bitbucket.org/birkenfeld/sphinx-contrib/src/6a3a8ca714cfce957530890d0431d9a7b88c930f/httpdomain/sphinxcontrib/httpdomain.py?at=httpdomain-1.1.9)
+
+   Copyright (c) 2010, Hong Minhee <[e-mail]>
+
+ * externals.rst (http://davispj.com/2010/09/26/new-couchdb-externals-api.html)
+
+   Copyright 2008-2010, Paul Joseph Davis <[e-mail]>
+
+ * protocol.rst (http://www.dataprotocols.org/en/latest/couchdb_replication.html)
+
+   Copyright 2011-2013, Benoît Chesneau <[e-mail]>
+
+ * views/intro.rst views/nosql.rst views/pagination.rst
+
+   Copyright 2013, Creative Commons Attribution license
+
+ * share/doc/src/couchapp/views/joins.rst (Using View Collation)
+
+   Copyright 2007, Christopher Lenz <[e-mail]>
+
+ * share/doc/src/templates/couchdb/domainindex.html
+
+   Copyright 2007-2011 by the Sphinx team
+
+ * sandbox.js https://github.com/KlausTrainer/sandbox.js
+
+   (c) 2013 Klaus Trainer
 
=== modified file 'THANKS'
--- THANKS	2013-08-28 16:28:32 +0000
+++ THANKS	2013-12-01 23:56:33 +0000
@@ -92,6 +92,8 @@
  * Fedor Indutny <[e-mail]>
  * Tim Blair
  * Tady Walsh <[e-mail]>
+ * Sam Rijs <[e-mail]>
+ * Adam Kocoloski <[e-mail]>
  * Adam Lofts <[e-mail]>
  * Alexander Dorofeev <[e-mail]>
  * Alexander Shorin <[e-mail]>
@@ -100,6 +102,7 @@
  * Ben Reser <[e-mail]>
  * Benjamin Nortier <[e-mail]>
  * Bob Dionne <[e-mail]>
+ * Bob Ippolito <[e-mail]>
  * Caleb Case <[e-mail]>
  * Christopher Bonhage <[e-mail]>
  * Dale Harvey <[e-mail]>
@@ -109,13 +112,15 @@
  * Ewan McDougall <[e-mail]>
  * Fedor Indutny <[e-mail]>
  * Filippo Fadda <[e-mail]>
-    92	Garren Smith <[e-mail]>
+   107	Garren Smith <[e-mail]>
  * Jakub <[e-mail]>
+ * Jason Smith (work) <[e-mail]>
  * Jason Smith (work) <[e-mail]>
  * Jason Smith (work) <[e-mail]>
  * Joel Reed <[e-mail]>
  * Johannes J. Schmidt <[e-mail]>
  * Keks Keksov <[e-mail]>
+ * Klaus Trainer <[e-mail]>
  * Magnus Hoff <[e-mail]>
  * Martin Higham <[e-mail]>
  * Michael Jackson <[e-mail]>
@@ -135,10 +140,12 @@
     10	Simon Metson <[e-mail]>
  * Sriram Melkote <[e-mail]>
  * Stefan Kögl <[e-mail]>
+ * Sven Lito <[e-mail]>
  * Volker Mische <[e-mail]>
  * Wei Cao <[e-mail]>
  * Wendall Cada <[e-mail]>
+ * nvdev <[e-mail]>
  * sean barclay <[e-mail]>
-    17	suelockwood <[e-mail]>
+    54	suelockwood <[e-mail]>
 
 For a list of authors see the `AUTHORS` file.
 
=== modified file 'acinclude.m4'
--- acinclude.m4	2013-08-28 16:28:32 +0000
+++ acinclude.m4	2013-12-01 23:56:33 +0000
@@ -17,7 +17,7 @@
 m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
 m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
 m4_define([LOCAL_VERSION_MAJOR], [1])
-m4_define([LOCAL_VERSION_MINOR], [4])
+m4_define([LOCAL_VERSION_MINOR], [5])
 m4_define([LOCAL_VERSION_REVISION], [0])
 m4_define([LOCAL_VERSION_STAGE], [])
 m4_define([LOCAL_VERSION_RELEASE], [])
 
=== modified file 'bin/Makefile.am'
--- bin/Makefile.am	2013-08-28 16:28:32 +0000
+++ bin/Makefile.am	2013-12-01 23:56:33 +0000
@@ -32,7 +32,7 @@
 
 BUILT_SOURCES = $(man_file_build)
 
-EXTRA_DIST = $(man_file_build)
+EXTRA_DIST = $(man_file_build) erlang-version.escript
 
 CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
 
@@ -51,6 +51,7 @@
 	    -e "s|%localstatelogdir%|@localstatelogdir@|g" \
 	    -e "s|%localstatelibdir%|@localstatelibdir@|g" \
 	    -e "s|%localstatedir%|@localstatedir@|g" \
+	    -e "s|%locallibdir%|@locallibdir@|g" \
 	    -e "s|%bug_uri%|@bug_uri@|g" \
 	    -e "s|%package_author_address%|@package_author_address@|g" \
 	    -e "s|%package_author_name%|@package_author_name@|g" \
@@ -94,6 +95,8 @@
 	    -e "s|%package_author_name%|@package_author_name@|g" \
 	    -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
+	    -e "s|%erlangversion%|@erlangversion@|g" \
+	    -e "s|%erlangbin%|@erlangbin@|g" \
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
 	$@ < $<
 	chmod +x $@
@@ -117,6 +120,8 @@
 	    -e "s|%package_author_name%|@package_author_name@|g" \
 	    -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
+	    -e "s|%erlangversion%|@erlangversion@|g" \
+	    -e "s|%erlangbin%|@erlangbin@|g" \
 	    -e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
 	$@ < $<
 	chmod +x $@
 
=== modified file 'bin/Makefile.in'
--- bin/Makefile.in	2013-08-28 16:28:32 +0000
+++ bin/Makefile.in	2013-12-01 23:56:33 +0000
@@ -138,6 +138,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -226,6 +227,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -290,7 +293,7 @@
 @BUILD_MAN_FALSE@man_file_build = 
 @BUILD_MAN_TRUE@man_file_build = $(man_file)
 BUILT_SOURCES = $(man_file_build)
-EXTRA_DIST = $(man_file_build)
+EXTRA_DIST = $(man_file_build) erlang-version.escript
 CLEANFILES = $(bin_SCRIPTS) $(man_file_build) $(noinst_SCRIPTS)
 couchdb_command_name = `echo couchdb | sed '$(transform)'`
 couchjs_command_name = `echo couchjs | sed '$(transform)'`
@@ -548,6 +551,7 @@
 	    -e "s|%localstatelogdir%|@localstatelogdir@|g" \
 	    -e "s|%localstatelibdir%|@localstatelibdir@|g" \
 	    -e "s|%localstatedir%|@localstatedir@|g" \
+	    -e "s|%locallibdir%|@locallibdir@|g" \
 	    -e "s|%bug_uri%|@bug_uri@|g" \
 	    -e "s|%package_author_address%|@package_author_address@|g" \
 	    -e "s|%package_author_name%|@package_author_name@|g" \
@@ -589,6 +593,8 @@
 	    -e "s|%package_author_name%|@package_author_name@|g" \
 	    -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
+	    -e "s|%erlangversion%|@erlangversion@|g" \
+	    -e "s|%erlangbin%|@erlangbin@|g" \
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
 	$@ < $<
 	chmod +x $@
@@ -612,6 +618,8 @@
 	    -e "s|%package_author_name%|@package_author_name@|g" \
 	    -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
+	    -e "s|%erlangversion%|@erlangversion@|g" \
+	    -e "s|%erlangbin%|@erlangbin@|g" \
 	    -e "s|%couchdb_command_name%|$(abs_top_builddir)/utils/run|g" > \
 	$@ < $<
 	chmod +x $@
 
=== modified file 'bin/couch-config.tpl.in'
--- bin/couch-config.tpl.in	2013-08-28 18:21:32 +0000
+++ bin/couch-config.tpl.in	2013-12-01 23:56:33 +0000
@@ -22,6 +22,8 @@
 confdir="%localconfdir%"
 urifile="%localstaterundir%/couch.uri"
 logdir="%localstatelogdir%"
+erlangversion="%erlangversion%"
+erlangbin="%erlangbin%"
 
 version () {
     cat << EOF
@@ -52,6 +54,7 @@
 Options:
 
   --erl-libs-dir    Erlang library directory
+  --erl-bin         Erlang binary
   --config-dir      configuration directory
   --db-dir          database directory
   --view-dir        view index directory
@@ -60,6 +63,7 @@
   --log-dir         log directory
   --uri-file        daemon sockets file 
   --couch-version   version of Apache CouchDB
+  --erlang-version  version of Erlang that CouchDB was built with
   --version         version of $basename
   --help            Print usage
 
@@ -84,6 +88,9 @@
         --erl-libs-dir)
             echo $erlanglibdir
             ;;
+        --erl-bin)
+            echo $erlangbin
+            ;;
         --config-dir)
             echo $confdir
             ;;
@@ -108,6 +115,9 @@
         --couch-version)
             echo $couchversion
             ;;
+        --erlang-version)
+            echo $erlangversion
+            ;;
         --version)
             version
             exit 0
 
=== modified file 'bin/couchdb.1'
--- bin/couchdb.1	2013-08-28 16:28:32 +0000
+++ bin/couchdb.1	2013-12-01 23:56:33 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.11.
-.TH COUCHDB "1" "August 2013" "couchdb - Apache CouchDB 1.4.0" "User Commands"
+.TH COUCHDB "1" "October 2013" "couchdb - Apache CouchDB 1.5.0" "User Commands"
 .SH NAME
 couchdb \- Apache CouchDB database server
 .SH SYNOPSIS
 
=== modified file 'bin/couchdb.tpl.in'
--- bin/couchdb.tpl.in	2013-08-28 16:28:32 +0000
+++ bin/couchdb.tpl.in	2013-12-01 23:56:33 +0000
@@ -25,6 +25,7 @@
 HEART_COMMAND="%bindir%/%couchdb_command_name% -k"
 INTERACTIVE=false
 KILL=false
+PLUGINS_DIR=%locallibdir%/plugins
 LOCAL_CONFIG_DIR=%localconfdir%/local.d
 LOCAL_CONFIG_FILE=%localconfdir%/%localini%
 PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
@@ -141,9 +142,17 @@
     done
 }
 
+_add_erlang_config () {
+    if [ -r "$1" ]; then
+        ERL_START_OPTIONS="$ERL_START_OPTIONS -config '$1'"
+    fi
+}
+
 _load_config () {
     _add_config_file "$DEFAULT_CONFIG_FILE"
     _add_config_dir "$DEFAULT_CONFIG_DIR"
+    # We initialize plugins here to get the desired default config load order
+    _find_plugins
     _add_config_file "$LOCAL_CONFIG_FILE"
     _add_config_dir "$LOCAL_CONFIG_DIR"
     if [ "$COUCHDB_ADDITIONAL_CONFIG_FILE" != '' ]
@@ -216,6 +225,27 @@
     fi
 }
 
+_find_plugins () {
+    # Find plugins and add them to the Erlang path and load their default
+    # configurations. This should be called from _load_config.
+    if test -d "$PLUGINS_DIR"; then
+        for plugin in "$PLUGINS_DIR"/*; do
+            if echo "$COUCH_PLUGIN_BLACKLIST" | grep "$plugin" > /dev/null 2> /dev/null; then
+                : # Do not use this plugin.
+            else
+                if echo "$ERL_ZFLAGS" | grep "$plugin/ebin" > /dev/null 2> /dev/null; then
+                    : # It's already loaded.
+                else
+                    ERL_ZFLAGS="$ERL_ZFLAGS -pz '$plugin/ebin'"
+                fi
+                _add_config_dir "$plugin/priv/default.d"
+                _add_erlang_config "$plugin/priv/couch_plugin.config"
+            fi
+        done
+        export ERL_ZFLAGS
+    fi
+}
+
 start_couchdb () {
     if test ! "$RECURSED" = "true"; then
         if check_status 2> /dev/null; then
@@ -232,22 +262,6 @@
         interactive_option="+Bd -noinput"
     fi
 
-    # Find plugins and add them to the Erlang path.
-    if test -d "%localerlanglibdir%/../../plugins"; then
-        for plugin in "%localerlanglibdir%/../../plugins"/*; do
-            if echo "$ERL_ZFLAGS" | grep "$plugin/ebin" > /dev/null 2> /dev/null; then
-                : # It's already loaded.
-            else
-                if echo "$COUCH_PLUGIN_BLACKLIST" | grep "$plugin" > /dev/null 2> /dev/null; then
-                    : # Do not use this plugin.
-                else
-                    ERL_ZFLAGS="$ERL_ZFLAGS -pz '$plugin/ebin'"
-                fi
-            fi
-        done
-        export ERL_ZFLAGS
-    fi
-
     command="%ERL% $interactive_option $ERL_START_OPTIONS \
         -env ERL_LIBS $ERL_LIBS:%localerlanglibdir% -couch_ini $start_arguments -s couch"
     if test "$BACKGROUND" = "true" -a "$RECURSED" = "false"; then
 
=== added file 'bin/erlang-version.escript'
--- bin/erlang-version.escript	1970-01-01 00:00:00 +0000
+++ bin/erlang-version.escript	2013-12-01 23:56:33 +0000
@@ -0,0 +1,3 @@
+
+main(_) ->
+  io:format("~s~n", [erlang:system_info(otp_release)]).
 
=== modified file 'build-aux/ltmain.sh' (properties changed: +x to -x)
--- build-aux/ltmain.sh	2013-08-28 16:28:32 +0000
+++ build-aux/ltmain.sh	2013-12-01 23:56:33 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <[e-mail]>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="grep -E"}
-: ${FGREP="grep -F"}
-: ${GREP="grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 
=== modified file 'configure'
--- configure	2013-08-28 16:28:32 +0000
+++ configure	2013-12-01 23:56:33 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac 1.4.0.
+# From configure.ac 1.5.0.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.4.0.
+# Generated by GNU Autoconf 2.69 for Apache CouchDB 1.5.0.
 #
 # Report bugs to <https://issues.apache.org/jira/browse/COUCHDB>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='Apache CouchDB'
 PACKAGE_TARNAME='apache-couchdb'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='Apache CouchDB 1.4.0'
+PACKAGE_VERSION='1.5.0'
+PACKAGE_STRING='Apache CouchDB 1.5.0'
 PACKAGE_BUGREPORT='https://issues.apache.org/jira/browse/COUCHDB'
 PACKAGE_URL=''
 
@@ -640,6 +640,8 @@
 abs_top_srcdir
 localerlanglibdir
 locallibbindir
+erlangbin
+erlangversion
 localstaterundir
 localstatelogdir
 localstatelibdir
@@ -713,6 +715,7 @@
 JS_LIBS
 JS_CFLAGS
 ERLANG_FLAGS
+ESCRIPT
 ERL
 SNAPPY_PATCHLEVEL
 SNAPPY_MINOR
@@ -1431,7 +1434,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Apache CouchDB 1.4.0 to adapt to many kinds of systems.
+\`configure' configures Apache CouchDB 1.5.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1504,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache CouchDB 1.4.0:";;
+     short | recursive ) echo "Configuration of Apache CouchDB 1.5.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1536,7 +1539,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1658,7 +1661,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache CouchDB configure 1.4.0
+Apache CouchDB configure 1.5.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2402,7 +2405,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Apache CouchDB $as_me 1.4.0, which was
+It was created by Apache CouchDB $as_me 1.5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3227,7 +3230,7 @@
 
 # Define the identity of the package.
  PACKAGE='apache-couchdb'
- VERSION='1.4.0'
+ VERSION='1.5.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5445,8 +5448,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -6161,6 +6164,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -6200,7 +6208,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -6626,7 +6634,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -7263,13 +7271,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -7416,6 +7424,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -7804,7 +7813,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7815,7 +7824,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -8455,7 +8477,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -8466,6 +8494,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -8498,6 +8527,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -8519,7 +8549,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8895,7 +8927,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8973,6 +9020,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -9432,7 +9483,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -9523,18 +9576,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9896,7 +9964,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -10146,8 +10213,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10526,6 +10592,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -10571,6 +10638,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10599,10 +10667,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10615,7 +10679,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10654,7 +10718,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -11278,11 +11341,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -11372,7 +11430,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -11381,7 +11439,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -11446,7 +11504,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -11585,7 +11643,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -11593,10 +11651,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11604,7 +11658,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11635,7 +11689,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -11655,17 +11709,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -11726,7 +11781,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -11742,7 +11797,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11779,9 +11834,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11863,7 +11918,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11932,7 +11987,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11957,7 +12012,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11981,7 +12036,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -12012,7 +12067,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -12022,7 +12077,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12804,6 +12859,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -13500,7 +13557,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -14084,6 +14140,7 @@
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec_CXX=''
   fi
@@ -14128,7 +14185,7 @@
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14804,6 +14861,7 @@
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -15593,7 +15651,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -15746,8 +15806,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -15773,7 +15831,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -15782,7 +15840,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -15847,7 +15905,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -15984,7 +16042,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -15992,10 +16050,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -16003,7 +16057,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -16034,7 +16088,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -16054,17 +16108,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -16125,7 +16180,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -16141,7 +16196,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -16178,9 +16233,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16262,7 +16317,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -16331,7 +16386,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16356,7 +16411,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16380,7 +16435,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -16411,7 +16466,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -16421,7 +16476,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -16908,7 +16963,7 @@
 
 SNAPPY_MAJOR="1"
 SNAPPY_MINOR="0"
-SNAPPY_PATCHLEVEL="3"
+SNAPPY_PATCHLEVEL="5"
 
 
 
@@ -16989,6 +17044,46 @@
 fi
 
 
+# Extract the first word of "escript", so it can be a program name with args.
+set dummy escript; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ESCRIPT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ESCRIPT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ESCRIPT="$ESCRIPT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ESCRIPT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ESCRIPT=$ac_cv_path_ESCRIPT
+if test -n "$ESCRIPT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ESCRIPT" >&5
+$as_echo "$ESCRIPT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
 
 if test x${ERL} = x; then :
 
@@ -18936,6 +19031,9 @@
     fi
 fi
 
+ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript"
+erlangversion=`${ERL_VERSION_COMMAND}`
+
 
 
 
@@ -19033,11 +19131,11 @@
 package_name="Apache CouchDB"
 
 
-version="1.4.0"
+version="1.5.0"
 
 version_major="1"
 
-version_minor="4"
+version_minor="5"
 
 version_revision="0"
 
@@ -19063,6 +19161,11 @@
 
 localstaterundir=${localstatedir}/run/${package_identifier}
 
+erlangversion=${erlangversion}
+
+erlangbin=${ERL}
+
+
 
 # On Windows we install directly into our erlang distribution.
 if test x${IS_WINDOWS} = xTRUE; then
@@ -19129,8 +19232,12 @@
 
 ac_config_files="$ac_config_files src/couch_mrview/Makefile"
 
+ac_config_files="$ac_config_files src/couch_plugins/Makefile"
+
 ac_config_files="$ac_config_files src/couch_replicator/Makefile"
 
+ac_config_files="$ac_config_files src/couchjs-node/Makefile"
+
 ac_config_files="$ac_config_files src/couchdb/couch.app.tpl"
 
 ac_config_files="$ac_config_files src/couchdb/Makefile"
@@ -19751,7 +19858,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Apache CouchDB $as_me 1.4.0, which was
+This file was extended by Apache CouchDB $as_me 1.5.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19817,7 +19924,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Apache CouchDB config.status 1.4.0
+Apache CouchDB config.status 1.5.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19957,6 +20064,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -20037,7 +20145,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -20109,7 +20216,6 @@
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -20151,6 +20257,7 @@
 OBJDUMP \
 SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -20199,7 +20306,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -20233,7 +20339,6 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -20352,7 +20457,9 @@
     "src/couch_dbupdates/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_dbupdates/Makefile" ;;
     "src/couch_index/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_index/Makefile" ;;
     "src/couch_mrview/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_mrview/Makefile" ;;
+    "src/couch_plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_plugins/Makefile" ;;
     "src/couch_replicator/Makefile") CONFIG_FILES="$CONFIG_FILES src/couch_replicator/Makefile" ;;
+    "src/couchjs-node/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchjs-node/Makefile" ;;
     "src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
     "src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
     "src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
@@ -21082,8 +21189,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -21146,6 +21253,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -21441,10 +21551,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -21787,10 +21893,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
 
=== modified file 'configure.ac'
--- configure.ac	2013-08-28 16:28:32 +0000
+++ configure.ac	2013-12-01 23:56:33 +0000
@@ -40,7 +40,7 @@
 dnl Config for google snappy
 m4_define([snappy_major], [1])
 m4_define([snappy_minor], [0])
-m4_define([snappy_patchlevel], [3])
+m4_define([snappy_patchlevel], [5])
 
 AC_PROG_CXX
 AC_LANG([C++])
@@ -123,12 +123,13 @@
 fi
 
 AC_PATH_PROG([ERL], [erl])
+AC_PATH_PROG([ESCRIPT], [escript])
 
 AS_IF([test x${ERL} = x], [
     AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
 ])
 
-AC_ARG_WITH([erlang], 
+AC_ARG_WITH([erlang],
     [AS_HELP_STRING([--with-erlang=PATH],
         [set PATH to the Erlang include directory])
 ], [
@@ -476,35 +477,35 @@
 docs_enabled=yes
 strictness_enabled=no
 
-AC_ARG_ENABLE([init], 
+AC_ARG_ENABLE([init],
     [AS_HELP_STRING([--disable-init],
         [don't install init script where applicable])
 ], [
     use_init=$enableval
 ], [])
 
-AC_ARG_ENABLE([launchd], 
+AC_ARG_ENABLE([launchd],
     [AS_HELP_STRING([--disable-launchd],
         [don't install launchd configuration where applicable])
 ], [
     use_launchd=$enableval
 ], [])
 
-AC_ARG_ENABLE([native-mochijson], 
+AC_ARG_ENABLE([native-mochijson],
     [AS_HELP_STRING([--enable-native-mochijson],
         [compile mochijson to native code (EXPERIMENTAL)])
 ], [
     native_mochijson_enabled=$enableval
 ], [])
 
-AC_ARG_ENABLE([tests], 
+AC_ARG_ENABLE([tests],
     [AS_HELP_STRING([--disable-tests],
         [skip tests during build])
 ], [
     tests_enabled=$enableval
 ], [])
 
-AC_ARG_ENABLE([docs], 
+AC_ARG_ENABLE([docs],
     [AS_HELP_STRING([--disable-docs],
         [skip docs during build])
 ], [
@@ -614,7 +615,7 @@
         build_html=yes
         if test x${HAS_MAKEINFO} = xyes; then
             build_info=yes
-        fi    
+        fi
         if test x${HAS_PDFLATEX} = xyes; then
             build_pdf=yes
         fi
@@ -650,6 +651,9 @@
     fi
 fi
 
+ERL_VERSION_COMMAND="${ESCRIPT} bin/erlang-version.escript"
+erlangversion=`${ERL_VERSION_COMMAND}`
+
 AC_ARG_VAR([ERL], [path to the `erl' executable])
 AC_ARG_VAR([ERLC], [path to the `erlc' executable])
 
@@ -688,6 +692,9 @@
 AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
 AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
 AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
+AC_SUBST([erlangversion], [${erlangversion}])
+AC_SUBST([erlangbin], [${ERL}])
+
 
 # On Windows we install directly into our erlang distribution.
 if test x${IS_WINDOWS} = xTRUE; then
@@ -727,7 +734,9 @@
 AC_CONFIG_FILES([src/couch_dbupdates/Makefile])
 AC_CONFIG_FILES([src/couch_index/Makefile])
 AC_CONFIG_FILES([src/couch_mrview/Makefile])
+AC_CONFIG_FILES([src/couch_plugins/Makefile])
 AC_CONFIG_FILES([src/couch_replicator/Makefile])
+AC_CONFIG_FILES([src/couchjs-node/Makefile])
 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
 AC_CONFIG_FILES([src/couchdb/Makefile])
 AC_CONFIG_FILES([src/couchdb/priv/Makefile])
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-08-28 16:28:32 +0000
+++ debian/changelog	2013-12-01 23:56:33 +0000
@@ -1,3 +1,22 @@
+couchdb (1.5.0-0ubuntu1) trusty; urgency=low
+
+  * New upstream release (LP: #1254371)
+  * Don't include `couchdb` info page in `couchdb-bin` binary package as it
+    provides no meaningful benefit over the `couchdb` man page (note this change
+    means we don't need to add a Build-Depends on `install-info` for Trusty)
+  * Remove Build-Depends: texlive-latex-base, texlive-latex-recommended,
+    texlive-latex-extra, texlive-fonts-recommended, texinfo (as documentation
+    thus produced doesn't get included in the binary packages anyway)
+  * debian/rules: don't call ./configure with --enable-strictness as we dropped
+    Build-Depends on `texlive-*`, `texinfo`, plus didn't add `install-info` 
+  * Add Build-Depends: lsb-release (used for [vendor] info in default.ini)
+  * debian/rules: insert proper [vendor] info in default.ini (note this should
+    be improved once there is a better mechanism upstream)
+  * debian/couchdb.upstart: start on filesystem and static-network-up,
+    stop on deconfiguring-networking, plus add "author" line
+
+ -- Jason Gerard DeRose <[e-mail]>  Sun, 01 Dec 2013 16:55:05 -0700
+
 couchdb (1.4.0-0ubuntu1) saucy; urgency=low
 
   * New upstream release (LP: #1212481)
 
=== modified file 'debian/control'
--- debian/control	2013-08-28 16:28:32 +0000
+++ debian/control	2013-12-01 23:56:33 +0000
@@ -17,11 +17,7 @@
                libicu-dev,
                libmozjs185-dev,
                python-sphinx (>= 1.1.3),
-               texlive-latex-base,
-               texlive-latex-recommended,
-               texlive-latex-extra,
-               texlive-fonts-recommended,
-               texinfo,
+               lsb-release,
 Homepage: http://couchdb.apache.org/
 
 Package: couchdb-common
 
=== modified file 'debian/couchdb-bin.install'
--- debian/couchdb-bin.install	2013-08-28 16:28:32 +0000
+++ debian/couchdb-bin.install	2013-12-01 23:56:33 +0000
@@ -1,6 +1,5 @@
 debian/tmp/usr/bin
 debian/tmp/usr/lib
 debian/tmp/usr/share/man
-debian/tmp/usr/share/info
 debian/tmp/etc/couchdb/default.ini
 debian/tmp/etc/couchdb/default.d
 
=== modified file 'debian/couchdb.upstart'
--- debian/couchdb.upstart	2013-08-28 16:28:32 +0000
+++ debian/couchdb.upstart	2013-12-01 23:56:33 +0000
@@ -1,9 +1,10 @@
 # couchdb - a RESTful document oriented database
 
 description "Start the system-wide CouchDB instance"
+author "Jason Gerard DeRose <[e-mail]>"
 
-start on runlevel [2345]
-stop on runlevel [016]
+start on filesystem and static-network-up
+stop on deconfiguring-networking
 respawn
 
 pre-start script
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-28 16:28:32 +0000
+++ debian/rules	2013-12-01 23:56:33 +0000
@@ -4,7 +4,9 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-strictness --disable-init
+	dh_auto_configure -- --disable-init
+	sed -i s/%package_author_name%/`lsb_release -si`/ etc/couchdb/default.ini.tpl
+	sed -i s/%version%/`lsb_release -sr`/ etc/couchdb/default.ini.tpl
 
 override_dh_auto_install:
 	dh_auto_install
 
=== modified file 'etc/Makefile.in'
--- etc/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/Makefile.in	2013-12-01 23:56:33 +0000
@@ -181,6 +181,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -269,6 +270,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'etc/couchdb/Makefile.am'
--- etc/couchdb/Makefile.am	2013-08-28 16:28:32 +0000
+++ etc/couchdb/Makefile.am	2013-12-01 23:56:33 +0000
@@ -44,6 +44,7 @@
 	    -e "s|%localconfdir%|$(localconfdir)|g" \
 	    -e "s|%localdatadir%|$(localdatadir)|g" \
 	    -e "s|%localbuilddatadir%|$(localdatadir)|g" \
+	    -e "s|%locallibdir%|$(locallibdir)|g" \
 	    -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
 	    -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
 	    -e "s|%localstaterundir%|$(localstaterundir)|g" \
@@ -58,6 +59,7 @@
 	sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
 	    -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
 	    -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
+	    -e "s|%locallibdir%|$(abs_top_builddir)/tmp|g" \
 	    -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
 	    -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
 	    -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
 
=== modified file 'etc/couchdb/Makefile.in'
--- etc/couchdb/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/couchdb/Makefile.in	2013-12-01 23:56:33 +0000
@@ -137,6 +137,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -225,6 +226,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -526,6 +529,7 @@
 @WINDOWS_FALSE@	    -e "s|%localconfdir%|$(localconfdir)|g" \
 @WINDOWS_FALSE@	    -e "s|%localdatadir%|$(localdatadir)|g" \
 @WINDOWS_FALSE@	    -e "s|%localbuilddatadir%|$(localdatadir)|g" \
+@WINDOWS_FALSE@	    -e "s|%locallibdir%|$(locallibdir)|g" \
 @WINDOWS_FALSE@	    -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
 @WINDOWS_FALSE@	    -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
 @WINDOWS_FALSE@	    -e "s|%localstaterundir%|$(localstaterundir)|g" \
@@ -539,6 +543,7 @@
 	sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
 	    -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
 	    -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
+	    -e "s|%locallibdir%|$(abs_top_builddir)/tmp|g" \
 	    -e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
 	    -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
 	    -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
 
=== modified file 'etc/couchdb/default.ini.tpl.in'
--- etc/couchdb/default.ini.tpl.in	2013-08-28 16:28:32 +0000
+++ etc/couchdb/default.ini.tpl.in	2013-12-01 23:56:33 +0000
@@ -27,6 +27,8 @@
 ; time for writes when there are many attachment write requests in parallel.
 attachment_stream_buffer_size = 4096
 
+plugin_dir = %locallibdir%/plugins
+
 [database_compaction]
 ; larger buffer sizes can originate smaller files
 doc_buffer_size = 524288 ; value in bytes
@@ -160,6 +162,7 @@
 _session = {couch_httpd_auth, handle_session_req}
 _oauth = {couch_httpd_oauth, handle_oauth_req}
 _db_updates = {couch_dbupdates_httpd, handle_req}
+_plugins = {couch_plugins_httpd, handle_req}
 
 [httpd_db_handlers]
 _all_docs = {couch_mrview_http, handle_all_docs_req}
 
=== modified file 'etc/couchdb/local.ini'
--- etc/couchdb/local.ini	2013-08-28 16:28:32 +0000
+++ etc/couchdb/local.ini	2013-12-01 23:56:33 +0000
@@ -25,6 +25,10 @@
 ; the whitelist.
 ;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
 
+[query_servers]
+;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js
+
+
 [httpd_global_handlers]
 ;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
 
 
=== modified file 'etc/default/Makefile.in'
--- etc/default/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/default/Makefile.in	2013-12-01 23:56:33 +0000
@@ -106,6 +106,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -194,6 +195,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'etc/init/Makefile.in'
--- etc/init/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/init/Makefile.in	2013-12-01 23:56:33 +0000
@@ -107,6 +107,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -195,6 +196,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'etc/launchd/Makefile.in'
--- etc/launchd/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/launchd/Makefile.in	2013-12-01 23:56:33 +0000
@@ -107,6 +107,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -195,6 +196,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'etc/logrotate.d/Makefile.in'
--- etc/logrotate.d/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/logrotate.d/Makefile.in	2013-12-01 23:56:33 +0000
@@ -107,6 +107,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -195,6 +196,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'etc/windows/Makefile.in'
--- etc/windows/Makefile.in	2013-08-28 16:28:32 +0000
+++ etc/windows/Makefile.in	2013-12-01 23:56:33 +0000
@@ -106,6 +106,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -194,6 +195,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'license.skip'
--- license.skip	2013-08-28 16:28:32 +0000
+++ license.skip	2013-12-01 23:56:33 +0000
@@ -24,6 +24,7 @@
 ^bin/Makefile.in
 ^bin/couchdb.1
 ^bin/couchjs.1
+^bin/erlang-version.escript
 ^build-aux/.*
 ^config..*
 ^configure
@@ -59,8 +60,14 @@
 ^share/doc/Makefile
 ^share/doc/Makefile.in
 ^share/doc/build/.*
+^share/doc/ext/__pycache__/.*
+^share/doc/ext/.*.pyc
+^share/doc/ext/httpdomain.py
+^share/doc/ext/http-api-descr.json
 ^share/doc/images/.*
+^share/doc/src/conf.pyc
 ^share/doc/static/rtd.css
+^share/doc/templates/couchdb/domainindex.html
 ^share/server/json2.js
 ^share/server/mimeparse.js
 ^share/server/coffee-script.js
@@ -73,6 +80,7 @@
 ^share/www/script/base64.js
 ^share/www/script/test/lorem.*
 ^share/www/style/jquery-ui-1.8.11.custom.css
+^share/www/fauxton/img/.*
 ^src/Makefile
 ^src/Makefile.in
 ^src/couch_index/Makefile
@@ -81,6 +89,10 @@
 ^src/couch_mrview/Makefile
 ^src/couch_mrview/Makefile.in
 ^src/couch_mrview/ebin/.*.beam
+^src/couch_plugins/README.md
+^src/couch_plugins/Makefile
+^src/couch_plugins/Makefile.in
+^src/couch_plugins/ebin/.*.beam
 ^src/couch_replicator/Makefile
 ^src/couch_replicator/Makefile.in
 ^src/couch_replicator/ebin/.*.beam
@@ -97,6 +109,11 @@
 ^src/couchdb/priv/couchjs
 ^src/couchdb/priv/couchspawnkillable
 ^src/couchdb/priv/stat_descriptions.cfg
+^src/couchjs-node/package.json
+^src/couchjs-node/sandbox.js
+^src/couchjs-node/README.md
+^src/couchjs-node/Makefile
+^src/couchjs-node/Makefile.in
 ^src/erlang-oauth/.*
 ^src/couch_dbupdates
 ^src/ejson/.*
@@ -117,8 +134,14 @@
 ^src/fauxton/tasks/addon/rename.json
 ^src/fauxton/app/addons/activetasks/assets/less/activetasks.less
 ^src/fauxton/app/addons/auth/assets/less/auth.less
+^src/fauxton/app/addons/permissions/assets/less/permissions.less
 ^src/ibrowse/.*
 ^src/mochiweb/.*
+^src/my-first-couchdb-plugin/priv/*/*
+^src/my-first-couchdb-plugin/README.md
+^src/my-first-couchdb-plugin/.gitignore
+^src/my-first-couchdb-plugin/Makefile
+^src/my-first-couchdb-plugin/Makefile.in
 ^src/snappy/.*
 ^stamp-h1
 ^test/Makefile
 
=== modified file 'm4/libtool.m4'
--- m4/libtool.m4	2013-08-28 16:28:32 +0000
+++ m4/libtool.m4	2013-12-01 23:56:33 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2448,7 +2506,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2468,17 +2526,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2539,7 +2598,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2555,7 +2614,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2592,9 +2651,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2657,7 +2716,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2785,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2751,7 +2810,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2834,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2865,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2816,7 +2875,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3297,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3658,6 +3717,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4242,7 +4302,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4334,18 +4396,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4582,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4530,7 +4609,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4781,8 +4859,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5077,6 +5154,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5123,10 +5201,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5139,7 +5213,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5178,7 +5252,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5620,9 +5693,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5780,7 +5850,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6150,7 +6219,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6911,12 +6980,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7113,7 +7188,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7246,7 +7320,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7433,6 +7506,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7502,6 +7646,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
 
=== modified file 'm4/ltoptions.m4'
--- m4/ltoptions.m4	2012-07-30 22:49:59 +0000
+++ m4/ltoptions.m4	2013-12-01 23:56:33 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
 
=== modified file 'm4/ltversion.m4'
--- m4/ltversion.m4	2013-08-28 16:28:32 +0000
+++ m4/ltversion.m4	2013-12-01 23:56:33 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
 
=== modified file 'share/Makefile.am'
--- share/Makefile.am	2013-08-28 16:28:32 +0000
+++ share/Makefile.am	2013-12-01 23:56:33 +0000
@@ -71,6 +71,25 @@
     www/dialog/_save_view_as.html \
     www/dialog/_upload_attachment.html \
     www/document.html \
+    www/fauxton/css/index.css \
+    www/fauxton/img/couchdb-site.png \
+    www/fauxton/img/couchdblogo.png \
+    www/fauxton/img/fontawesome-webfont.eot \
+    www/fauxton/img/fontawesome-webfont.svg \
+    www/fauxton/img/fontawesome-webfont.ttf \
+    www/fauxton/img/fontawesome-webfont.woff \
+    www/fauxton/img/FontAwesome.otf \
+    www/fauxton/img/fontcustom_fauxton.eot \
+    www/fauxton/img/fontcustom_fauxton.svg \
+    www/fauxton/img/fontcustom_fauxton.ttf \
+    www/fauxton/img/fontcustom_fauxton.woff \
+    www/fauxton/img/glyphicons-halflings-white.png \
+    www/fauxton/img/glyphicons-halflings.png \
+    www/fauxton/img/linen.png \
+    www/fauxton/img/loader.gif \
+    www/fauxton/img/minilogo.png \
+    www/fauxton/index.html \
+    www/fauxton/js/require.js \
     www/favicon.ico \
     www/image/add.png \
     www/image/apply.gif \
@@ -105,6 +124,7 @@
     www/image/toggle-expand.gif \
     www/image/twisty.gif \
     www/index.html \
+    www/plugins.html \
     www/replicator.html \
     www/script/couch.js \
     www/script/couch_tests.js \
@@ -218,7 +238,6 @@
     www/script/test/view_update_seq.js \
     www/script/test/view_pagination.js \
     www/script/test/view_sandboxing.js \
-    www/script/test/view_xml.js \
     www/spec/couch_js_class_methods_spec.js \
     www/spec/couch_js_instance_methods_1_spec.js \
     www/spec/couch_js_instance_methods_2_spec.js \
 
=== modified file 'share/Makefile.in'
--- share/Makefile.in	2013-08-28 16:28:32 +0000
+++ share/Makefile.in	2013-12-01 23:56:33 +0000
@@ -180,6 +180,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -268,6 +269,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -365,6 +368,25 @@
     www/dialog/_save_view_as.html \
     www/dialog/_upload_attachment.html \
     www/document.html \
+    www/fauxton/css/index.css \
+    www/fauxton/img/couchdb-site.png \
+    www/fauxton/img/couchdblogo.png \
+    www/fauxton/img/fontawesome-webfont.eot \
+    www/fauxton/img/fontawesome-webfont.svg \
+    www/fauxton/img/fontawesome-webfont.ttf \
+    www/fauxton/img/fontawesome-webfont.woff \
+    www/fauxton/img/FontAwesome.otf \
+    www/fauxton/img/fontcustom_fauxton.eot \
+    www/fauxton/img/fontcustom_fauxton.svg \
+    www/fauxton/img/fontcustom_fauxton.ttf \
+    www/fauxton/img/fontcustom_fauxton.woff \
+    www/fauxton/img/glyphicons-halflings-white.png \
+    www/fauxton/img/glyphicons-halflings.png \
+    www/fauxton/img/linen.png \
+    www/fauxton/img/loader.gif \
+    www/fauxton/img/minilogo.png \
+    www/fauxton/index.html \
+    www/fauxton/js/require.js \
     www/favicon.ico \
     www/image/add.png \
     www/image/apply.gif \
@@ -399,6 +421,7 @@
     www/image/toggle-expand.gif \
     www/image/twisty.gif \
     www/index.html \
+    www/plugins.html \
     www/replicator.html \
     www/script/couch.js \
     www/script/couch_tests.js \
@@ -512,7 +535,6 @@
     www/script/test/view_update_seq.js \
     www/script/test/view_pagination.js \
     www/script/test/view_sandboxing.js \
-    www/script/test/view_xml.js \
     www/spec/couch_js_class_methods_spec.js \
     www/spec/couch_js_instance_methods_1_spec.js \
     www/spec/couch_js_instance_methods_2_spec.js \
 
=== modified file 'share/doc/Makefile.in'
--- share/doc/Makefile.in	2013-08-28 18:21:32 +0000
+++ share/doc/Makefile.in	2013-12-01 23:56:33 +0000
@@ -146,6 +146,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -234,6 +235,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 
=== modified file 'share/doc/build/Makefile.am'
--- share/doc/build/Makefile.am	2013-08-28 18:21:32 +0000
+++ share/doc/build/Makefile.am	2013-12-01 23:56:33 +0000
@@ -45,27 +45,128 @@
     html/_images/futon-editeddoc.png \
     html/_images/futon-overview.png \
     html/_images/futon-replform.png \
-    html/_sources/api/authn.txt \
-    html/_sources/api/configuration.txt \
-    html/_sources/api/database.txt \
-    html/_sources/api/design.txt \
-    html/_sources/api/documents.txt \
+    html/_images/intro-consistency-01.png \
+    html/_images/intro-consistency-02.png \
+    html/_images/intro-consistency-03.png \
+    html/_images/intro-consistency-04.png \
+    html/_images/intro-consistency-05.png \
+    html/_images/intro-consistency-06.png \
+    html/_images/intro-consistency-07.png \
+    html/_images/intro-tour-01.png \
+    html/_images/intro-tour-02.png \
+    html/_images/intro-tour-03.png \
+    html/_images/intro-tour-04.png \
+    html/_images/intro-tour-05.png \
+    html/_images/intro-tour-06.png \
+    html/_images/intro-tour-07.png \
+    html/_images/intro-tour-08.png \
+    html/_images/intro-tour-09.png \
+    html/_images/intro-tour-10.png \
+    html/_images/intro-why-01.png \
+    html/_images/intro-why-02.png \
+    html/_images/intro-why-03.png \
+    html/_images/views-intro-01.png \
+    html/_images/views-intro-02.png \
+    html/_images/views-intro-03.png \
+    html/_images/views-intro-04.png \
+    html/_sources/api/basics.txt \
+    html/_sources/api/index.txt \
     html/_sources/api/local.txt \
-    html/_sources/api/misc.txt \
-    html/_sources/api/reference.txt \
-    html/_sources/api-basics.txt \
-    html/_sources/changelog.txt \
-    html/_sources/changes.txt \
-    html/_sources/config_reference.txt \
-    html/_sources/configuring.txt \
+    html/_sources/api/database/bulk-api.txt \
+    html/_sources/api/database/changes.txt \
+    html/_sources/api/database/common.txt \
+    html/_sources/api/database/compact.txt \
+    html/_sources/api/database/index.txt \
+    html/_sources/api/database/misc.txt \
+    html/_sources/api/database/security.txt \
+    html/_sources/api/database/temp-views.txt \
+    html/_sources/api/document/attachments.txt \
+    html/_sources/api/document/common.txt \
+    html/_sources/api/document/index.txt \
+    html/_sources/api/ddoc/common.txt \
+    html/_sources/api/ddoc/index.txt \
+    html/_sources/api/ddoc/render.txt \
+    html/_sources/api/ddoc/rewrites.txt \
+    html/_sources/api/ddoc/views.txt \
+    html/_sources/api/server/authn.txt \
+    html/_sources/api/server/common.txt \
+    html/_sources/api/server/configuration.txt \
+    html/_sources/api/server/index.txt \
+    html/_sources/config/auth.txt \
+    html/_sources/config/compaction.txt \
+    html/_sources/config/couchdb.txt \
+    html/_sources/config/externals.txt \
+    html/_sources/config/http.txt \
+    html/_sources/config/http-handlers.txt \
+    html/_sources/config/index.txt \
+    html/_sources/config/logging.txt \
+    html/_sources/config/misc.txt \
+    html/_sources/config/query-servers.txt \
+    html/_sources/config/replicator.txt \
+    html/_sources/config/services.txt \
+    html/_sources/config/intro.txt \
+    html/_sources/config/proxying.txt \
+    html/_sources/couchapp/ddocs.txt \
+    html/_sources/couchapp/index.txt \
+    html/_sources/couchapp/views/collation.txt \
+    html/_sources/couchapp/views/index.txt \
+    html/_sources/couchapp/views/intro.txt \
+    html/_sources/couchapp/views/joins.txt \
+    html/_sources/couchapp/views/nosql.txt \
+    html/_sources/couchapp/views/pagination.txt \
+    html/_sources/cve/2010-0009.txt \
+    html/_sources/cve/2010-2234.txt \
+    html/_sources/cve/2010-3854.txt \
+    html/_sources/cve/2012-5641.txt \
+    html/_sources/cve/2012-5649.txt \
+    html/_sources/cve/2012-5650.txt \
+    html/_sources/cve/index.txt \
+    html/_sources/fauxton/addons.txt \
+    html/_sources/fauxton/index.txt \
+    html/_sources/fauxton/install.txt \
+    html/_sources/install/index.txt \
+    html/_sources/install/freebsd.txt \
+    html/_sources/install/mac.txt \
+    html/_sources/install/unix.txt \
+    html/_sources/install/windows.txt \
+    html/_sources/intro/api.txt \
+    html/_sources/intro/consistency.txt \
+    html/_sources/intro/curl.txt \
+    html/_sources/intro/futon.txt \
+    html/_sources/intro/index.txt \
+    html/_sources/intro/overview.txt \
+    html/_sources/intro/security.txt \
+    html/_sources/intro/tour.txt \
+    html/_sources/intro/why.txt \
+    html/_sources/maintenance/compaction.txt \
+    html/_sources/maintenance/index.txt \
+    html/_sources/maintenance/performance.txt \
+    html/_sources/query-server/index.txt \
+    html/_sources/query-server/erlang.txt \
+    html/_sources/query-server/javascript.txt \
+    html/_sources/query-server/protocol.txt \
+    html/_sources/replication/conflicts.txt \
+    html/_sources/replication/index.txt \
+    html/_sources/replication/intro.txt \
+    html/_sources/replication/protocol.txt \
+    html/_sources/replication/replicator.txt \
+    html/_sources/whatsnew/0.8.txt \
+    html/_sources/whatsnew/0.9.txt \
+    html/_sources/whatsnew/0.10.txt \
+    html/_sources/whatsnew/0.11.txt \
+    html/_sources/whatsnew/1.0.txt \
+    html/_sources/whatsnew/1.1.txt \
+    html/_sources/whatsnew/1.2.txt \
+    html/_sources/whatsnew/1.3.txt \
+    html/_sources/whatsnew/1.4.txt \
+    html/_sources/whatsnew/1.5.txt \
+    html/_sources/whatsnew/index.txt \
+    html/_sources/about.txt \
+    html/_sources/contents.txt \
     html/_sources/contributing.txt \
-    html/_sources/ddocs.txt \
-    html/_sources/index.txt \
-    html/_sources/intro.txt \
+    html/_sources/experimental.txt \
+    html/_sources/externals.txt \
     html/_sources/json-structure.txt \
-    html/_sources/query-servers.txt \
-    html/_sources/replication.txt \
-    html/_sources/replicator.txt \
     html/_static/ajax-loader.gif \
     html/_static/basic.css \
     html/_static/comment-bright.png \
@@ -89,28 +190,109 @@
     html/_static/up-pressed.png \
     html/_static/up.png \
     html/_static/websupport.js \
-    html/api/authn.html \
-    html/api/configuration.html \
-    html/api/database.html \
-    html/api/design.html \
-    html/api/documents.html \
+    html/api/basics.html \
+    html/api/index.html \
     html/api/local.html \
-    html/api/misc.html \
-    html/api/reference.html \
-    html/api-basics.html \
-    html/changelog.html \
-    html/changes.html \
-    html/config_reference.html \
-    html/configuring.html \
-    html/ddocs.html \
+    html/api/database/bulk-api.html \
+    html/api/database/changes.html \
+    html/api/database/common.html \
+    html/api/database/compact.html \
+    html/api/database/index.html \
+    html/api/database/misc.html \
+    html/api/database/security.html \
+    html/api/database/temp-views.html \
+    html/api/document/attachments.html \
+    html/api/document/common.html \
+    html/api/document/index.html \
+    html/api/ddoc/common.html \
+    html/api/ddoc/index.html \
+    html/api/ddoc/render.html \
+    html/api/ddoc/rewrites.html \
+    html/api/ddoc/views.html \
+    html/api/server/authn.html \
+    html/api/server/common.html \
+    html/api/server/configuration.html \
+    html/api/server/index.html \
+    html/config/auth.html \
+    html/config/compaction.html \
+    html/config/couchdb.html \
+    html/config/externals.html \
+    html/config/http.html \
+    html/config/http-handlers.html \
+    html/config/index.html \
+    html/config/logging.html \
+    html/config/misc.html \
+    html/config/query-servers.html \
+    html/config/replicator.html \
+    html/config/services.html \
+    html/config/intro.html \
+    html/config/proxying.html \
+    html/couchapp/ddocs.html \
+    html/couchapp/index.html \
+    html/couchapp/views/collation.html \
+    html/couchapp/views/index.html \
+    html/couchapp/views/intro.html \
+    html/couchapp/views/joins.html \
+    html/couchapp/views/nosql.html \
+    html/couchapp/views/pagination.html \
+    html/cve/2010-0009.html \
+    html/cve/2010-2234.html \
+    html/cve/2010-3854.html \
+    html/cve/2012-5641.html \
+    html/cve/2012-5649.html \
+    html/cve/2012-5650.html \
+    html/cve/index.html \
+    html/fauxton/addons.html \
+    html/fauxton/index.html \
+    html/fauxton/install.html \
+    html/install/index.html \
+    html/install/freebsd.html \
+    html/install/mac.html \
+    html/install/unix.html \
+    html/install/windows.html \
+    html/intro/api.html \
+    html/intro/consistency.html \
+    html/intro/curl.html \
+    html/intro/futon.html \
+    html/intro/index.html \
+    html/intro/overview.html \
+    html/intro/security.html \
+    html/intro/tour.html \
+    html/intro/why.html \
+    html/maintenance/compaction.html \
+    html/maintenance/index.html \
+    html/maintenance/performance.html \
+    html/query-server/index.html \
+    html/query-server/erlang.html \
+    html/query-server/javascript.html \
+    html/query-server/protocol.html \
+    html/replication/conflicts.html \
+    html/replication/index.html \
+    html/replication/intro.html \
+    html/replication/protocol.html \
+    html/replication/replicator.html \
+    html/whatsnew/0.8.html \
+    html/whatsnew/0.9.html \
+    html/whatsnew/0.10.html \
+    html/whatsnew/0.11.html \
+    html/whatsnew/1.0.html \
+    html/whatsnew/1.1.html \
+    html/whatsnew/1.2.html \
+    html/whatsnew/1.3.html \
+    html/whatsnew/1.4.html \
+    html/whatsnew/1.5.html \
+    html/whatsnew/index.html \
+    html/about.html \
+    html/config-ref.html \
+    html/contents.html \
+    html/contributing.html \
+    html/download.html \
+    html/experimental.html \
+    html/externals.html \
+    html/http-api.html \
     html/index.html \
-    html/intro.html \
     html/json-structure.html \
-    html/query-servers.html \
-    html/replication.html \
-    html/replicator.html \
     html/objects.inv \
-    html/genindex.html \
     html/search.html \
     html/searchindex.js
 
@@ -128,45 +310,158 @@
     ../images/futon-editeddoc.png \
     ../images/futon-overview.png \
     ../images/futon-replform.png \
-    ../images/logo.png
+    ../images/intro-consistency-01.png \
+    ../images/intro-consistency-02.png \
+    ../images/intro-consistency-03.png \
+    ../images/intro-consistency-04.png \
+    ../images/intro-consistency-05.png \
+    ../images/intro-consistency-06.png \
+    ../images/intro-consistency-07.png \
+    ../images/intro-tour-01.png \
+    ../images/intro-tour-02.png \
+    ../images/intro-tour-03.png \
+    ../images/intro-tour-04.png \
+    ../images/intro-tour-05.png \
+    ../images/intro-tour-06.png \
+    ../images/intro-tour-07.png \
+    ../images/intro-tour-08.png \
+    ../images/intro-tour-09.png \
+    ../images/intro-tour-10.png \
+    ../images/intro-why-01.png \
+    ../images/intro-why-02.png \
+    ../images/intro-why-03.png \
+    ../images/logo.png \
+    ../images/views-intro-01.png \
+    ../images/views-intro-02.png \
+    ../images/views-intro-03.png \
+    ../images/views-intro-04.png
 
 src_files = \
-    ../src/api/authn.rst \
-    ../src/api/configuration.rst \
-    ../src/api/database.rst \
-    ../src/api/design.rst \
-    ../src/api/documents.rst \
+    ../src/api/basics.rst \
+    ../src/api/index.rst \
     ../src/api/local.rst \
-    ../src/api/misc.rst \
-    ../src/api/reference.rst \
-    ../src/api-basics.rst \
-    ../src/changelog.rst \
-    ../src/changes.rst \
-    ../src/config_reference.rst \
-    ../src/configuring.rst \
+    ../src/api/database/bulk-api.rst \
+    ../src/api/database/changes.rst \
+    ../src/api/database/common.rst \
+    ../src/api/database/compact.rst \
+    ../src/api/database/index.rst \
+    ../src/api/database/misc.rst \
+    ../src/api/database/security.rst \
+    ../src/api/database/temp-views.rst \
+    ../src/api/document/attachments.rst \
+    ../src/api/document/common.rst \
+    ../src/api/document/index.rst \
+    ../src/api/ddoc/common.rst \
+    ../src/api/ddoc/index.rst \
+    ../src/api/ddoc/render.rst \
+    ../src/api/ddoc/rewrites.rst \
+    ../src/api/ddoc/views.rst \
+    ../src/api/server/authn.rst \
+    ../src/api/server/common.rst \
+    ../src/api/server/configuration.rst \
+    ../src/api/server/index.rst \
+    ../src/config/auth.rst \
+    ../src/config/compaction.rst \
+    ../src/config/couchdb.rst \
+    ../src/config/externals.rst \
+    ../src/config/http.rst \
+    ../src/config/http-handlers.rst \
+    ../src/config/index.rst \
+    ../src/config/logging.rst \
+    ../src/config/misc.rst \
+    ../src/config/query-servers.rst \
+    ../src/config/replicator.rst \
+    ../src/config/services.rst \
+    ../src/config/intro.rst \
+    ../src/config/proxying.rst \
+    ../src/couchapp/ddocs.rst \
+    ../src/couchapp/index.rst \
+    ../src/couchapp/views/collation.rst \
+    ../src/couchapp/views/index.rst \
+    ../src/couchapp/views/intro.rst \
+    ../src/couchapp/views/joins.rst \
+    ../src/couchapp/views/nosql.rst \
+    ../src/couchapp/views/pagination.rst \
+    ../src/cve/2010-0009.rst \
+    ../src/cve/2010-2234.rst \
+    ../src/cve/2010-3854.rst \
+    ../src/cve/2012-5641.rst \
+    ../src/cve/2012-5649.rst \
+    ../src/cve/2012-5650.rst \
+    ../src/cve/index.rst \
+    ../src/fauxton/addons.rst \
+    ../src/fauxton/index.rst \
+    ../src/fauxton/install.rst \
+    ../src/install/index.rst \
+    ../src/install/freebsd.rst \
+    ../src/install/mac.rst \
+    ../src/install/unix.rst \
+    ../src/install/windows.rst \
+    ../src/intro/api.rst \
+    ../src/intro/consistency.rst \
+    ../src/intro/curl.rst \
+    ../src/intro/futon.rst \
+    ../src/intro/index.rst \
+    ../src/intro/overview.rst \
+    ../src/intro/security.rst \
+    ../src/intro/tour.rst \
+    ../src/intro/why.rst \
+    ../src/maintenance/compaction.rst \
+    ../src/maintenance/index.rst \
+    ../src/maintenance/performance.rst \
+    ../src/query-server/index.rst \
+    ../src/query-server/erlang.rst \
+    ../src/query-server/javascript.rst \
+    ../src/query-server/protocol.rst \
+    ../src/replication/conflicts.rst \
+    ../src/replication/index.rst \
+    ../src/replication/intro.rst \
+    ../src/replication/protocol.rst \
+    ../src/replication/replicator.rst \
+    ../src/whatsnew/0.8.rst \
+    ../src/whatsnew/0.9.rst \
+    ../src/whatsnew/0.10.rst \
+    ../src/whatsnew/0.11.rst \
+    ../src/whatsnew/1.0.rst \
+    ../src/whatsnew/1.1.rst \
+    ../src/whatsnew/1.2.rst \
+    ../src/whatsnew/1.3.rst \
+    ../src/whatsnew/1.4.rst \
+    ../src/whatsnew/1.5.rst \
+    ../src/whatsnew/index.rst \
+    ../src/about.rst \
+    ../src/contents.rst \
+    ../src/experimental.rst \
     ../src/contributing.rst \
-    ../src/ddocs.rst \
-    ../src/index.rst \
-    ../src/intro.rst \
+    ../src/externals.rst \
     ../src/json-structure.rst \
-    ../src/query-servers.rst \
-    ../src/replication.rst \
-    ../src/replicator.rst \
     ../src/conf.py
 
 src_files_html = \
     ../static/rtd.css \
+    ../templates/couchdb/domainindex.html \
+    ../templates/couchdb/theme.conf \
+    ../templates/pages/download.html \
+    ../templates/pages/index.html \
+    ../templates/layout.html \
     ../templates/help.html \
     ../templates/searchbox.html \
     ../templates/utilities.html
 
+sphinx_extensions = \
+    ../ext/configdomain.py \
+    ../ext/github.py \
+    ../ext/httpdomain.py \
+    ../ext/http-api-descr.json
+
 EXTRA_DIST = \
     $(image_files) \
     $(src_files) \
     $(src_files_html) \
     $(info_file_build) \
     $(pdf_file_build) \
-    $(html_files_build)
+    $(html_files_build) \
+    $(sphinx_extensions)
 
 BUILT_SOURCES = \
     $(info_file_build) \
 
=== modified file 'share/doc/build/Makefile.in'
--- share/doc/build/Makefile.in	2013-08-28 18:21:32 +0000
+++ share/doc/build/Makefile.in	2013-12-01 23:56:33 +0000
@@ -106,6 +106,7 @@
 ERLANG_FLAGS = @ERLANG_FLAGS@
 ERLC = @ERLC@
 ERLC_FLAGS = @ERLC_FLAGS@
+ESCRIPT = @ESCRIPT@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FLAGS = @FLAGS@
@@ -194,6 +195,8 @@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
+erlangbin = @erlangbin@
+erlangversion = @erlangversion@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -271,27 +274,128 @@
     html/_images/futon-editeddoc.png \
     html/_images/futon-overview.png \
     html/_images/futon-replform.png \
-    html/_sources/api/authn.txt \
-    html/_sources/api/configuration.txt \
-    html/_sources/api/database.txt \
-    html/_sources/api/design.txt \
-    html/_sources/api/documents.txt \
+    html/_images/intro-consistency-01.png \
+    html/_images/intro-consistency-02.png \
+    html/_images/intro-consistency-03.png \
+    html/_images/intro-consistency-04.png \
+    html/_images/intro-consistency-05.png \
+    html/_images/intro-consistency-06.png \
+    html/_images/intro-consistency-07.png \
+    html/_images/intro-tour-01.png \
+    html/_images/intro-tour-02.png \
+    html/_images/intro-tour-03.png \
+    html/_images/intro-tour-04.png \
+    html/_images/intro-tour-05.png \
+    html/_images/intro-tour-06.png \
+    html/_images/intro-tour-07.png \
+    html/_images/intro-tour-08.png \
+    html/_images/intro-tour-09.png \
+    html/_images/intro-tour-10.png \
+    html/_images/intro-why-01.png \
+    html/_images/intro-why-02.png \
+    html/_images/intro-why-03.png \
+    html/_images/views-intro-01.png \
+    html/_images/views-intro-02.png \
+    html/_images/views-intro-03.png \
+    html/_images/views-intro-04.png \
+    html/_sources/api/basics.txt \
+    html/_sources/api/index.txt \
     html/_sources/api/local.txt \
-    html/_sources/api/misc.txt \
-    html/_sources/api/reference.txt \
-    html/_sources/api-basics.txt \
-    html/_sources/changelog.txt \
-    html/_sources/changes.txt \
-    html/_sources/config_reference.txt \
-    html/_sources/configuring.txt \
+    html/_sources/api/database/bulk-api.txt \
+    html/_sources/api/database/changes.txt \
+    html/_sources/api/database/common.txt \
+    html/_sources/api/database/compact.txt \
+    html/_sources/api/database/index.txt \
+    html/_sources/api/database/misc.txt \
+    html/_sources/api/database/security.txt \
+    html/_sources/api/database/temp-views.txt \
+    html/_sources/api/document/attachments.txt \
+    html/_sources/api/document/common.txt \
+    html/_sources/api/document/index.txt \
+    html/_sources/api/ddoc/common.txt \
+    html/_sources/api/ddoc/index.txt \
+    html/_sources/api/ddoc/render.txt \
+    html/_sources/api/ddoc/rewrites.txt \
+    html/_sources/api/ddoc/views.txt \
+    html/_sources/api/server/authn.txt \
+    html/_sources/api/server/common.txt \
+    html/_sources/api/server/configuration.txt \
+    html/_sources/api/server/index.txt \
+    html/_sources/config/auth.txt \
+    html/_sources/config/compaction.txt \
+    html/_sources/config/couchdb.txt \
+    html/_sources/config/externals.txt \
+    html/_sources/config/http.txt \
+    html/_sources/config/http-handlers.txt \
+    html/_sources/config/index.txt \
+    html/_sources/config/logging.txt \
+    html/_sources/config/misc.txt \
+    html/_sources/config/query-servers.txt \
+    html/_sources/config/replicator.txt \
+    html/_sources/config/services.txt \
+    html/_sources/config/intro.txt \
+    html/_sources/config/proxying.txt \
+    html/_sources/couchapp/ddocs.txt \
+    html/_sources/couchapp/index.txt \
+    html/_sources/couchapp/views/collation.txt \
+    html/_sources/couchapp/views/index.txt \
+    html/_sources/couchapp/views/intro.txt \
+    html/_sources/couchapp/views/joins.txt \
+    html/_sources/couchapp/views/nosql.txt \
+    html/_sources/couchapp/views/pagination.txt \
+    html/_sources/cve/2010-0009.txt \
+    html/_sources/cve/2010-2234.txt \
+    html/_sources/cve/2010-3854.txt \
+    html/_sources/cve/2012-5641.txt \
+    html/_sources/cve/2012-5649.txt \
+    html/_sources/cve/2012-5650.txt \
+    html/_sources/cve/index.txt \
+    html/_sources/fauxton/addons.txt \
+    html/_sources/fauxton/index.txt \
+    html/_sources/fauxton/install.txt \
+    html/_sources/install/index.txt \
+    html/_sources/install/freebsd.txt \
+    html/_sources/install/mac.txt \
+    html/_sources/install/unix.txt \
+    html/_sources/install/windows.txt \
+    html/_sources/intro/api.txt \
+    html/_sources/intro/consistency.txt \
+    html/_sources/intro/curl.txt \
+    html/_sources/intro/futon.txt \
+    html/_sources/intro/index.txt \
+    html/_sources/intro/overview.txt \
+    html/_sources/intro/security.txt \
+    html/_sources/intro/tour.txt \
+    html/_sources/intro/why.txt \
+    html/_sources/maintenance/compaction.txt \
+    html/_sources/maintenance/index.txt \
+    html/_sources/maintenance/performance.txt \
+    html/_sources/query-server/index.txt \
+    html/_sources/query-server/erlang.txt \
+    html/_sources/query-server/javascript.txt \
+    html/_sources/query-server/protocol.txt \
+    html/_sources/replication/conflicts.txt \
+    html/_sources/replication/index.txt \
+    html/_sources/replication/intro.txt \
+    html/_sources/replication/protocol.txt \
+    html/_sources/replication/replicator.txt \
+    html/_sources/whatsnew/0.8.txt \
+    html/_sources/whatsnew/0.9.txt \
+    html/_sources/whatsnew/0.10.txt \
+    html/_sources/whatsnew/0.11.txt \
+    html/_sources/whatsnew/1.0.txt \
+    html/_sources/whatsnew/1.1.txt \
+    html/_sources/whatsnew/1.2.txt \
+    html/_sources/whatsnew/1.3.txt \
+    html/_sources/whatsnew/1.4.txt \
+    html/_sources/whatsnew/1.5.txt \
+    html/_sources/whatsnew/index.txt \
+    html/_sources/about.txt \
+    html/_sources/contents.txt \
     html/_sources/contributing.txt \
-    html/_sources/ddocs.txt \
-    html/_sources/index.txt \
-    html/_sources/intro.txt \
+    html/_sources/experimental.txt \
+    html/_sources/externals.txt \
     html/_sources/json-structure.txt \
-    html/_sources/query-servers.txt \
-    html/_sources/replication.txt \
-    html/_sources/replicator.txt \
     html/_static/ajax-loader.gif \
     html/_static/basic.css \
     html/_static/comment-bright.png \
@@ -315,28 +419,109 @@
     html/_static/up-pressed.png \
     html/_static/up.png \
     html/_static/websupport.js \
-    html/api/authn.html \
-    html/api/configuration.html \
-    html/api/database.html \
-    html/api/design.html \
-    html/api/documents.html \
+    html/api/basics.html \
+    html/api/index.html \
     html/api/local.html \
-    html/api/misc.html \
-    html/api/reference.html \
-    html/api-basics.html \
-    html/changelog.html \
-    html/changes.html \
-    html/config_reference.html \
-    html/configuring.html \
-    html/ddocs.html \
+    html/api/database/bulk-api.html \
+    html/api/database/changes.html \
+    html/api/database/common.html \
+    html/api/database/compact.html \
+    html/api/database/index.html \
+    html/api/database/misc.html \
+    html/api/database/security.html \
+    html/api/database/temp-views.html \
+    html/api/document/attachments.html \
+    html/api/document/common.html \
+    html/api/document/index.html \
+    html/api/ddoc/common.html \
+    html/api/ddoc/index.html \
+    html/api/ddoc/render.html \
+    html/api/ddoc/rewrites.html \
+    html/api/ddoc/views.html \
+    html/api/server/authn.html \
+    html/api/server/common.html \
+    html/api/server/configuration.html \
+    html/api/server/index.html \
+    html/config/auth.html \
+    html/config/compaction.html \
+    html/config/couchdb.html \
+    html/config/externals.html \
+    html/config/http.html \
+    html/config/http-handlers.html \
+    html/config/index.html \
+    html/config/logging.html \
+    html/config/misc.html \
+    html/config/query-servers.html \
+    html/config/replicator.html \
+    html/config/services.html \
+    html/config/intro.html \
+    html/config/proxying.html \
+    html/couchapp/ddocs.html \
+    html/couchapp/index.html \
+    html/couchapp/views/collation.html \
+    html/couchapp/views/index.html \
+    html/couchapp/views/intro.html \
+    html/couchapp/views/joins.html \
+    html/couchapp/views/nosql.html \
+    html/couchapp/views/pagination.html \
+    html/cve/2010-0009.html \
+    html/cve/2010-2234.html \
+    html/cve/2010-3854.html \
+    html/cve/2012-5641.html \
+    html/cve/2012-5649.html \
+    html/cve/2012-5650.html \
+    html/cve/index.html \
+    html/fauxton/addons.html \
+    html/fauxton/index.html \
+    html/fauxton/install.html \
+    html/install/index.html \
+    html/install/freebsd.html \
+    html/install/mac.html \
+    html/install/unix.html \
+    html/install/windows.html \
+    html/intro/api.html \
+    html/intro/consistency.html \
+    html/intro/curl.html \
+    html/intro/futon.html \
+    html/intro/index.html \
+    html/intro/overview.html \
+    html/intro/security.html \
+    html/intro/tour.html \
+    html/intro/why.html \
+    html/maintenance/compaction.html \
+    html/maintenance/index.html \
+    html/maintenance/performance.html \
+    html/query-server/index.html \
+    html/query-server/erlang.html \
+    html/query-server/javascript.html \
+    html/query-server/protocol.html \
+    html/replication/conflicts.html \
+    html/replication/index.html \
+    html/replication/intro.html \
+    html/replication/protocol.html \
+    html/replication/replicator.html \
+    html/whatsnew/0.8.html \
+    html/whatsnew/0.9.html \
+    html/whatsnew/0.10.html \
+    html/whatsnew/0.11.html \
+    html/whatsnew/1.0.html \
+    html/whatsnew/1.1.html \
+    html/whatsnew/1.2.html \
+    html/whatsnew/1.3.html \
+    html/whatsnew/1.4.html \
+    html/whatsnew/1.5.html \
+    html/whatsnew/index.html \
+    html/about.html \
+    html/config-ref.html \
+    html/contents.html \
+    html/contributing.html \
+    html/download.html \
+    html/experimental.html \
+    html/externals.html \
+    html/http-api.html \
     html/index.html \
-    html/intro.html \
     html/json-structure.html \
-    html/query-servers.html \
-    html/replication.html \
-    html/replicator.html \
     html/objects.inv \
-    html/genindex.html \
     html/search.html \
     html/searchindex.js
 
@@ -350,45 +535,158 @@
     ../images/futon-editeddoc.png \
     ../images/futon-overview.png \
     ../images/futon-replform.png \
-    ../images/logo.png
+    ../images/intro-consistency-01.png \
+    ../images/intro-consistency-02.png \
+    ../images/intro-consistency-03.png \
+    ../images/intro-consistency-04.png \
+    ../images/intro-consistency-05.png \
+    ../images/intro-consistency-06.png \
+    ../images/intro-consistency-07.png \
+    ../images/intro-tour-01.png \
+    ../images/intro-tour-02.png \
+    ../images/intro-tour-03.png \
+    ../images/intro-tour-04.png \
+    ../images/intro-tour-05.png \
+    ../images/intro-tour-06.png \
+    ../images/intro-tour-07.png \
+    ../images/intro-tour-08.png \
+    ../images/intro-tour-09.png \
+    ../images/intro-tour-10.png \
+    ../images/intro-why-01.png \
+    ../images/intro-why-02.png \
+    ../images/intro-why-03.png \
+    ../images/logo.png \
+    ../images/views-intro-01.png \
+    ../images/views-intro-02.png \
+    ../images/views-intro-03.png \
+    ../images/views-intro-04.png
 
 src_files = \
-    ../src/api/authn.rst \
-    ../src/api/configuration.rst \
-    ../src/api/database.rst \
-    ../src/api/design.rst \
-    ../src/api/documents.rst \
+    ../src/api/basics.rst \
+    ../src/api/index.rst \
     ../src/api/local.rst \
-    ../src/api/misc.rst \
-    ../src/api/reference.rst \
-    ../src/api-basics.rst \
-    ../src/changelog.rst \
-    ../src/changes.rst \
-    ../src/config_reference.rst \
-    ../src/configuring.rst \
+    ../src/api/database/bulk-api.rst \
+    ../src/api/database/changes.rst \
+    ../src/api/database/common.rst \
+    ../src/api/database/compact.rst \
+    ../src/api/database/index.rst \
+    ../src/api/database/misc.rst \
+    ../src/api/database/security.rst \
+    ../src/api/database/temp-views.rst \
+    ../src/api/document/attachments.rst \
+    ../src/api/document/common.rst \
+    ../src/api/document/index.rst \
+    ../src/api/ddoc/common.rst \
+    ../src/api/ddoc/index.rst \
+    ../src/api/ddoc/render.rst \
+    ../src/api/ddoc/rewrites.rst \
+    ../src/api/ddoc/views.rst \
+    ../src/api/server/authn.rst \
+    ../src/api/server/common.rst \
+    ../src/api/server/configuration.rst \
+    ../src/api/server/index.rst \
+    ../src/config/auth.rst \
+    ../src/config/compaction.rst \
+    ../src/config/couchdb.rst \
+    ../src/config/externals.rst \
+    ../src/config/http.rst \
+    ../src/config/http-handlers.rst \
+    ../src/config/index.rst \
+    ../src/config/logging.rst \
+    ../src/config/misc.rst \
+    ../src/config/query-servers.rst \
+    ../src/config/replicator.rst \
+    ../src/config/services.rst \
+    ../src/config/intro.rst \
+    ../src/config/proxying.rst \
+    ../src/couchapp/ddocs.rst \
+    ../src/couchapp/index.rst \
+    ../src/couchapp/views/collation.rst \
+    ../src/couchapp/views/index.rst \
+    ../src/couchapp/views/intro.rst \
+    ../src/couchapp/views/joins.rst \
+    ../src/couchapp/views/nosql.rst \
+    ../src/couchapp/views/pagination.rst \
+    ../src/cve/2010-0009.rst \
+    ../src/cve/2010-2234.rst \
+    ../src/cve/2010-3854.rst \
+    ../src/cve/2012-5641.rst \
+    ../src/cve/2012-5649.rst \
+    ../src/cve/2012-5650.rst \
+    ../src/cve/index.rst \
+    ../src/fauxton/addons.rst \
+    ../src/fauxton/index.rst \
+    ../src/fauxton/install.rst \
+    ../src/install/index.rst \
+    ../src/install/freebsd.rst \
+    ../src/install/mac.rst \
+    ../src/install/unix.rst \
+    ../src/install/windows.rst \
+    ../src/intro/api.rst \
+    ../src/intro/consistency.rst \
+    ../src/intro/curl.rst \
+    ../src/intro/futon.rst \
+    ../src/intro/index.rst \
+    ../src/intro/overview.rst \
+    ../src/intro/security.rst \
+    ../src/intro/tour.rst \
+    ../src/intro/why.rst \
+    ../src/maintenance/compaction.rst \
+    ../src/maintenance/index.rst \
+    ../src/maintenance/performance.rst \
+    ../src/query-server/index.rst \
+    ../src/query-server/erlang.rst \
+    ../src/query-server/javascript.rst \
+    ../src/query-server/protocol.rst \
+    ../src/replication/conflicts.rst \
+    ../src/replication/index.rst \
+    ../src/replication/intro.rst \
+    ../src/replication/protocol.rst \
+    ../src/replication/replicator.rst \
+    ../src/whatsnew/0.8.rst \
+    ../src/whatsnew/0.9.rst \
+    ../src/whatsnew/0.10.rst \
+    ../src/whatsnew/0.11.rst \
+    ../src/whatsnew/1.0.rst \
+    ../src/whatsnew/1.1.rst \
+    ../src/whatsnew/1.2.rst \
+    ../src/whatsnew/1.3.rst \
+    ../src/whatsnew/1.4.rst \
+    ../src/whatsnew/1.5.rst \
+    ../src/whatsnew/index.rst \
+    ../src/about.rst \
+    ../src/contents.rst \
+    ../src/experimental.rst \
     ../src/contributing.rst \
-    ../src/ddocs.rst \
-    ../src/index.rst \
-    ../src/intro.rst \
+    ../src/externals.rst \
     ../src/json-structure.rst \
-    ../src/query-servers.rst \
-    ../src/replication.rst \
-    ../src/replicator.rst \
     ../src/conf.py
 
 src_files_html = \
     ../static/rtd.css \
+    ../templates/couchdb/domainindex.html \
+    ../templates/couchdb/theme.conf \
+    ../templates/pages/download.html \
+    ../templates/pages/index.html \
+    ../templates/layout.html \
     ../templates/help.html \
     ../templates/searchbox.html \
     ../templates/utilities.html
 
+sphinx_extensions = \
+    ../ext/configdomain.py \
+    ../ext/github.py \
+    ../ext/httpdomain.py \
+    ../ext/http-api-descr.json
+
 EXTRA_DIST = \
     $(image_files) \
     $(src_files) \
     $(src_files_html) \
     $(info_file_build) \
     $(pdf_file_build) \
-    $(html_files_build)
+    $(html_files_build) \
+    $(sphinx_extensions)
 
 BUILT_SOURCES = \
     $(info_file_build) \
 
=== modified file 'share/doc/build/html/_images/futon-editdoc.png'
 Binary files share/doc/build/html/_images/futon-editdoc.png	2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-editdoc.png	2013-12-01 23:56:33 +0000 differ
=== modified file 'share/doc/build/html/_images/futon-editeddoc.png'
 Binary files share/doc/build/html/_images/futon-editeddoc.png	2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-editeddoc.png	2013-12-01 23:56:33 +0000 differ
=== modified file 'share/doc/build/html/_images/futon-overview.png'
 Binary files share/doc/build/html/_images/futon-overview.png	2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-overview.png	2013-12-01 23:56:33 +0000 differ
=== modified file 'share/doc/build/html/_images/futon-replform.png'
 Binary files share/doc/build/html/_images/futon-replform.png	2013-08-28 18:21:32 +0000 and share/doc/build/html/_images/futon-replform.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-01.png'
 Binary files share/doc/build/html/_images/intro-consistency-01.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-01.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-02.png'
 Binary files share/doc/build/html/_images/intro-consistency-02.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-02.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-03.png'
 Binary files share/doc/build/html/_images/intro-consistency-03.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-03.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-04.png'
 Binary files share/doc/build/html/_images/intro-consistency-04.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-04.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-05.png'
 Binary files share/doc/build/html/_images/intro-consistency-05.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-05.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-06.png'
 Binary files share/doc/build/html/_images/intro-consistency-06.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-06.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-consistency-07.png'
 Binary files share/doc/build/html/_images/intro-consistency-07.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-consistency-07.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-01.png'
 Binary files share/doc/build/html/_images/intro-tour-01.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-01.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-02.png'
 Binary files share/doc/build/html/_images/intro-tour-02.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-02.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-03.png'
 Binary files share/doc/build/html/_images/intro-tour-03.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-03.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-04.png'
 Binary files share/doc/build/html/_images/intro-tour-04.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-04.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-05.png'
 Binary files share/doc/build/html/_images/intro-tour-05.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-05.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-06.png'
 Binary files share/doc/build/html/_images/intro-tour-06.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-06.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-07.png'
 Binary files share/doc/build/html/_images/intro-tour-07.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-07.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-08.png'
 Binary files share/doc/build/html/_images/intro-tour-08.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-08.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-09.png'
 Binary files share/doc/build/html/_images/intro-tour-09.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-09.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-tour-10.png'
 Binary files share/doc/build/html/_images/intro-tour-10.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-tour-10.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-why-01.png'
 Binary files share/doc/build/html/_images/intro-why-01.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-01.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-why-02.png'
 Binary files share/doc/build/html/_images/intro-why-02.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-02.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/intro-why-03.png'
 Binary files share/doc/build/html/_images/intro-why-03.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/intro-why-03.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/views-intro-01.png'
 Binary files share/doc/build/html/_images/views-intro-01.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-01.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/views-intro-02.png'
 Binary files share/doc/build/html/_images/views-intro-02.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-02.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/views-intro-03.png'
 Binary files share/doc/build/html/_images/views-intro-03.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-03.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_images/views-intro-04.png'
 Binary files share/doc/build/html/_images/views-intro-04.png	1970-01-01 00:00:00 +0000 and share/doc/build/html/_images/views-intro-04.png	2013-12-01 23:56:33 +0000 differ
=== added file 'share/doc/build/html/_sources/about.txt'
--- share/doc/build/html/_sources/about.txt	1970-01-01 00:00:00 +0000
+++ share/doc/build/html/_sources/about.txt	2013-12-01 23:56:33 +0000
@@ -0,0 +1,25 @@
+.. 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.
+
+
+.. _about:
+
+===========================
+About CouchDB Documentation
+===========================
+
+License
+=======
+
+.. literalinclude:: ../../../LICENSE
+   :lines: 1-202
+
 
=== removed file 'share/doc/build/html/_sources/api-basics.txt'
--- share/doc/build/html/_sources/api-basics.txt	2013-08-28 18:21:32 +0000
+++ share/doc/build/html/_sources/api-basics.txt	1970-01-01 00:00:00 +0000
@@ -1,463 +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-basics:
-
-==========
-API Basics
-==========
-
-The CouchDB API is the primary method of interfacing to a CouchDB
-instance. Requests are made using HTTP and requests are used to request
-information from the database, store new data, and perform views and
-formatting of the information stored within the documents.
-
-Requests to the API can be categorised by the different areas of the
-CouchDB system that you are accessing, and the HTTP method used to send
-the request. Different methods imply different operations, for example
-retrieval of information from the database is typically handled by the
-``GET`` operation, while updates are handled by either a ``POST`` or
-``PUT`` request. There are some differences between the information that
-must be supplied for the different methods. For a guide to the basic
-HTTP methods and request structure, see :ref:`api-format`.
-
-For nearly all operations, the submitted data, and the returned data
-structure, is defined within a JavaScript Object Notation (JSON) object.
-Basic information on the content and data types for JSON are provided in
-:ref:`json`.
-
-Errors when accessing the CouchDB API are reported using standard HTTP
-Status Codes. A guide to the generic codes returned by CouchDB are
-provided in :ref:`errors`.
-
-When accessing specific areas of the CouchDB API, specific information
-and examples on the HTTP methods and request, JSON structures, and error
-codes are provided. For a guide to the different areas of the API, see
-:ref:`api-overview`.
-
-.. _api-format:
-
-Request Format and Responses
-============================
-
-CouchDB supports the following HTTP request methods:
-
--  ``GET``
-
-   Request the specified item. As with normal HTTP requests, the format
-   of the URL defines what is returned. With CouchDB this can include
-   static items, database documents, and configuration and statistical
-   information. In most cases the information is returned in the form of
-   a JSON document.
-
--  ``HEAD``
-
-   The ``HEAD`` method is used to get the HTTP header of a ``GET``
-   request without the body of the response.
-
--  ``POST``
-
-   Upload data. Within CouchDB ``POST`` is used to set values, including
-   uploading documents, setting document values, and starting certain
-   administration commands.
-
--  ``PUT``
-
-   Used to put a specified resource. In CouchDB ``PUT`` is used to
-   create new objects, including databases, documents, views and design
-   documents.
-
--  ``DELETE``
-
-   Deletes the specified resource, including documents, views, and
-   design documents.
-
--  ``COPY``
-
-   A special method that can be used to copy documents and objects.
-
-If you use the an unsupported HTTP request type with a URL that does not
-support the specified type, a 405 error will be returned, listing the
-supported HTTP methods. For example:
-
-.. code-block:: javascript
-
-    {
-        "error":"method_not_allowed",
-        "reason":"Only GET,HEAD allowed"
-    }
-          
-
-The CouchDB design document API and the functions when returning HTML
-(for example as part of a show or list) enables you to include custom
-HTTP headers through the ``headers`` block of the return object.
-
-HTTP Headers
-============
-
-Because CouchDB uses HTTP for all communication, you need to ensure that
-the correct HTTP headers are supplied (and processed on retrieval) so
-that you get the right format and encoding. Different environments and
-clients will be more or less strict on the effect of these HTTP headers
-(especially when not present). Where possible you should be as specific
-as possible.
-
-Request Headers
----------------
-
--  ``Content-type``
-
-   Specifies the content type of the information being supplied within
-   the request. The specification uses MIME type specifications. For the
-   majority of requests this will be JSON (``application/json``). For
-   some settings the MIME type will be plain text. When uploading
-   attachments it should be the corresponding MIME type for the
-   attachment or binary (``application/octet-stream``).
-
-   The use of the ``Content-type`` on a request is highly recommended.
-
--  ``Accept``
-
-   Specifies the list of accepted data types to be returned by the
-   server (i.e. that are accepted/understandable by the client). The
-   format should be a list of one or more MIME types, separated by
-   colons.
-
-   For the majority of requests the definition should be for JSON data
-   (``application/json``). For attachments you can either specify the
-   MIME type explicitly, or use ``*/*`` to specify that all file types
-   are supported. If the ``Accept`` header is not supplied, then the
-   ``*/*`` MIME type is assumed (i.e. client accepts all formats).
-
-   The use of ``Accept`` in queries for CouchDB is not required, but is
-   highly recommended as it helps to ensure that the data returned can
-   be processed by the client.
-
-   If you specify a data type using the ``Accept`` header, CouchDB will
-   honor the specified type in the ``Content-type`` header field
-   returned. For example, if you explicitly request ``application/json``
-   in the ``Accept`` of a request, the returned HTTP headers will use
-   the value in the returned ``Content-type`` field.
-
-   For example, when sending a request without an explicit ``Accept``
-   header, or when specifying ``*/*``:
-
-   .. code-block:: http
-
-       GET /recipes HTTP/1.1
-       Host: couchdb:5984
-       Accept: */*
-
-   The returned headers are:
-
-   .. code-block:: http
-
-       Server: CouchDB/1.0.1 (Erlang OTP/R13B)
-       Date: Thu, 13 Jan 2011 13:39:34 GMT
-       Content-Type: text/plain;charset=utf-8
-       Content-Length: 227
-       Cache-Control: must-revalidate
-
-   Note that the returned content type is ``text/plain`` even though the
-   information returned by the request is in JSON format.
-
-   Explicitly specifying the ``Accept`` header:
-
-   .. code-block:: http
-
-       GET /recipes HTTP/1.1
-       Host: couchdb:5984
-       Accept: application/json
-
-   The headers returned include the ``application/json`` content type:
-
-   .. code-block:: http
-
-       Server: CouchDB/|version| (Erlang OTP/R13B)
-       Date: Thu, 13 Jan 2011 13:40:11 GMT
-       Content-Type: application/json
-       Content-Length: 227
-       Cache-Control: must-revalidate
-
-Response Headers
-----------------
-
-Response headers are returned by the server when sending back content
-and include a number of different header fields, many of which are
-standard HTTP response header and have no significance to CouchDB
-operation. The list of response headers important to CouchDB are listed
-below.
-
--  ``Content-type``
-
-   Specifies the MIME type of the returned data. For most request, the
-   returned MIME type is ``text/plain``. All text is encoded in Unicode
-   (UTF-8), and this is explicitly stated in the returned
-   ``Content-type``, as ``text/plain;charset=utf-8``.
-
--  ``Cache-control``
-
-   The cache control HTTP response header provides a suggestion for
-   client caching mechanisms on how to treat the returned information.
-   CouchDB typically returns the ``must-revalidate``, which indicates
-   that the information should be revalidated if possible. This is used
-   to ensure that the dynamic nature of the content is correctly
-   updated.
-
--  ``Content-length``
-
-   The length (in bytes) of the returned content.
-
--  ``Etag``
-
-   The ``Etag`` HTTP header field is used to show the revision for a
-   document, or a view.
-
-   ETags have been assigned to a map/reduce group (the collection of
-   views in a single design document). Any change to any of the indexes
-   for those views would generate a new ETag for all view URL's in a
-   single design doc, even if that specific view's results had not
-   changed.
-
-   Each ``_view`` URL has its own ETag which only gets updated when
-   changes are made to the database that effect that index. If the
-   index for that specific view does not change, that view keeps the
-   original ETag head (therefore sending back 304 Not Modified more
-   often).
-
-.. _json:
-
-JSON Basics
-===========
-
-The majority of requests and responses to CouchDB use the JavaScript
-Object Notation (JSON) for formatting the content and structure of the
-data and responses.
-
-JSON is used because it is the simplest and easiest to use solution for
-working with data within a web browser, as JSON structures can be
-evaluated and used as JavaScript objects within the web browser
-environment. JSON also integrates with the server-side JavaScript used
-within CouchDB.
-
-JSON supports the same basic types as supported by JavaScript, these
-are:
-
--  Number (either integer or floating-point).
-
--  String; this should be enclosed by double-quotes and supports Unicode
-   characters and backslash escaping. For example:
-
-   .. code-block:: javascript
-
-       "A String"
-
--  Boolean - a ``true`` or ``false`` value. You can use these strings
-   directly. For example:
-
-   .. code-block:: javascript
-
-       { "value": true}
-
--  Array - a list of values enclosed in square brackets. For example:
-
-   .. code-block:: javascript
-
-       ["one", "two", "three"]
-
--  Object - a set of key/value pairs (i.e. an associative array, or
-   hash). The key must be a string, but the value can be any of the
-   supported JSON values. For example:
-
-   .. code-block:: javascript
-
-       {
-          "servings" : 4,
-          "subtitle" : "Easy to make in advance, and then cook when ready",
-          "cooktime" : 60,
-          "title" : "Chicken Coriander"
-       }
-           
-
-   In CouchDB, the JSON object is used to represent a variety of
-   structures, including the main CouchDB document.
-
-Parsing JSON into a JavaScript object is supported through the
-``JSON.parse()`` function in JavaScript, or through various libraries that
-will perform the parsing of the content into a JavaScript object for
-you. Libraries for parsing and generating JSON are available in many
-languages, including Perl, Python, Ruby, Erlang and others.
-
-.. warning::
-   Care should be taken to ensure that your JSON structures are
-   valid, invalid structures will cause CouchDB to return an HTTP status code
-   of 500 (server error).
-
-.. _errors:
-
-HTTP Status Codes
-=================
-
-With the interface to CouchDB working through HTTP, error codes and
-statuses are reported using a combination of the HTTP status code
-number, and corresponding data in the body of the response data.
-
-A list of the error codes returned by CouchDB, and generic descriptions
-of the related errors are provided below. The meaning of different
-status codes for specific request types are provided in the
-corresponding API call reference.
-
--  ``200 - OK``
-
-   Request completed successfully.
-
--  ``201 - Created``
-
-   Document created successfully.
-
--  ``202 - Accepted``
-
-   Request has been accepted, but the corresponding operation may not
-   have completed. This is used for background operations, such as
-   database compaction.
-
--  ``304 - Not Modified``
-
-   The additional content requested has not been modified. This is used
-   with the ETag system to identify the version of information returned.
-
--  ``400 - Bad Request``
-
-   Bad request structure. The error can indicate an error with the
-   request URL, path or headers. Differences in the supplied MD5 hash
-   and content also trigger this error, as this may indicate message
-   corruption.
-
--  ``401 - Unauthorized``
-
-   The item requested was not available using the supplied
-   authorization, or authorization was not supplied.
-
--  ``403 - Forbidden``
-
-   The requested item or operation is forbidden.
-
--  ``404 - Not Found``
-
-   The requested content could not be found. The content will include
-   further information, as a JSON object, if available. The structure
-   will contain two keys, ``error`` and ``reason``. For example:
-
-   .. code-block:: javascript
-
-       {"error":"not_found","reason":"no_db_file"}
-
--  ``405 - Resource Not Allowed``
-
-   A request was made using an invalid HTTP request type for the URL
-   requested. For example, you have requested a ``PUT`` when a ``POST``
-   is required. Errors of this type can also triggered by invalid URL
-   strings.
-
--  ``406 - Not Acceptable``
-
-   The requested content type is not supported by the server.
-
--  ``409 - Conflict``
-
-   Request resulted in an update conflict.
-
--  ``412 - Precondition Failed``
-
-   The request headers from the client and the capabilities of the
-   server do not match.
-
--  ``415 - Bad Content Type``
-
-   The content types supported, and the content type of the information
-   being requested or submitted indicate that the content type is not
-   supported.
-
--  ``416 - Requested Range Not Satisfiable``
-
-   The range specified in the request header cannot be satisfied by the
-   server.
-
--  ``417 - Expectation Failed``
-
-   When sending documents in bulk, the bulk load operation failed.
-
--  ``500 - Internal Server Error``
-
-   The request was invalid, either because the supplied JSON was
-   invalid, or invalid information was supplied as part of the request.
-
-HTTP Range Requests
-===================
-
-HTTP allows you to specify byte ranges for requests. This allows the
-implementation of resumable downloads and skippable audio and video
-streams alike. This is available for all attachments inside CouchDB.
-
-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 ``application/octet-stream`` Content-Type
-instead of ``text/plain``).
-
-.. code-block:: bash
-
-    shell> cat file.txt
-    My hovercraft is full of eels!
-
-Now let's store this text file as an attachment in CouchDB. First, we
-create a database:
-
-.. code-block:: bash
-
-    shell> curl -X PUT http://127.0.0.1:5984/test
-    {"ok":true}
-
-Then we create a new document and the file attachment in one go:
-
-.. code-block:: bash
-
-    shell> curl -X PUT http://127.0.0.1:5984/test/doc/file.txt \
-                -H "Content-Type: application/octet-stream" [e-mail]
-    {"ok":true,"id":"doc","rev":"1-287a28fa680ae0c7fb4729bf0c6e0cf2"}
-
-Now we can request the whole file easily:
-
-.. code-block:: bash
-
-    shell> curl -X GET http://127.0.0.1:5984/test/doc/file.txt
-    My hovercraft is full of eels!
-
-But say we only want the first 13 bytes:
-
-.. code-block:: bash
-
-    shell> curl -X GET http://127.0.0.1:5984/test/doc/file.txt \
-                -H "Range: bytes=0-12"
-    My hovercraft
-
-HTTP supports many ways to specify single and even multiple byte
-ranges. Read all about it in `RFC 2616`_.
-
-.. note::
-   Databases that have been created with CouchDB 1.0.2 or earlier will
-   support range requests in |version|, but they are using a less-optimal
-   algorithm. If you plan to make heavy use of this feature, make sure
-   to compact your database with CouchDB |version| to take advantage of a
-   better algorithm to find byte ranges.
-
-.. _RFC 2616: http://tools.ietf.org/html/rfc2616#section-14.27
 
=== removed file 'share/doc/build/html/_sources/api/authn.txt'
--- share/doc/build/html/_sources/api/authn.txt	2013-08-28 18:21:32 +0000
+++ share/doc/build/html/_sources/api/authn.txt	1970-01-01 00:00:00 +0000
@@ -1,41 +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.
-
-======================
-Authentication Methods
-======================
-
-.. todo:: Authentication Methods
-
-The CouchDB Authentication methods provide an interface for obtaining
-session and authorization data.
-
-A list of the available methods and URL paths are provided below:
-
-+--------+-------------------------+-------------------------------------------+
-| Method | Path                    | Description                               |
-+========+=========================+===========================================+
-| GET    | /_oauth/access_token    | TBC                                       |
-+--------+-------------------------+-------------------------------------------+
-| GET    | /_oauth/authorize       | TBC                                       |
-+--------+-------------------------+-------------------------------------------+
-| POST   | /_oauth/authorize       | TBC                                       |
-+--------+-------------------------+-------------------------------------------+
-| GET    | /_oauth/request_token   | TBC                                       |
-+--------+-------------------------+-------------------------------------------+
-| GET    | /_session               | Returns cookie based login user           |
-|        |                         | information                               |
-+--------+-------------------------+-------------------------------------------+
-| POST   | /_session               | Do cookie based user login                |
-+--------+-------------------------+-------------------------------------------+
-| DELETE | /_session               | Logout cookie based user                  |
-+--------+-------------------------+-------------------------------------------+
 
=== added file 'share/doc/build/html/_sources/api/basics.txt'
--- share/doc/build/html/_sources/api/basics.txt	1970-01-01 00:00:00 +0000
+++ share/doc/build/html/_sources/api/basics.txt	2013-12-01 23:56:33 +0000
@@ -0,0 +1,601 @@
+.. 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/basics:
+
+==========
+API Basics
+==========
+
+The CouchDB API is the primary method of interfacing to a CouchDB
+instance. Requests are made using HTTP and requests are used to request
+information from the database, store new data, and perform views and
+formatting of the information stored within the documents.
+
+Requests to the API can be categorised by the different areas of the
+CouchDB system that you are accessing, and the HTTP method used to send
+the request. Different methods imply different operations, for example
+retrieval of information from the database is typically handled by the
+``GET`` operation, while updates are handled by either a ``POST`` or
+``PUT`` request. There are some differences between the information that
+must be supplied for the different methods. For a guide to the basic
+HTTP methods and request structure, see :ref:`api/format`.
+
+For nearly all operations, the submitted data, and the returned data
+structure, is defined within a JavaScript Object Notation (JSON) object.
+Basic information on the content and data types for JSON are provided in
+:ref:`json`.
+
+Errors when accessing the CouchDB API are reported using standard HTTP
+Status Codes. A guide to the generic codes returned by CouchDB are
+provided in :ref:`errors`.
+
+When accessing specific areas of the CouchDB API, specific information
+and examples on the HTTP methods and request, JSON structures, and error
+codes are provided.
+
+.. _api/format:
+
+Request Format and Responses
+============================
+
+CouchDB supports the following HTTP request methods:
+
+-  ``GET``
+
+   Request the specified item. As with normal HTTP requests, the format
+   of the URL defines what is returned. With CouchDB this can include
+   static items, database documents, and configuration and statistical
+   information. In most cases the information is returned in the form of
+   a JSON document.
+
+-  ``HEAD``
+
+   The ``HEAD`` method is used to get the HTTP header of a ``GET``
+   request without the body of the response.
+
+-  ``POST``
+
+   Upload data. Within CouchDB ``POST`` is used to set values, including
+   uploading documents, setting document values, and starting certain
+   administration commands.
+
+-  ``PUT``
+
+   Used to put a specified resource. In CouchDB ``PUT`` is used to
+   create new objects, including databases, documents, views and design
+   documents.
+
+-  ``DELETE``
+
+   Deletes the specified resource, including documents, views, and
+   design documents.
+
+-  ``COPY``
+
+   A special method that can be used to copy documents and objects.
+
+If you use the an unsupported HTTP request type with a URL that does not
+support the specified type, a 405 error will be returned, listing the
+supported HTTP methods. For example:
+
+.. code-block:: javascript
+
+    {
+        "error":"method_not_allowed",
+        "reason":"Only GET,HEAD allowed"
+    }
+          
+
+The CouchDB design document API and the functions when returning HTML
+(for example as part of a show or list) enables you to include custom
+HTTP headers through the ``headers`` block of the return object.
+
+HTTP Headers
+============
+
+Because CouchDB uses HTTP for all communication, you need to ensure that
+the correct HTTP headers are supplied (and processed on retrieval) so
+that you get the right format and encoding. Different environments and
+clients will be more or less strict on the effect of these HTTP headers
+(especially when not present). Where possible you should be as specific
+as possible.
+
+Request Headers
+---------------
+
+-  ``Content-type``
+
+   Specifies the content type of the information being supplied within
+   the request. The specification uses MIME type specifications. For the
+   majority of requests this will be JSON (``application/json``). For
+   some settings the MIME type will be plain text. When uploading
+   attachments it should be the corresponding MIME type for the
+   attachment or binary (``application/octet-stream``).
+
+   The use of the ``Content-type`` on a request is highly recommended.
+
+-  ``Accept``
+
+   Specifies the list of accepted data types to be returned by the
+   server (i.e. that are accepted/understandable by the client). The
+   format should be a list of one or more MIME types, separated by
+   colons.
+
+   For the majority of requests the definition should be for JSON data
+   (``application/json``). For attachments you can either specify the
+   MIME type explicitly, or use ``*/*`` to specify that all file types
+   are supported. If the ``Accept`` header is not supplied, then the
+   ``*/*`` MIME type is assumed (i.e. client accepts all formats).
+
+   The use of ``Accept`` in queries for CouchDB is not required, but is
+   highly recommended as it helps to ensure that the data returned can
+   be processed by the client.
+
+   If you specify a data type using the ``Accept`` header, CouchDB will
+   honor the specified type in the ``Content-type`` header field
+   returned. For example, if you explicitly request ``application/json``
+   in the ``Accept`` of a request, the returned HTTP headers will use
+   the value in the returned ``Content-type`` field.
+
+   For example, when sending a request without an explicit ``Accept``
+   header, or when specifying ``*/*``:
+
+   .. code-block:: http
+
+       GET /recipes HTTP/1.1
+       Host: couchdb:5984
+       Accept: */*
+
+   The returned headers are:
+
+   .. code-block:: http
+
+       Server: CouchDB (Erlang/OTP)
+       Date: Thu, 13 Jan 2011 13:39:34 GMT
+       Content-Type: text/plain;charset=utf-8
+       Content-Length: 227
+       Cache-Control: must-revalidate
+
+   Note that the returned content type is ``text/plain`` even though the
+   information returned by the request is in JSON format.
+
+   Explicitly specifying the ``Accept`` header:
+
+   .. code-block:: http
+
+       GET /recipes HTTP/1.1
+       Host: couchdb:5984
+       Accept: application/json
+
+   The headers returned include the ``application/json`` content type:
+
+   .. code-block:: http
+
+       Server: CouchDB (Erlang/OTP)
+       Date: Thu, 13 Jan 2013 13:40:11 GMT
+       Content-Type: application/json
+       Content-Length: 227
+       Cache-Control: must-revalidate
+
+Response Headers
+----------------
+
+Response headers are returned by the server when sending back content
+and include a number of different header fields, many of which are
+standard HTTP response header and have no significance to CouchDB
+operation. The list of response headers important to CouchDB are listed
+below.
+
+-  ``Content-type``
+
+   Specifies the MIME type of the returned data. For most request, the
+   returned MIME type is ``text/plain``. All text is encoded in Unicode
+   (UTF-8), and this is explicitly stated in the returned
+   ``Content-type``, as ``text/plain;charset=utf-8``.
+
+-  ``Cache-control``
+
+   The cache control HTTP response header provides a suggestion for
+   client caching mechanisms on how to treat the returned information.
+   CouchDB typically returns the ``must-revalidate``, which indicates
+   that the information should be revalidated if possible. This is used
+   to ensure that the dynamic nature of the content is correctly
+   updated.
+
+-  ``Content-length``
+
+   The length (in bytes) of the returned content.
+
+-  ``Etag``
+
+   The ``Etag`` HTTP header field is used to show the revision for a
+   document, or a view.
+
+   ETags have been assigned to a map/reduce group (the collection of
+   views in a single design document). Any change to any of the indexes
+   for those views would generate a new ETag for all view URLs in a
+   single design doc, even if that specific view's results had not
+   changed.
+
+   Each ``_view`` URL has its own ETag which only gets updated when
+   changes are made to the database that effect that index. If the
+   index for that specific view does not change, that view keeps the
+   original ETag head (therefore sending back 304 Not Modified more
+   often).
+
+.. _json:
+
+JSON Basics
+===========
+
+The majority of requests and responses to CouchDB use the JavaScript
+Object Notation (JSON) for formatting the content and structure of the
+data and responses.
+
+JSON is used because it is the simplest and easiest to use solution for
+working with data within a web browser, as JSON structures can be
+evaluated and used as JavaScript objects within the web browser
+environment. JSON also integrates with the server-side JavaScript used
+within CouchDB.
+
+JSON supports the same basic types as supported by JavaScript, these
+are:
+
+-  Number (either integer or floating-point).
+
+-  String; this should be enclosed by double-quotes and supports Unicode
+   characters and backslash escaping. For example:
+
+   .. code-block:: javascript
+