diff options
| author | jfbu <jfbu@free.fr> | 2016-06-15 18:20:13 +0200 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2016-06-15 18:29:58 +0200 |
| commit | 2cec5a25b2056df321cc86b5be53cf354e0b7733 (patch) | |
| tree | 563d13bc3887d1bac0c390c5204e0fb22c870577 /sphinx/quickstart.py | |
| parent | bd342b872484574581d880ac47cd1292f8a19178 (diff) | |
| parent | 4cf78e608ec4c8fb877f3d80b5e4409fd852c21d (diff) | |
| download | sphinx-git-2cec5a25b2056df321cc86b5be53cf354e0b7733.tar.gz | |
Merge branch 'stable'
Conflicts:
sphinx/domains/cpp.py
sphinx/texinputs/sphinx.sty
tests/test_build_latex.py
Diffstat (limited to 'sphinx/quickstart.py')
| -rw-r--r-- | sphinx/quickstart.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 1fd2bd626..408c4a430 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -359,6 +359,12 @@ latex_documents = [ # # latex_appendices = [] +# It false, will not define \strong, \code, \titleref, \crossref ... but only +# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added +# packages. +# +# latex_keep_old_macro_names = True + # If false, no module index is generated. # # latex_domain_indices = True |