Commit Graph
6925 Commits
Author SHA1 Message Date
Takeshi KOMIYA a9da999d71 Merge branch 'stable' 2016-08-08 00:40:42 +09:00
Takeshi KOMIYA 96b3979d84 Update CHANGES for PR#1911 2016-08-08 00:29:29 +09:00
mulhern 189494c27e Make sure extensions specified with -D override extensions in config file.
Previously, a comma separated list of extensions was read and parsed
correctly. However, the value was then stored in config hashtable,
which was overwritten when the config file was parsed.

Now, the config file is parsed first, and the the entry in the config
hashtable is updated with the overriding extension, if it exists.

Signed-off-by: mulhern <amulhern@redhat.com>
2016-08-08 00:26:42 +09:00
Takeshi KOMIYA 0964db74d7 Merge pull request #1911 from mulkieran/master-extensions
Make sure extensions specified with -D override extensions in config …
2016-08-08 00:26:06 +09:00
Takeshi KOMIYA 83472acc97 Merge pull request #2833 from joostvanzwieten/fix-instance-annotations
ext.autodoc: fix formatting instance annotations
2016-08-08 00:23:33 +09:00
Joost van Zwieten 099b58f7fe ext.autodoc: fix formatting instance annotations
Currently `format_annotation` fails on instances, because instances don't have
`__module__` and `__qualname__` attributes.  Defer building the
`qualified_name` of an annotation until we have established that the annotation
is a type.
2016-08-07 16:18:22 +02:00
Rob Ruana bd10a66f5d [Napoleon] fixes minor spacing issue in Napoleon docstrings 2016-08-06 14:37:17 -04:00
Jakob Lykke Andersen 678630a59b C++, add support for removing index text prefixes
Closes sphinx-doc/sphinx#1958.
2016-08-06 00:53:50 +02:00
Jakob Lykke Andersen 9ec75826af C++, oops 2016-08-06 00:28:05 +02:00
Jakob Lykke Andersen c85e60a5ac C++, increase support for attributes.
User-defined attributes and simple C++11 style attributes.
Closes sphinx-doc/sphinx#2682.
2016-08-06 00:08:02 +02:00
Jakob Lykke Andersen 86f3e5aabb Merge branch 'master' into cpp-attributes 2016-08-05 08:11:47 +02:00
Rob Ruana a8375dd5b4 Merge pull request #2825 from AWhetter/link_container_types
Looks great, thanks again for the work!

(BTW, I just noticed "Squash and Merge" is enabled for this repo. Sorry to make you do the extra work, I really do appreciate it)
2016-08-03 13:11:25 -04:00
Ashley Whetter cfd4e51802 Python domain can now link container types automatically
Google types now greedily match the closing parenthesis.

Also removed name from returns section in Google docstrings.
Instead, everything before the colon is treated as the type.
2016-08-03 17:09:40 +01:00
Takeshi KOMIYA da7e2d9dda Merge pull request #2824 from EricFromCanada/stable
remove extra colons in C++ domain examples
2016-08-04 01:00:55 +09:00
Eric Knibbe 56ee02114a remove extra colons in C++ domain examples 2016-08-02 15:22:50 -04:00
Takeshi KOMIYA 86c9767ced Merge pull request #2749 from tk0miya/jinja2ized_quickstart
Jinja2ized quickstart
2016-07-28 21:24:41 +09:00
mulhern 1951d559d9 Make sure extensions specified with -D override extensions in config file.
Previously, a comma separated list of extensions was read and parsed
correctly. However, the value was then stored in config hashtable,
which was overwritten when the config file was parsed.

Now, the config file is parsed first, and the the entry in the config
hashtable is updated with the overriding extension, if it exists.

