From c5a801b836b521b384d0b061470b817c64bc07c4 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 19 Apr 2016 07:29:33 -0700 Subject: [PATCH 1/3] Allow linkcheck to fail --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0424742ac..e4ead2923 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,9 @@ doc: doccheck: $(MAKE) -C docs html - $(MAKE) -C docs linkcheck +# Don't make our test rely on the links in the docs being up every single build. +# We don't control them. But do check, and update them to the target of their redirectes. + $(MAKE) -C docs linkcheck || true docserve: cd docs/_build/html && python -mSimpleHTTPServer 2> /dev/null& From 1762bff3afa4b93ce2097d29d8cdcde625d654d2 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 19 Apr 2016 07:29:59 -0700 Subject: [PATCH 2/3] Fix warnings in docs, we're not using terms or keywords --- docs/handbook/concepts.rst | 2 +- docs/reference/ImageMath.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/handbook/concepts.rst b/docs/handbook/concepts.rst index b5ad9331a..9ad83f1d9 100644 --- a/docs/handbook/concepts.rst +++ b/docs/handbook/concepts.rst @@ -24,7 +24,7 @@ To get the number and names of bands in an image, use the Modes ----- -The :term:`mode` of an image defines the type and depth of a pixel in the +The ``mode`` of an image defines the type and depth of a pixel in the image. The current release supports the following standard modes: * ``1`` (1-bit pixels, black and white, stored with one pixel per byte) diff --git a/docs/reference/ImageMath.rst b/docs/reference/ImageMath.rst index 5d7345d79..445a7e277 100644 --- a/docs/reference/ImageMath.rst +++ b/docs/reference/ImageMath.rst @@ -81,13 +81,13 @@ Bitwise operators don’t work on floating point images. Logical Operators ^^^^^^^^^^^^^^^^^ -Logical operators like :keyword:`and`, :keyword:`or`, and :keyword:`not` work +Logical operators like ``and``, ``or``, and ``not`` work on entire images, rather than individual pixels. An empty image (all pixels zero) is treated as false. All other images are treated as true. -Note that :keyword:`and` and :keyword:`or` return the last evaluated operand, +Note that ``and`` and ``or`` return the last evaluated operand, while not always returns a boolean value. Built-in Functions From bbd4337fbba787374318a9d835f9a0808a6e21bd Mon Sep 17 00:00:00 2001 From: wiredfool Date: Tue, 19 Apr 2016 07:41:14 -0700 Subject: [PATCH 3/3] Updated OleFileIO doc links --- PIL/OleFileIO.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PIL/OleFileIO.py b/PIL/OleFileIO.py index 4cf106d97..1998e3c10 100755 --- a/PIL/OleFileIO.py +++ b/PIL/OleFileIO.py @@ -540,16 +540,16 @@ class OleMetadata(object): OLE file. References for SummaryInformation stream: - - http://msdn.microsoft.com/en-us/library/dd942545.aspx - - http://msdn.microsoft.com/en-us/library/dd925819%28v=office.12%29.aspx - - http://msdn.microsoft.com/en-us/library/windows/desktop/aa380376%28v=vs.85%29.aspx - - http://msdn.microsoft.com/en-us/library/aa372045.aspx - - http://sedna-soft.de/summary-information-stream/ + - https://msdn.microsoft.com/en-us/library/dd942545.aspx + - https://msdn.microsoft.com/en-us/library/dd925819%28v=office.12%29.aspx + - https://msdn.microsoft.com/en-us/library/windows/desktop/aa380376%28v=vs.85%29.aspx + - https://msdn.microsoft.com/en-us/library/aa372045.aspx + - http://sedna-soft.de/articles/summary-information-stream/ - http://poi.apache.org/apidocs/org/apache/poi/hpsf/SummaryInformation.html References for DocumentSummaryInformation stream: - - http://msdn.microsoft.com/en-us/library/dd945671%28v=office.12%29.aspx - - http://msdn.microsoft.com/en-us/library/windows/desktop/aa380374%28v=vs.85%29.aspx + - https://msdn.microsoft.com/en-us/library/dd945671%28v=office.12%29.aspx + - https://msdn.microsoft.com/en-us/library/windows/desktop/aa380374%28v=vs.85%29.aspx - http://poi.apache.org/apidocs/org/apache/poi/hpsf/DocumentSummaryInformation.html new in version 0.25