[MRG] bump master to 0.19-dev (scikit-learn#7413)

* bump master to 0.19-dev * also bump whatsnew
wangbo-thu · Sep 23, 2016 · b1cc108 · b1cc108
1 parent f31b946
commit b1cc108
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/doc/documentation.rst b/doc/documentation.rst
@@ -2,7 +2,7 @@
 
   <div class="container-index">
 
-Documentation of scikit-learn 0.18.dev0
+Documentation of scikit-learn 0.19.dev0
 =======================================
 
 .. raw:: html
@@ -28,10 +28,10 @@ Documentation of scikit-learn 0.18.dev0
                 <!-- doc versions -->
                     <h2>Other Versions</h2>
                     <ul>
-                        <li>scikit-learn 0.18 (development)</li>
-                        <li><a href="http://scikit-learn.org/stable/documentation.html">scikit-learn 0.17 (stable)</a></li>
+                        <li>scikit-learn 0.19 (development)</li>
+                        <li><a href="http://scikit-learn.org/stable/documentation.html">scikit-learn 0.18 (stable)</a></li>
+                        <li><a href="http://scikit-learn.org/0.17/documentation.html">scikit-learn 0.17</a></li>
                         <li><a href="http://scikit-learn.org/0.16/documentation.html">scikit-learn 0.16</a></li>
-                        <li><a href="http://scikit-learn.org/0.15/documentation.html">scikit-learn 0.15</a></li>
                     </ul>
 
                 </div>

diff --git a/doc/support.rst b/doc/support.rst
@@ -93,6 +93,7 @@ Documentation resources
 This documentation is relative to |release|. Documentation for other
 versions can be found here:
 
+    * `0.18 <http://scikit-learn.org/0.18/>`_
     * `0.17 <http://scikit-learn.org/0.17/>`_
     * `0.16 <http://scikit-learn.org/0.16/>`_
     * `0.15 <http://scikit-learn.org/0.15/>`_

diff --git a/doc/themes/scikit-learn/layout.html b/doc/themes/scikit-learn/layout.html
@@ -78,16 +78,16 @@
                  <span class="caret"></span>
               </a>
               <ul class="dropdown-menu">
-            <li class="link-title">Scikit-learn 0.18 (development)</li>
+            <li class="link-title">Scikit-learn 0.19 (development)</li>
             <li><a href="{{ pathto('tutorial/index') }}">Tutorials</a></li>
             <li><a href="{{ pathto('user_guide') }}">User guide</a></li>
             <li><a href="{{ pathto('modules/classes') }}">API</a></li>
             <li><a href="{{ pathto('faq') }}">FAQ</a></li>
             <li><a href="{{ pathto('developers/contributing') }}">Contributing</a></li>
             <li class="divider"></li>
-                <li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.17 (stable)</a></li>
+                <li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.18 (stable)</a></li>
+                <li><a href="http://scikit-learn.org/0.17/documentation.html">Scikit-learn 0.17</a></li>
                 <li><a href="http://scikit-learn.org/0.16/documentation.html">Scikit-learn 0.16</a></li>
-                <li><a href="http://scikit-learn.org/0.15/documentation.html">Scikit-learn 0.15</a></li>
 				<li><a href="{{ pathto('_downloads/scikit-learn-docs.pdf', 1) }}">PDF documentation</a></li>
               </ul>
             </div>

diff --git a/doc/whats_new.rst b/doc/whats_new.rst
@@ -1,16 +1,32 @@
 .. currentmodule:: sklearn
 
-.. _changes_0_18:
 
 ===============
 Release history
 ===============
 
-Version 0.18
+Version 0.19
 ============
 
 **In Development**
 
+
+New features
+............
+
+
+Enhancements
+............
+
+
+Bug fixes
+.........
+
+.. _changes_0_18:
+
+Version 0.18
+============
+
 .. _model_selection_changes:
 
 Model Selection Enhancements and API Changes