updated devel to 2.3 (ansible#17884)

* updated devel to 2.3 * got missing 2.2/2.3 conversions
amerkel2 · Oct 3, 2016 · 828dcd0 · 828dcd0
1 parent ddd2062
commit 828dcd0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/RELEASES.txt b/RELEASES.txt
@@ -4,7 +4,8 @@ Ansible Releases at a Glance
 Active Development
 ++++++++++++++++++
 
-2.2    TBD - in progress
+2.3    TBD - in progress
+2.2    "The Battle of Evermore"
 
 Released
 ++++++++

diff --git a/ROADMAP.rst b/ROADMAP.rst
@@ -14,12 +14,13 @@ These roadmaps are the team's *best guess* roadmaps based on the Ansible team's
   - IRC freenode channel: #ansible-devel (this one may have things lost in lots of conversation, so a caution).
 
 =======================================
-Current 2.2 Roadmap is open for comment
+Current 2.3 Roadmap is open for comment
 =======================================
-We are currently trying to finalize the 2.2 Roadmap, targeted for September delivery.  We are seeking community feedback for 2.2.  That document is here:  
+We are currently trying to finalize the 2.3 Roadmap, targeted for January delivery.  We are seeking community feedback for 2.3.  That document is here:
+ - `2.3 Roadmap Document <docsite/rst/roadmap/ROADMAP_2_3.rst>`_
 
-`2.2 Roadmap Document <docsite/rst/roadmap/ROADMAP_2_2.rst>`_
 
 
 **Old Roadmaps are found here:**
+ - `2.2 Roadmap Document <docsite/rst/roadmap/ROADMAP_2_2.rst>`_
  - `2.1 Roadmap Document <docsite/rst/roadmap/ROADMAP_2_1.rst>`_
diff --git a/docs-api/conf.py b/docs-api/conf.py
@@ -71,7 +71,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.2'
+version = u'2.3'
 # The full version, including alpha/beta/rc tags.
 release = u'1'
 

diff --git a/docsite/conf.py b/docsite/conf.py
@@ -28,7 +28,7 @@
 sys.path.insert(0, os.path.join('ansible', 'lib'))
 sys.path.append(os.path.abspath('_themes'))
 
-VERSION='2.1'
+VERSION='2.2'
 AUTHOR='Ansible, Inc'
 
 
@@ -110,8 +110,8 @@
 .. |ac| replace:: Ansible Core
 .. |acversion| replace:: Ansible Core Version 2.1
 .. |acversionshort| replace:: Ansible Core 2.1
-.. |versionshortest| replace:: 2.1
-.. |versiondev| replace:: 2.2
+.. |versionshortest| replace:: 2.2
+.. |versiondev| replace:: 2.3
 .. |pubdate| replace:: July 19, 2016
 .. |rhel| replace:: Red Hat Enterprise Linux
 

diff --git a/docsite/rst/roadmap/ROADMAP_2_3.rst b/docsite/rst/roadmap/ROADMAP_2_3.rst
@@ -0,0 +1 @@
+placeholder