[PATCH v2 4/4] docs-rst: Allow Sphinx version 1.6

From: Mauro Carvalho Chehab
Date: Wed Aug 23 2017 - 04:57:32 EST


Now that the PDF building issues with Sphinx 1.6 got fixed,
update the documentation and scripts accordingly.

Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
---
Documentation/conf.py | 3 ---
Documentation/doc-guide/sphinx.rst | 4 +---
scripts/sphinx-pre-install | 1 -
3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 8e74d68037a5..0834a9933d69 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -331,9 +331,6 @@ latex_elements = {
\\setromanfont{DejaVu Sans}
\\setmonofont{DejaVu Sans Mono}

- % To allow adjusting table sizes
- \\usepackage{adjustbox}
-
'''
}

diff --git a/Documentation/doc-guide/sphinx.rst b/Documentation/doc-guide/sphinx.rst
index 8faafb9b2d86..a2417633fdd8 100644
--- a/Documentation/doc-guide/sphinx.rst
+++ b/Documentation/doc-guide/sphinx.rst
@@ -80,9 +80,7 @@ output.
PDF and LaTeX builds
--------------------

-Such builds are currently supported only with Sphinx versions 1.4 and 1.5.
-
-Currently, it is not possible to do pdf builds with Sphinx version 1.6.
+Such builds are currently supported only with Sphinx versions 1.4 and upper.

For PDF and LaTeX output, you'll also need ``XeLaTeX`` version 3.14159265.

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 677756ae34c9..067459760a7b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -40,7 +40,6 @@ my $virtualenv = 1;
#

my %texlive = (
- 'adjustbox.sty' => 'texlive-adjustbox',
'amsfonts.sty' => 'texlive-amsfonts',
'amsmath.sty' => 'texlive-amsmath',
'amssymb.sty' => 'texlive-amsfonts',
--
2.13.3