Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753324AbdFRXqv (ORCPT ); Sun, 18 Jun 2017 19:46:51 -0400 Received: from ms.lwn.net ([45.79.88.28]:43146 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753108AbdFRXqt (ORCPT ); Sun, 18 Jun 2017 19:46:49 -0400 From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jim Davis , Mauro Carvalho Chehab , Daniel Vetter , Jonathan Corbet Subject: [PATCH 2/5] Docs: Remove redundant geometry package inclusion Date: Sun, 18 Jun 2017 17:46:27 -0600 Message-Id: <20170618234630.19964-3-corbet@lwn.net> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170618234630.19964-1-corbet@lwn.net> References: <20170618234630.19964-1-corbet@lwn.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 961 Lines: 28 Commit 85c21e5c3ee7 (docs-rst: better adjust margins and font size) added a \usepackage{geometry} that conflicts with another inclusion deep within the dependencies somewhere, causing the the PDF build to fail with a "conflicting parameters" error. Just remove it for now until we can figure out a better way. Fixes: 85c21e5c3ee74fb75d690c57f7066bae7e2dca55 Cc: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documentation/conf.py b/Documentation/conf.py index 93827bc1620f..3d4e89330044 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -271,8 +271,6 @@ latex_elements = { # Additional stuff for the LaTeX preamble. 'preamble': ''' - % Adjust margins - \\usepackage[margin=0.5in, top=1in, bottom=1in]{geometry} \\usepackage{ifthen} % Allow generate some pages in landscape -- 2.13.1