8000 Merge pull request #5890 from amueller/post_release_dev_doc_fixes · scikit-learn/scikit-learn@05d2161 · GitHub
[go: up one dir, main page]

Skip to content

Commit 05d2161

Browse files
committed
Merge pull request #5890 from amueller/post_release_dev_doc_fixes
[MRG+1] add 0.17.0 release to news, fix versions in menu
2 parents a680043 + 55c3a3b commit 05d2161

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

doc/documentation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Documentation of scikit-learn 0.18.dev0
2929
<h2>Other Versions</h2>
3030
<ul>
3131
<li>scikit-learn 0.18 (development)</li>
32-
<li><a href="http://scikit-learn.org/stable/documentation.html">scikit-learn 0.16 (stable)</a></li>
32+
<li><a href="http://scikit-learn.org/stable/documentation.html">scikit-learn 0.17 (stable)</a></li>
33+
<li><a href="http://scikit-learn.org/0.16/documentation.html">scikit-learn 0.16</a></li>
3334
<li><a href="http://scikit-learn.org/0.15/documentation.html">scikit-learn 0.15</a></li>
3435
</ul>
3536

doc/index.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@
207207
<li><em>On-going development:</em>
208208
<a href="whats_new.html"><em>What's new</em> (changelog)</a>
209209
</li>
210+
<li><em>November 2015.</em> scikit-learn 0.17.0 is available for download (<a href="whats_new.html">Changelog</a>).
211+
</li>
210212
<li><em>March 2015.</em> scikit-learn 0.16.0 is available for download (<a href="whats_new.html">Changelog</a>).
211213
</li>
212214
<li><em>July 2014.</em> scikit-learn 0.15.0 is available for download (<a href="whats_new.html">Changelog</a>).

doc/themes/scikit-learn/layout.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,15 @@
7171
<span class="caret"></span>
7272
</a>
7373
<ul class="dropdown-menu">
74-
<li class="link-title">Scikit-learn 0.17 (development)</li>
74+
<li class="link-title">Scikit-learn 0.18 (development)</li>
7575
<li><a href="{{ pathto('tutorial/index') }}">Tutorials</a></li>
7676
<li><a href="{{ pathto('user_guide') }}">User guide</a></li>
7777
<li><a href="{{ pathto('modules/classes') }}">API</a></li>
7878
<li><a href="{{ pathto('faq') }}">FAQ</a></li>
7979
<li><a href="{{ pathto('developers/contributing') }}">Contributing</a></li>
8080
<li class="divider"></li>
81-
<li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.16.1 (stable)</a></li>
81+
<li><a href="http://scikit-learn.org/stable/documentation.html">Scikit-learn 0.17 (stable)</a></li>
82+
<li><a href="http://scikit-learn.org/0.16/documentation.html">Scikit-learn 0.16</a></li>
8283
<li><a href="http://scikit-learn.org/0.15/documentation.html">Scikit-learn 0.15</a></li>
8384
<li><a href="{{ pathto('_downloads/scikit-learn-docs.pdf', 1) }}">PDF documentation</a></li>
8485
</ul>

0 commit comments

Comments
 (0)
0