From 55c3a3b6c7dca92027d9ff8cc417b2c94e7dd220 Mon Sep 17 00:00:00 2001
From: Andreas Mueller <amueller@nyu.edu>
Date: Thu, 19 Nov 2015 18:00:10 -0500
Subject: [PATCH] REL add 0.17.0 release to news, fix versions in menu

---
 doc/documentation.rst               | 3 ++-
 doc/index.rst                       | 2 ++
 doc/themes/scikit-learn/layout.html | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/documentation.rst b/doc/documentation.rst
index 9509440709ac7..efcaa58a020f0 100644
--- a/doc/documentation.rst
+++ b/doc/documentation.rst
@@ -29,7 +29,8 @@ Documentation of scikit-learn 0.18.dev0
                     <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.16 (stable)</a></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/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>
 
diff --git a/doc/index.rst b/doc/index.rst
index f048f3f5282d1..5e72396d104a5 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -207,6 +207,8 @@
                     <li><em>On-going development:</em>
                     <a href="whats_new.html"><em>What's new</em> (changelog)</a>
                     </li>
+                    <li><em>November 2015.</em> scikit-learn 0.17.0 is available for download (<a href="whats_new.html">Changelog</a>).
+                    </li>
                     <li><em>March 2015.</em> scikit-learn 0.16.0 is available for download (<a href="whats_new.html">Changelog</a>).
                     </li>
                     <li><em>July 2014.</em> scikit-learn 0.15.0 is available for download (<a href="whats_new.html">Changelog</a>).
diff --git a/doc/themes/scikit-learn/layout.html b/doc/themes/scikit-learn/layout.html
index 8cf85e953db3b..6e70f384d25b9 100644
--- a/doc/themes/scikit-learn/layout.html
+++ b/doc/themes/scikit-learn/layout.html
@@ -71,14 +71,15 @@
                  <span class="caret"></span>
               </a>
               <ul class="dropdown-menu">
-            <li class="link-title">Scikit-learn 0.17 (development)</li>
+            <li class="link-title">Scikit-learn 0.18 (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/index') }}">Contributing</a></li>
             <li class="divider"></li>
-                <li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.16.1 (stable)</a></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/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>