Docs: Fix breakage with Sphinx 1.5 and upper
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 19 Jun 2017 10:49:06 +0000 (07:49 -0300)
committerJonathan Corbet <corbet@lwn.net>
Fri, 23 Jun 2017 19:45:37 +0000 (13:45 -0600)
commit633d612bda6a37e1d5f5f878ec5a22a11599f800
tree4676c4e3d7ebe1822af3bc8b2b7758c5b5aba1ce
parentcc110221918d5564c9dd415cebe62cae4f8d5df5
Docs: Fix breakage with Sphinx 1.5 and upper

Commit 85c21e5c3ee7 (docs-rst: better adjust margins and font size) added a
\usepackage{geometry} that conflicts with another inclusion deep within the
dependencies with newer versions of Sphinx, causing the the PDF build to fail
with a "conflicting parameters" error.

Detect the Sphinx version, using sphinxsetup for Sphinx versions 1.5 and
upper.

Fixes: 85c21e5c3ee74fb75d690c57f7066bae7e2dca55
[jc: Tweaked logic to exclude 1.5.x for x < 3 ]
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Documentation/conf.py