COUCHDB-1696 final commit and update docs

5 files changed, 14 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index 00fceb02a..5d5e52b2c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,12 @@ Apache CouchDB CHANGES
 # Futon:
 #
 #  * Disabled the link to the Futon test suite.
+#
+# Dependencies:
+#
+#  * Support Erlang/OTP R16.
+#  * Bump Mochiweb dependency to v2.4.2.
+#  * Minimum Erlang/OTP version is now R14B.
 
 # Version 1.3.1
 # -------------
diff --git a/INSTALL.Unix b/INSTALL.Unix
index f517f08be..854fd1374 100644
--- a/INSTALL.Unix
+++ b/INSTALL.Unix
@@ -35,7 +35,7 @@ Dependencies
 
 You should have the following installed:
 
- * Erlang OTP (>=R13B04, <R16)  (http://erlang.org/)
+ * Erlang OTP (>=R13B04, <R17)  (http://erlang.org/)
  * ICU                          (http://icu-project.org/)
  * OpenSSL                      (http://www.openssl.org/)
  * Mozilla SpiderMonkey (1.7)   (http://www.mozilla.org/js/spidermonkey/)
diff --git a/INSTALL.Windows b/INSTALL.Windows
index 353654b46..04a413fd6 100644
--- a/INSTALL.Windows
+++ b/INSTALL.Windows
@@ -29,7 +29,7 @@ Dependencies
 
 You will need the following installed:
 
- * Erlang OTP (>=14B01, <R16)    (http://erlang.org/)
+ * Erlang OTP (>=14B01, <R17)    (http://erlang.org/)
  * ICU        (>=4.*)            (http://icu-project.org/)
  * OpenSSL    (>=0.9.8r)         (http://www.openssl.org/)
  * Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/)
diff --git a/NEWS b/NEWS
index 7d7e7b339..b5a006dcc 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ Each release section notes when backwards incompatible changes have been made.
 # -------------
 #
 # This version has not been released yet.
+#
+#  * Support Erlang/OTP R16.
+#  * Bump Mochiweb dependency to v2.4.2.
+#  * Minimum Erlang/OTP version is now R14B.
 
 # Version 1.3.1
 # -------------
diff --git a/configure.ac b/configure.ac
index 53e23f147..0a9a9e30c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
 $as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R13B04 (erts-5.7.4) and < R16A (erts-5.10)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and <R17 (erts-5.11)"
 
 version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
 major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -420,11 +420,7 @@ if test $major_version -ne 5; then
     as_fn_error $? "$erlang_version_error" "$LINENO" 5
 fi
 
-if test $minor_version -lt 7 -o $minor_version -gt 9; then
-    as_fn_error $? "$erlang_version_error" "$LINENO" 5
-fi
-
-if test $minor_version -eq 7 -a $patch_version -lt 4; then
+if test $minor_version -lt 8 -o $minor_version -gt 10; then
     as_fn_error $? "$erlang_version_error" "$LINENO" 5
 fi