diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 11:10:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 11:10:49 -0400 |
commit | d6a24d0640d609138a4e40a4ce9fd9fe7859e24c (patch) | |
tree | aa40fb7f5d03dc605634fb4030afd8798bd6bc0b /Documentation/DocBook | |
parent | 1f5014d6a77513fa7cefe30eb7791d5856c04384 (diff) | |
parent | 197175427a221fe3200f7727ea35e261727e7228 (diff) |
Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6
Pull documentation updates from Jonathan Corbet:
"Numerous fixes, the overdue removal of the i2o docs, some new Chinese
translations, and, hopefully, the README fix that will end the flow of
identical patches to that file"
* tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (34 commits)
Documentation/memcg: update memcg/kmem status
Documentation: blackfin: Makefile: Typo building issue
Documentation/vm/pagemap.txt: correct location of page-types tool
Documentation/memory-barriers.txt: typo fix
doc: Add guest_nice column to example output of `cat /proc/stat'
Documentation/kernel-parameters: Move "eagerfpu" to its right place
Documentation: gpio: Update ACPI part of the document to mention _DSD
docs/completion.txt: Various tweaks and corrections
doc: completion: context, scope and language fixes
Documentation:Update Documentation/zh_CN/arm64/memory.txt
Documentation:Update Documentation/zh_CN/arm64/booting.txt
Documentation: Chinese translation of arm64/legacy_instructions.txt
DocBook media: fix broken EIA hyperlink
Documentation: tweak the maintainers entry
README: Change gzip/bzip2 to xz compression format
README: Update version number reference
doc:pci: Fix typo in Documentation/PCI
Documentation: drm: Use '->' when describing access through pointers.
Documentation: Remove mentioning of block barriers
Documentation/email-clients.txt: Fix one grammar mistake, add extra info about TB
...
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/drm.tmpl | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/biblio.xml | 11 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 03f1985a4bd1..0cad3ce957ff 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
@@ -1293,7 +1293,7 @@ int max_width, max_height;</synopsis> | |||
1293 | </para> | 1293 | </para> |
1294 | <para> | 1294 | <para> |
1295 | If a page flip can be successfully scheduled the driver must set the | 1295 | If a page flip can be successfully scheduled the driver must set the |
1296 | <code>drm_crtc-<fb</code> field to the new framebuffer pointed to | 1296 | <code>drm_crtc->fb</code> field to the new framebuffer pointed to |
1297 | by <code>fb</code>. This is important so that the reference counting | 1297 | by <code>fb</code>. This is important so that the reference counting |
1298 | on framebuffers stays balanced. | 1298 | on framebuffers stays balanced. |
1299 | </para> | 1299 | </para> |
diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml index 7ff01a23c2fe..fdee6b3f3eca 100644 --- a/Documentation/DocBook/media/v4l/biblio.xml +++ b/Documentation/DocBook/media/v4l/biblio.xml | |||
@@ -1,14 +1,13 @@ | |||
1 | <bibliography> | 1 | <bibliography> |
2 | <title>References</title> | 2 | <title>References</title> |
3 | 3 | ||
4 | <biblioentry id="eia608"> | 4 | <biblioentry id="cea608"> |
5 | <abbrev>EIA 608-B</abbrev> | 5 | <abbrev>CEA 608-E</abbrev> |
6 | <authorgroup> | 6 | <authorgroup> |
7 | <corpauthor>Electronic Industries Alliance (<ulink | 7 | <corpauthor>Consumer Electronics Association (<ulink |
8 | url="http://www.eia.org">http://www.eia.org</ulink>)</corpauthor> | 8 | url="http://www.ce.org">http://www.ce.org</ulink>)</corpauthor> |
9 | </authorgroup> | 9 | </authorgroup> |
10 | <title>EIA 608-B "Recommended Practice for Line 21 Data | 10 | <title>CEA-608-E R-2014 "Line 21 Data Services"</title> |
11 | Service"</title> | ||
12 | </biblioentry> | 11 | </biblioentry> |
13 | 12 | ||
14 | <biblioentry id="en300294"> | 13 | <biblioentry id="en300294"> |
diff --git a/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml b/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml index 7a8bf3011ee9..0aec62ed2bf8 100644 --- a/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml +++ b/Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | |||
@@ -254,7 +254,7 @@ ETS 300 231, lsb first transmitted.</entry> | |||
254 | <row> | 254 | <row> |
255 | <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry> | 255 | <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry> |
256 | <entry>0x1000</entry> | 256 | <entry>0x1000</entry> |
257 | <entry><xref linkend="eia608" /></entry> | 257 | <entry><xref linkend="cea608" /></entry> |
258 | <entry>NTSC line 21, 284 (second field 21)</entry> | 258 | <entry>NTSC line 21, 284 (second field 21)</entry> |
259 | <entry>Two bytes in transmission order, including parity | 259 | <entry>Two bytes in transmission order, including parity |
260 | bit, lsb first transmitted.</entry> | 260 | bit, lsb first transmitted.</entry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml b/Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml index bd015d1563ff..d05623c55403 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml | |||
@@ -205,7 +205,7 @@ ETS 300 231, lsb first transmitted.</entry> | |||
205 | <row> | 205 | <row> |
206 | <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry> | 206 | <entry><constant>V4L2_SLICED_CAPTION_525</constant></entry> |
207 | <entry>0x1000</entry> | 207 | <entry>0x1000</entry> |
208 | <entry><xref linkend="eia608" /></entry> | 208 | <entry><xref linkend="cea608" /></entry> |
209 | <entry>NTSC line 21, 284 (second field 21)</entry> | 209 | <entry>NTSC line 21, 284 (second field 21)</entry> |
210 | <entry>Two bytes in transmission order, including parity | 210 | <entry>Two bytes in transmission order, including parity |
211 | bit, lsb first transmitted.</entry> | 211 | bit, lsb first transmitted.</entry> |