Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781AbdHWI5I (ORCPT ); Wed, 23 Aug 2017 04:57:08 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:41831 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753603AbdHWI5D (ORCPT ); Wed, 23 Aug 2017 04:57:03 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Mauro Carvalho Chehab To: Linux Doc Mailing List , Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Jonathan Corbet , Daniel Vetter , SeongJae Park , Markus Heiser Subject: [PATCH v2 4/4] docs-rst: Allow Sphinx version 1.6 Date: Wed, 23 Aug 2017 05:56:57 -0300 Message-Id: <0552b7adf6e023f33494987c3e908101d75250d2.1503477995.git.mchehab@s-opensource.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1730 Lines: 53 Now that the PDF building issues with Sphinx 1.6 got fixed, update the documentation and scripts accordingly. Signed-off-by: Mauro Carvalho Chehab --- 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