Signed-off-by: mulhern <amulhern@redhat.com>
2016-07-28 07:48:10 -04:00
Takeshi KOMIYA 696b518ad6 Merge pull request #2791 from shibukawa/feature/epub/disablesourcefilepage
Turn off viewcode extension for epub by default
2016-07-28 17:12:48 +09:00
Yoshiki Shibukawa 6076b5588b fix document warning 2016-07-28 15:38:38 +09:00
Yoshiki Shibukawa d842a4cbc8 Turn off viewcode extension by default 2016-07-28 15:38:38 +09:00
Takeshi KOMIYA 0a03771791 Add Seaborn project to EXAMPLES (ref: #2814) 2016-07-28 11:54:08 +09:00
Takeshi KOMIYA 84baf05c4f Closes #2799: Sphinx installs roles and directives automatically on importing sphinx module.
Now Sphinx installs them on running application.
2016-07-28 11:23:10 +09:00
Takeshi KOMIYA 54247c96fe Fix #2811: Show warning if requests < 2.4.1 2016-07-27 13:28:07 +09:00
Takeshi KOMIYA 98ae8b62e9 Merge pull request #2809 from nijel/stable
Support gzip encoding in HEAD requests
2016-07-27 11:32:12 +09:00
Michal Čihař a66c5811f8 Support any encoding in HEAD requests
Completely support would be more problematic and this already covers
most usual case.

Fixes #2775

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 09:30:03 +02:00
Takeshi KOMIYA 151478ff96 Jinja2-ize quickstart 2016-07-26 14:45:57 +09:00
Takeshi KOMIYA b208b3e9e0 Skip flake8 for sample python codes for napoleon docs 2016-07-26 14:35:20 +09:00
Takeshi KOMIYA 99c9f60373 Merge branch 'stable' 2016-07-26 14:26:11 +09:00
Takeshi KOMIYA d65ea860aa Update CHANGES 2016-07-26 14:25:20 +09:00
Takeshi KOMIYA ac52486274 travis: Do not run flake8 on py26 (not supported) again 2016-07-26 14:11:05 +09:00
Takeshi KOMIYA bac6fc6d04 travis: Do not run flake8 on py26 (not supported) 2016-07-26 14:00:38 +09:00
Takeshi KOMIYA 8e397d1334 Fix flake8 violation 2016-07-26 13:53:51 +09:00
Takeshi KOMIYA 55de0e1239 Merge pull request #2801 from tk0miya/quickstart_allows_empty_version
`sphinx-quickstart` now allows a project version is empty
2016-07-26 10:42:58 +09:00
Takeshi KOMIYA 15a251ec40 Merge pull request #2794 from shibukawa/fix/epub_dup_toc
Fix duplicated toc in epub3 output
2016-07-22 12:24:18 +09:00
Takeshi KOMIYA 9358b13df6 Merge pull request #2804 from shibukawa/fix/downloadrole
disable download role on epub/qthelp builder
2016-07-22 12:02:55 +09:00
Yoshiki Shibukawa d935fd82fc disable download role on epub/qthelp builder 2016-07-22 08:22:41 +09:00
Yoshiki Shibukawa 6e40e33780 Fix duplicated toc in epub3 output 2016-07-22 05:05:33 +09:00
Takeshi KOMIYA 8d1604628a Update CHANGES for PR#2778 2016-07-21 11:14:43 +09:00
Takeshi KOMIYA ed70c71126 Merge pull request #2778 from LeoHuckvale/fix-abstractproperty-part2
fix inspect: return defargs[0] if obj.__dict__ is a property and raises exception
2016-07-21 11:12:34 +09:00
Takeshi KOMIYA 1257c038ef Fix CHANGES to avoid warning from any role 2016-07-21 10:12:48 +09:00
Takeshi KOMIYA d6357a878d sphinx-quickstart now allows a project version is empty 2016-07-21 01:13:39 +09:00
Takeshi KOMIYA d651613583 Merge pull request #2772 from tk0miya/good_default_settings_for_latexpdfja
better default LaTeX settings for Japanese
2016-07-21 01:06:08 +09:00
Takeshi KOMIYA f2a7eeca60 Merge pull request #2774 from tk0miya/latex_engine
Add `latex_engine` to switch the LaTeX engine by conf.py
2016-07-21 01:05:51 +09:00
Takeshi KOMIYA 80bfc55795 Merge branch 'stable' 2016-07-21 00:20:25 +09:00
Takeshi KOMIYA c698fab338 Merge pull request #2786 from shibukawa/fix/epub
Reduce epub checker warnings/errors for epub3 builder.
2016-07-20 23:30:59 +09:00
Takeshi KOMIYA 061a4647c9 Merge pull request #2787 from tk0miya/refactor_css
Refactor css
2016-07-20 23:25:06 +09:00
Takeshi KOMIYA 8d8e35a043 Merge pull request #2797 from shibukawa/fix/sphinxdoc
fix document download roles. download roles works only on html.
2016-07-20 23:24:38 +09:00
Yoshiki Shibukawa b7b1ac1c4d add preferred instruction to download role description 2016-07-19 23:35:49 +09:00
Yoshiki Shibukawa 702004acfc fix document download roles. download roles works only on html. 2016-07-19 23:15:35 +09:00
Takeshi KOMIYA 0e829c845e sphinx.ext.math: Update the label of permalink 2016-07-19 11:16:57 +09:00