Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook
authorJonathan Corbet <corbet@lwn.net>
Thu, 18 May 2017 17:03:08 +0000 (11:03 -0600)
committerJonathan Corbet <corbet@lwn.net>
Thu, 18 May 2017 17:03:08 +0000 (11:03 -0600)
Mauro says:

This patch series convert the remaining DocBooks to ReST.

The first version was originally
send as 3 patch series:

   [PATCH 00/36] Convert DocBook documents to ReST
   [PATCH 0/5] Convert more books to ReST
   [PATCH 00/13] Get rid of DocBook

The lsm book was added as if it were a text file under
Documentation. The plan is to merge it with another file
under Documentation/security, after both this series and
a security Documentation patch series gets merged.

It also adjusts some Sphinx-pedantic errors/warnings on
some kernel-doc markups.

I also added some patches here to add PDF output for all
existing ReST books.

1  2 
Documentation/00-INDEX
MAINTAINERS
Makefile
drivers/mtd/nand/nand_base.c
fs/namei.c
include/linux/mtd/nand.h
include/net/sock.h

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge