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

Commit 63ac0cf9 authored by Jonathan Corbet's avatar Jonathan Corbet
Browse files

Merge branch 'sphinx-fixes-for-docs-next' of git://people.freedesktop.org/~jani/drm into test 

A set of PDF and other docs related fixes from Jani.
parents ac72618f 07c7e30c

Documentation/Makefile.sphinx

+12 −7
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ _SPHINXDIRS = $(patsubst $(srctree)/Documentation/%/conf.py,%,$(wildcard $(src 
SPHINX_CONF   = conf.py

PAPER         =

BUILDDIR      = $(obj)/output

PDFLATEX      = xelatex

LATEXOPTS     = -interaction=batchmode



# User-friendly check for sphinx-build

HAVE_SPHINX := $(shell if which $(SPHINXBUILD) >/dev/null 2>&1; then echo 1; else echo 0; fi)
@@ -29,7 +31,7 @@ else ifneq ($(DOCBOOKS),) 
else # HAVE_SPHINX



# User-friendly check for pdflatex

HAVE_PDFLATEX := $(shell if which xelatex >/dev/null 2>&1; then echo 1; else echo 0; fi)

HAVE_PDFLATEX := $(shell if which $(PDFLATEX) >/dev/null 2>&1; then echo 1; else echo 0; fi)



# Internal variables.

PAPEROPT_a4     = -D latex_paper_size=a4
@@ -51,7 +53,7 @@ loop_cmd = $(echo-cmd) $(cmd_$(1)) 
# $5 reST source folder relative to $(srctree)/$(src),

#    e.g. "media" for the linux-tv book-set at ./Documentation/media



quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4);

quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)

      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media all;\

	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \

	$(SPHINXBUILD) \
@@ -67,16 +69,19 @@ htmldocs: 
	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))



latexdocs:

	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))



ifeq ($(HAVE_PDFLATEX),0)

	$(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)



pdfdocs:

	$(warning The '$(PDFLATEX)' command was not found. Make sure you have it installed and in PATH to produce PDF output.)

	@echo "  SKIP    Sphinx $@ target."



else # HAVE_PDFLATEX

	@$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,latex,$(var),latex,$(var)))

endif # HAVE_PDFLATEX



pdfdocs: latexdocs

ifneq ($(HAVE_PDFLATEX),0)

	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=xelatex LATEXOPTS="-interaction=nonstopmode" -C $(BUILDDIR)/$(var)/latex)

	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=$(PDFLATEX) LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex;)



endif # HAVE_PDFLATEX



epubdocs:

Documentation/admin-guide/devices.rst

+2 −3084

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/admin-guide/devices.txt

0 → 100644
+3081 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/admin-guide/java.rst

+29 −23
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ other program after you have done the following: 
   Both the javawrapper shellscript and the javaclassname program

   were supplied by Colin J. Watson <cjw44@cam.ac.uk>.



Javawrapper shell script::

Javawrapper shell script:



.. code-block:: sh



  #!/bin/bash

  # /usr/local/bin/javawrapper - the wrapper for binfmt_misc/java
@@ -155,7 +157,9 @@ Javawrapper shell script:: 
  shift

  /usr/bin/java $FQCLASS "$@"



javaclassname.c::

javaclassname.c:



.. code-block:: c



  /* javaclassname.c

   *
@@ -378,7 +382,9 @@ added to your CLASSPATH during execution. 




To test your new setup, enter in the following simple Java app, and name

it "HelloWorld.java"::

it "HelloWorld.java":



.. code-block:: java



	class HelloWorld {

		public static void main(String args[]) {

Documentation/admin-guide/kernel-parameters.rst

+3 −4371

File changed.

Preview size limit exceeded, changes collapsed.