Merge branch 'stable' into 1.6-release

This commit is contained in:
Takeshi KOMIYA 2017-05-15 00:19:55 +09:00
commit 73b3ee17c2
3 changed files with 5 additions and 16 deletions

17
CHANGES
View File

@ -269,17 +269,8 @@ Deprecated
* #3628: ``sphinx_themes`` entry_point is deprecated. Please use * #3628: ``sphinx_themes`` entry_point is deprecated. Please use
``sphinx.html_themes`` instead. ``sphinx.html_themes`` instead.
Release 1.5.6 (in development) Release 1.5.6 (released May 15, 2017)
============================== =====================================
Incompatible changes
--------------------
Deprecated
----------
Features added
--------------
Bugs fixed Bugs fixed
---------- ----------
@ -296,9 +287,7 @@ Bugs fixed
* #3717: Stop enforcing that favicon's must be .ico * #3717: Stop enforcing that favicon's must be .ico
* #3731, #3732: Protect isenumclass predicate against non-class arguments * #3731, #3732: Protect isenumclass predicate against non-class arguments
* #3320: Warning about reference target not being found for container types * #3320: Warning about reference target not being found for container types
* Misspelled ARCHIVEPREFIX in Makefile for latex build repertory
Testing
--------
Release 1.5.5 (released Apr 03, 2017) Release 1.5.5 (released Apr 03, 2017)
===================================== =====================================

View File

@ -19,7 +19,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

View File

@ -13,7 +13,7 @@ ALLPS = $(addsuffix .ps,$(ALLDOCS))
ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg) ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg)
# Prefix for archive names # Prefix for archive names
ARCHIVEPRREFIX = ARCHIVEPREFIX =
# Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file) # Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file)
export LATEXOPTS = export LATEXOPTS =
# Additional latexmk options # Additional latexmk options