From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Aug 2016 14:23:17 +0000 (-0400)
Subject: Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=52ddb7e9dd735c1a10722c58d3e069af4d3e6df2;p=deliverable%2Flinux.git

Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "Three fixes for the docs build, including removing an annoying warning
  on 'make help' if sphinx isn't present"

* tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
  DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
  Documenation: update cgroup's document path
  Documentation/sphinx: do not warn about missing tools in 'make help'
---

52ddb7e9dd735c1a10722c58d3e069af4d3e6df2
diff --cc Documentation/DocBook/Makefile
index c481df33ef21,fb32ab85ea3a..64460a897f56
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,9 -14,19 +14,17 @@@ DOCBOOKS := z8530book.xml device-driver
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
  	    80211.xml debugobjects.xml sh.xml regulator.xml \
  	    alsa-driver-api.xml writing-an-alsa-driver.xml \
 -	    tracepoint.xml gpu.xml media_api.xml w1.xml \
 +	    tracepoint.xml w1.xml \
  	    writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
+ ifeq ($(DOCBOOKS),)
+ 
+ # Skip DocBook build if the user explicitly requested no DOCBOOKS.
+ .DEFAULT:
+ 	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
+ 
+ else
+ 
 -include Documentation/DocBook/media/Makefile
 -
  ###
  # The build process is as follows (targets):
  #              (xmldocs) [by docproc]