Skip to content

Commit

Permalink
Merge tag 'docs-4.10-2' of git://git.lwn.net/linux
Browse files Browse the repository at this point in the history
Pull more documentation updates from Jonathan Corbet:
 "This converts the crypto DocBook to Sphinx"

* tag 'docs-4.10-2' of git://git.lwn.net/linux:
  crypto: doc - optimize compilation
  crypto: doc - clarify AEAD memory structure
  crypto: doc - remove crypto_alloc_ablkcipher
  crypto: doc - add KPP documentation
  crypto: doc - fix separation of cipher / req API
  crypto: doc - fix source comments for Sphinx
  crypto: doc - remove crypto API DocBook
  crypto: doc - convert crypto API documentation to Sphinx
  • Loading branch information
torvalds committed Dec 18, 2016
2 parents 59331c2 + 3fa71d0 commit 0aaf214
Show file tree
Hide file tree
Showing 24 changed files with 1,770 additions and 2,144 deletions.
2 changes: 1 addition & 1 deletion Documentation/DocBook/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ DOCBOOKS := z8530book.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
80211.xml sh.xml regulator.xml w1.xml \
writing_musb_glue_layer.xml crypto-API.xml iio.xml
writing_musb_glue_layer.xml iio.xml

ifeq ($(DOCBOOKS),)

Expand Down
Loading

0 comments on commit 0aaf214

Please sign in to comment.