From 5fa8d88f610a56df10139f761004c702c6cadd28 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 31 Oct 2018 00:32:36 -0500
Subject: prep 1.10

---
 CHANGES.rst     | 5 +++++
 contributing.md | 4 ++--
 docs/conf.py    | 3 ++-
 setup.py        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4d5311fe5..af09d2394 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+1.10 (2018-10-31)
+=================
+
+- No major changes from 1.10b1.
+
 1.10b1 (2018-10-28)
 ===================
 
diff --git a/contributing.md b/contributing.md
index 734f014f5..3b096db5d 100644
--- a/contributing.md
+++ b/contributing.md
@@ -14,9 +14,9 @@ Git branches and their purpose and status at the time of this writing are listed
 
 * [master](https://github.com/Pylons/pyramid/) - The branch on which further
   development takes place. The default branch on GitHub.
-* [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The branch
+* [1.10-branch](https://github.com/Pylons/pyramid/tree/1.10-branch) - The branch
   classified as "stable" or "latest".
-* [1.8-branch](https://github.com/Pylons/pyramid/tree/1.8-branch) - The oldest
+* [1.9-branch](https://github.com/Pylons/pyramid/tree/1.9-branch) - The oldest
   actively maintained and stable branch.
 
 Older branches are not actively maintained. In general, two stable branches and
diff --git a/docs/conf.py b/docs/conf.py
index 020880a13..a101aa503 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -145,6 +145,7 @@ if book:
 #     'whatsnew-1.7': 'index',
 #     'whatsnew-1.8': 'index',
 #     'whatsnew-1.9': 'index',
+#     'whatsnew-1.10': 'index',
 #     'tutorials/gae/index': 'index',
 #     'api/chameleon_text': 'api',
 #     'api/chameleon_zpt': 'api',
@@ -156,7 +157,7 @@ html_theme_options = dict(
     github_url='https://github.com/Pylons/pyramid',
     # On master branch and new branch still in
     # pre-release status: true; else: false.
-    in_progress='true',
+    in_progress='false',
     # On branches previous to "latest": true; else: false.
     outdated='false',
     )
diff --git a/setup.py b/setup.py
index 58b937048..61c63bd08 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ def readfile(name):
 README = readfile('README.rst')
 CHANGES = readfile('CHANGES.rst')
 
-VERSION = '1.10b1'
+VERSION = '1.10'
 
 install_requires = [
     'hupper',
-- 
cgit v1.2.3