Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc6911f authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'doc/4.9' into docs-next

parents cc935bb5 44f4ddd1
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ else ifneq ($(DOCBOOKS),)
else # HAVE_SPHINX

# User-friendly check for pdflatex
HAVE_PDFLATEX := $(shell if which pdflatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
HAVE_PDFLATEX := $(shell if which xelatex >/dev/null 2>&1; then echo 1; else echo 0; fi)

# Internal variables.
PAPEROPT_a4     = -D latex_paper_size=a4
@@ -68,11 +68,11 @@ htmldocs:

pdfdocs:
ifeq ($(HAVE_PDFLATEX),0)
	$(warning The 'pdflatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
	$(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
	@echo "  SKIP    Sphinx $@ target."
else # HAVE_PDFLATEX
	@$(call loop_cmd,sphinx,latex,.,latex,.))
	$(Q)$(MAKE) -C $(BUILDDIR)/latex
	@$(call loop_cmd,sphinx,latex,.,latex,.)
	$(Q)$(MAKE) PDFLATEX=xelatex LATEXOPTS="-interaction=nonstopmode" -C $(BUILDDIR)/latex
endif # HAVE_PDFLATEX

epubdocs:
+10 −1
Original line number Diff line number Diff line
@@ -73,4 +73,13 @@ SunXi family
    * Octa ARM Cortex-A7 based SoCs
      - Allwinner A83T
        + Datasheet
          http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf
          https://github.com/allwinner-zh/documents/raw/master/A83T/A83T_Datasheet_v1.3_20150510.pdf
        + User Manual
          https://github.com/allwinner-zh/documents/raw/master/A83T/A83T_User_Manual_v1.5.1_20150513.pdf

    * Quad ARM Cortex-A53 based SoCs
      - Allwinner A64
        + Datasheet
          http://dl.linux-sunxi.org/A64/A64_Datasheet_V1.1.pdf
        + User Manual
          http://dl.linux-sunxi.org/A64/Allwinner%20A64%20User%20Manual%20v1.0.pdf
+55 −11
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@

import sys
import os
import sphinx

# Get Sphinx version
major, minor, patch = map(int, sphinx.__version__.split("."))


# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -31,12 +36,11 @@ from load_config import loadConfig
# ones.
extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include']

# Gracefully handle missing rst2pdf.
try:
    import rst2pdf
    extensions += ['rst2pdf.pdfbuilder']
except ImportError:
    pass
# The name of the math extension changed on Sphinx 1.4
if minor > 3:
    extensions.append("sphinx.ext.imgmath")
else:
    extensions.append("sphinx.ext.pngmath")

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -253,16 +257,56 @@ htmlhelp_basename = 'TheLinuxKerneldoc'

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#'papersize': 'letterpaper',
'papersize': 'a4paper',

# The font size ('10pt', '11pt' or '12pt').
#'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#'preamble': '',
'pointsize': '8pt',

# Latex figure (float) alignment
#'figure_align': 'htbp',

# Don't mangle with UTF-8 chars
'inputenc': '',
'utf8extra': '',

# Additional stuff for the LaTeX preamble.
    'preamble': '''
	% Adjust margins
	\\usepackage[margin=0.5in, top=1in, bottom=1in]{geometry}

        % Allow generate some pages in landscape
        \\usepackage{lscape}

        % Put notes in gray color and let them be inside a table

        \\definecolor{MyGray}{rgb}{0.80,0.80,0.80}

        \\makeatletter\\newenvironment{graybox}{%
           \\begin{lrbox}{\\@tempboxa}\\begin{minipage}{\\columnwidth}}{\\end{minipage}\\end{lrbox}%
           \\colorbox{MyGray}{\\usebox{\\@tempboxa}}
        }\\makeatother

        \\makeatletter
        \\renewenvironment{notice}[2]{
          \\begin{graybox}
          \\bf\\it
          \\def\\py@noticetype{#1}
          \\par\\strong{#2}
          \\csname py@noticestart@#1\\endcsname
        }
	{
          \\csname py@noticeend@\\py@noticetype\\endcsname
          \\end{graybox}
        }
	\\makeatother

	% Use some font with UTF-8 support with XeLaTeX
        \\usepackage{fontspec}
        \\setsansfont{DejaVu Serif}
        \\setromanfont{DejaVu Sans}
        \\setmonofont{DejaVu Sans Mono}

     '''
}

# Grouping the document tree into LaTeX files. List of tuples
+2 −0
Original line number Diff line number Diff line
# -*- coding: utf-8; mode: python -*-

project = "Linux GPU Driver Developer's Guide"

tags.add("subproject")
+7 −0
Original line number Diff line number Diff line
@@ -12,3 +12,10 @@ Linux GPU Driver Developer's Guide
   drm-uapi
   i915
   vga-switcheroo

.. only::  subproject

   Indices
   =======

   * :ref:`genindex`
Loading