diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-06-04 13:39:29 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-06-04 13:39:29 -0700 |
| commit | c2e531b97f0b8bfc7ba4cdbb4c2313b26a6226a8 (patch) | |
| tree | b2e2e59e9b1b02ad0629c1d99c37cc756acbe724 | |
| parent | e9e490a54a87cfdbc9618b8547a7ecc81a6e2fac (diff) | |
| parent | 0155f8d0729eccbd72d79c1d49f82b1138a46ef1 (diff) | |
| download | numpy-c2e531b97f0b8bfc7ba4cdbb4c2313b26a6226a8.tar.gz | |
Merge pull request #3401 from rgommers/remove-module-index
Remove module index from docs, add missing release notes.
| -rw-r--r-- | doc/source/_templates/indexcontent.html | 2 | ||||
| -rw-r--r-- | doc/source/conf.py | 2 | ||||
| -rw-r--r-- | doc/source/release.rst | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/_templates/indexcontent.html b/doc/source/_templates/indexcontent.html index b497c93dd..55229a86d 100644 --- a/doc/source/_templates/indexcontent.html +++ b/doc/source/_templates/indexcontent.html @@ -15,8 +15,6 @@ <p><strong>Indices and tables:</strong></p> <table class="contentstable" align="center"><tr> <td width="50%"> - <p class="biglink"><a class="biglink" href="{{ pathto("modindex") }}">Module Index</a><br/> - <span class="linkdescr">quick access to all modules</span></p> <p class="biglink"><a class="biglink" href="{{ pathto("genindex") }}">General Index</a><br/> <span class="linkdescr">all functions, classes, terms</span></p> <p class="biglink"><a class="biglink" href="{{ pathto("glossary") }}">Glossary</a><br/> diff --git a/doc/source/conf.py b/doc/source/conf.py index 0fa905111..42e46c4f8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -121,7 +121,7 @@ html_additional_pages = { } # If false, no module index is generated. -html_use_modindex = True +html_domain_indices = False # If true, the reST sources are included in the HTML build as _sources/<name>. #html_copy_source = True diff --git a/doc/source/release.rst b/doc/source/release.rst index bf9e95a14..37c60b997 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -8,3 +8,6 @@ Release Notes .. include:: ../release/1.6.0-notes.rst .. include:: ../release/1.6.1-notes.rst .. include:: ../release/1.6.2-notes.rst +.. include:: ../release/1.7.0-notes.rst +.. include:: ../release/1.7.1-notes.rst +.. include:: ../release/1.8.0-notes.rst |