diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-04 14:40:58 -0400 |
| commit | 80cc38b16389849a6e06441ace4530f6b2497c3c (patch) | |
| tree | 1dabc02b0a1faa6b640de20e38aa31bb5d0c443f /Documentation/kernel-doc-nano-HOWTO.txt | |
| parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) | |
| parent | 83a35e360433b58791bc9c4e288cace466d62e3a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"The usual stuff from trivial tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
treewide: relase -> release
Documentation/cgroups/memory.txt: fix stat file documentation
sysctl/net.txt: delete reference to obsolete 2.4.x kernel
spinlock_api_smp.h: fix preprocessor comments
treewide: Fix typo in printk
doc: device tree: clarify stuff in usage-model.txt.
open firmware: "/aliasas" -> "/aliases"
md: bcache: Fixed a typo with the word 'arithmetic'
irq/generic-chip: fix a few kernel-doc entries
frv: Convert use of typedef ctl_table to struct ctl_table
sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
doc: clk: Fix incorrect wording
Documentation/arm/IXP4xx fix a typo
Documentation/networking/ieee802154 fix a typo
Documentation/DocBook/media/v4l fix a typo
Documentation/video4linux/si476x.txt fix a typo
Documentation/virtual/kvm/api.txt fix a typo
Documentation/early-userspace/README fix a typo
Documentation/video4linux/soc-camera.txt fix a typo
lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
...
Diffstat (limited to 'Documentation/kernel-doc-nano-HOWTO.txt')
| -rw-r--r-- | Documentation/kernel-doc-nano-HOWTO.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/kernel-doc-nano-HOWTO.txt b/Documentation/kernel-doc-nano-HOWTO.txt index 99b57abddf8a..acbc1a3d0d91 100644 --- a/Documentation/kernel-doc-nano-HOWTO.txt +++ b/Documentation/kernel-doc-nano-HOWTO.txt | |||
| @@ -142,9 +142,10 @@ are: | |||
| 142 | 142 | ||
| 143 | - Makefile | 143 | - Makefile |
| 144 | 144 | ||
| 145 | The targets 'sgmldocs', 'psdocs', 'pdfdocs', and 'htmldocs' are used | 145 | The targets 'xmldocs', 'psdocs', 'pdfdocs', and 'htmldocs' are used |
| 146 | to build DocBook files, PostScript files, PDF files, and html files | 146 | to build XML DocBook files, PostScript files, PDF files, and html files |
| 147 | in Documentation/DocBook. | 147 | in Documentation/DocBook. The older target 'sgmldocs' is equivalent |
| 148 | to 'xmldocs'. | ||
| 148 | 149 | ||
| 149 | - Documentation/DocBook/Makefile | 150 | - Documentation/DocBook/Makefile |
| 150 | 151 | ||
| @@ -158,8 +159,8 @@ If you just want to read the ready-made books on the various | |||
| 158 | subsystems (see Documentation/DocBook/*.tmpl), just type 'make | 159 | subsystems (see Documentation/DocBook/*.tmpl), just type 'make |
| 159 | psdocs', or 'make pdfdocs', or 'make htmldocs', depending on your | 160 | psdocs', or 'make pdfdocs', or 'make htmldocs', depending on your |
| 160 | preference. If you would rather read a different format, you can type | 161 | preference. If you would rather read a different format, you can type |
| 161 | 'make sgmldocs' and then use DocBook tools to convert | 162 | 'make xmldocs' and then use DocBook tools to convert |
| 162 | Documentation/DocBook/*.sgml to a format of your choice (for example, | 163 | Documentation/DocBook/*.xml to a format of your choice (for example, |
| 163 | 'db2html ...' if 'make htmldocs' was not defined). | 164 | 'db2html ...' if 'make htmldocs' was not defined). |
| 164 | 165 | ||
| 165 | If you want to see man pages instead, you can do this: | 166 | If you want to see man pages instead, you can do this: |