diff options
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/dvb/dvbproperty.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/dvb/frontend.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/kernel-locking.tmpl | 2 | ||||
-rw-r--r-- | Documentation/DocBook/libata.tmpl | 10 | ||||
-rw-r--r-- | Documentation/DocBook/mtdnand.tmpl | 12 | ||||
-rw-r--r-- | Documentation/DocBook/regulator.tmpl | 4 | ||||
-rw-r--r-- | Documentation/DocBook/uio-howto.tmpl | 2 | ||||
-rw-r--r-- | Documentation/DocBook/usb.tmpl | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/common.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/controls.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/dev-subdev.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/libv4l.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/remote_controllers.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 |
14 files changed, 24 insertions, 24 deletions
diff --git a/Documentation/DocBook/dvb/dvbproperty.xml b/Documentation/DocBook/dvb/dvbproperty.xml index 5f57c7ccd4ba..97f397e2fb3a 100644 --- a/Documentation/DocBook/dvb/dvbproperty.xml +++ b/Documentation/DocBook/dvb/dvbproperty.xml | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | <para>Central frequency of the channel.</para> | 41 | <para>Central frequency of the channel.</para> |
42 | 42 | ||
43 | <para>For ISDB-T the channels are usally transmitted with an offset of 143kHz. E.g. a | 43 | <para>For ISDB-T the channels are usually transmitted with an offset of 143kHz. E.g. a |
44 | valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of | 44 | valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of |
45 | the channel which is 6MHz.</para> | 45 | the channel which is 6MHz.</para> |
46 | 46 | ||
diff --git a/Documentation/DocBook/dvb/frontend.xml b/Documentation/DocBook/dvb/frontend.xml index 78d756de5906..60c6976fb311 100644 --- a/Documentation/DocBook/dvb/frontend.xml +++ b/Documentation/DocBook/dvb/frontend.xml | |||
@@ -139,7 +139,7 @@ consistently to the DiSEqC commands as described in the DiSEqC spec.</para> | |||
139 | <section id="frontend_sec_tone"> | 139 | <section id="frontend_sec_tone"> |
140 | <title>SEC continuous tone</title> | 140 | <title>SEC continuous tone</title> |
141 | 141 | ||
142 | <para>The continous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the | 142 | <para>The continuous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the |
143 | high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to | 143 | high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to |
144 | be switched consistently to the DiSEqC commands as described in the DiSEqC | 144 | be switched consistently to the DiSEqC commands as described in the DiSEqC |
145 | spec.</para> | 145 | spec.</para> |
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl index f66f4df18690..67e7ab41c0a6 100644 --- a/Documentation/DocBook/kernel-locking.tmpl +++ b/Documentation/DocBook/kernel-locking.tmpl | |||
@@ -1763,7 +1763,7 @@ as it would be on UP. | |||
1763 | There is a furthur optimization possible here: remember our original | 1763 | There is a furthur optimization possible here: remember our original |
1764 | cache code, where there were no reference counts and the caller simply | 1764 | cache code, where there were no reference counts and the caller simply |
1765 | held the lock whenever using the object? This is still possible: if | 1765 | held the lock whenever using the object? This is still possible: if |
1766 | you hold the lock, noone can delete the object, so you don't need to | 1766 | you hold the lock, no one can delete the object, so you don't need to |
1767 | get and put the reference count. | 1767 | get and put the reference count. |
1768 | </para> | 1768 | </para> |
1769 | 1769 | ||
diff --git a/Documentation/DocBook/libata.tmpl b/Documentation/DocBook/libata.tmpl index 8c5411cfeaf0..cdd1bb9aac0d 100644 --- a/Documentation/DocBook/libata.tmpl +++ b/Documentation/DocBook/libata.tmpl | |||
@@ -1032,7 +1032,7 @@ and other resources, etc. | |||
1032 | <listitem> | 1032 | <listitem> |
1033 | <para> | 1033 | <para> |
1034 | This is indicated by ICRC bit in the ERROR register and | 1034 | This is indicated by ICRC bit in the ERROR register and |
1035 | means that corruption occurred during data transfer. Upto | 1035 | means that corruption occurred during data transfer. Up to |
1036 | ATA/ATAPI-7, the standard specifies that this bit is only | 1036 | ATA/ATAPI-7, the standard specifies that this bit is only |
1037 | applicable to UDMA transfers but ATA/ATAPI-8 draft revision | 1037 | applicable to UDMA transfers but ATA/ATAPI-8 draft revision |
1038 | 1f says that the bit may be applicable to multiword DMA and | 1038 | 1f says that the bit may be applicable to multiword DMA and |
@@ -1045,10 +1045,10 @@ and other resources, etc. | |||
1045 | <term>ABRT error during data transfer or on completion</term> | 1045 | <term>ABRT error during data transfer or on completion</term> |
1046 | <listitem> | 1046 | <listitem> |
1047 | <para> | 1047 | <para> |
1048 | Upto ATA/ATAPI-7, the standard specifies that ABRT could be | 1048 | Up to ATA/ATAPI-7, the standard specifies that ABRT could be |
1049 | set on ICRC errors and on cases where a device is not able | 1049 | set on ICRC errors and on cases where a device is not able |
1050 | to complete a command. Combined with the fact that MWDMA | 1050 | to complete a command. Combined with the fact that MWDMA |
1051 | and PIO transfer errors aren't allowed to use ICRC bit upto | 1051 | and PIO transfer errors aren't allowed to use ICRC bit up to |
1052 | ATA/ATAPI-7, it seems to imply that ABRT bit alone could | 1052 | ATA/ATAPI-7, it seems to imply that ABRT bit alone could |
1053 | indicate tranfer errors. | 1053 | indicate tranfer errors. |
1054 | </para> | 1054 | </para> |
@@ -1122,7 +1122,7 @@ and other resources, etc. | |||
1122 | <para> | 1122 | <para> |
1123 | Depending on commands, not all STATUS/ERROR bits are | 1123 | Depending on commands, not all STATUS/ERROR bits are |
1124 | applicable. These non-applicable bits are marked with | 1124 | applicable. These non-applicable bits are marked with |
1125 | "na" in the output descriptions but upto ATA/ATAPI-7 | 1125 | "na" in the output descriptions but up to ATA/ATAPI-7 |
1126 | no definition of "na" can be found. However, | 1126 | no definition of "na" can be found. However, |
1127 | ATA/ATAPI-8 draft revision 1f describes "N/A" as | 1127 | ATA/ATAPI-8 draft revision 1f describes "N/A" as |
1128 | follows. | 1128 | follows. |
@@ -1507,7 +1507,7 @@ and other resources, etc. | |||
1507 | 1507 | ||
1508 | <listitem> | 1508 | <listitem> |
1509 | <para> | 1509 | <para> |
1510 | CHS set up with INITIALIZE DEVICE PARAMETERS (seldomly used) | 1510 | CHS set up with INITIALIZE DEVICE PARAMETERS (seldom used) |
1511 | </para> | 1511 | </para> |
1512 | </listitem> | 1512 | </listitem> |
1513 | 1513 | ||
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index 620eb3f6a90a..6f242d5dee9a 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
@@ -485,7 +485,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) | |||
485 | Reed-Solomon library. | 485 | Reed-Solomon library. |
486 | </para> | 486 | </para> |
487 | <para> | 487 | <para> |
488 | The ECC bytes must be placed immidiately after the data | 488 | The ECC bytes must be placed immediately after the data |
489 | bytes in order to make the syndrome generator work. This | 489 | bytes in order to make the syndrome generator work. This |
490 | is contrary to the usual layout used by software ECC. The | 490 | is contrary to the usual layout used by software ECC. The |
491 | separation of data and out of band area is not longer | 491 | separation of data and out of band area is not longer |
@@ -629,7 +629,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) | |||
629 | holds the bad block table. Store a pointer to the pattern | 629 | holds the bad block table. Store a pointer to the pattern |
630 | in the pattern field. Further the length of the pattern has to be | 630 | in the pattern field. Further the length of the pattern has to be |
631 | stored in len and the offset in the spare area must be given | 631 | stored in len and the offset in the spare area must be given |
632 | in the offs member of the nand_bbt_descr stucture. For mirrored | 632 | in the offs member of the nand_bbt_descr structure. For mirrored |
633 | bad block tables different patterns are mandatory.</para></listitem> | 633 | bad block tables different patterns are mandatory.</para></listitem> |
634 | <listitem><para>Table creation</para> | 634 | <listitem><para>Table creation</para> |
635 | <para>Set the option NAND_BBT_CREATE to enable the table creation | 635 | <para>Set the option NAND_BBT_CREATE to enable the table creation |
@@ -648,7 +648,7 @@ static void board_select_chip (struct mtd_info *mtd, int chip) | |||
648 | <listitem><para>Table version control</para> | 648 | <listitem><para>Table version control</para> |
649 | <para>Set the option NAND_BBT_VERSION to enable the table version control. | 649 | <para>Set the option NAND_BBT_VERSION to enable the table version control. |
650 | It's highly recommended to enable this for mirrored tables with write | 650 | It's highly recommended to enable this for mirrored tables with write |
651 | support. It makes sure that the risk of loosing the bad block | 651 | support. It makes sure that the risk of losing the bad block |
652 | table information is reduced to the loss of the information about the | 652 | table information is reduced to the loss of the information about the |
653 | one worn out block which should be marked bad. The version is stored in | 653 | one worn out block which should be marked bad. The version is stored in |
654 | 4 consecutive bytes in the spare area of the device. The position of | 654 | 4 consecutive bytes in the spare area of the device. The position of |
@@ -1060,19 +1060,19 @@ data in this page</entry> | |||
1060 | <row> | 1060 | <row> |
1061 | <entry>0x3D</entry> | 1061 | <entry>0x3D</entry> |
1062 | <entry>ECC byte 21</entry> | 1062 | <entry>ECC byte 21</entry> |
1063 | <entry>Error correction code byte 0 of the eigth 256 Bytes of data | 1063 | <entry>Error correction code byte 0 of the eighth 256 Bytes of data |
1064 | in this page</entry> | 1064 | in this page</entry> |
1065 | </row> | 1065 | </row> |
1066 | <row> | 1066 | <row> |
1067 | <entry>0x3E</entry> | 1067 | <entry>0x3E</entry> |
1068 | <entry>ECC byte 22</entry> | 1068 | <entry>ECC byte 22</entry> |
1069 | <entry>Error correction code byte 1 of the eigth 256 Bytes of data | 1069 | <entry>Error correction code byte 1 of the eighth 256 Bytes of data |
1070 | in this page</entry> | 1070 | in this page</entry> |
1071 | </row> | 1071 | </row> |
1072 | <row> | 1072 | <row> |
1073 | <entry>0x3F</entry> | 1073 | <entry>0x3F</entry> |
1074 | <entry>ECC byte 23</entry> | 1074 | <entry>ECC byte 23</entry> |
1075 | <entry>Error correction code byte 2 of the eigth 256 Bytes of data | 1075 | <entry>Error correction code byte 2 of the eighth 256 Bytes of data |
1076 | in this page</entry> | 1076 | in this page</entry> |
1077 | </row> | 1077 | </row> |
1078 | </tbody></tgroup></informaltable> | 1078 | </tbody></tgroup></informaltable> |
diff --git a/Documentation/DocBook/regulator.tmpl b/Documentation/DocBook/regulator.tmpl index 53f4f8d3b810..346e552fa2cc 100644 --- a/Documentation/DocBook/regulator.tmpl +++ b/Documentation/DocBook/regulator.tmpl | |||
@@ -267,8 +267,8 @@ | |||
267 | <sect1 id="machine-constraint"> | 267 | <sect1 id="machine-constraint"> |
268 | <title>Constraints</title> | 268 | <title>Constraints</title> |
269 | <para> | 269 | <para> |
270 | As well as definining the connections the machine interface | 270 | As well as defining the connections the machine interface |
271 | also provides constraints definining the operations that | 271 | also provides constraints defining the operations that |
272 | clients are allowed to perform and the parameters that may be | 272 | clients are allowed to perform and the parameters that may be |
273 | set. This is required since generally regulator devices will | 273 | set. This is required since generally regulator devices will |
274 | offer more flexibility than it is safe to use on a given | 274 | offer more flexibility than it is safe to use on a given |
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl index b4665b9c40b0..7c4b514d62b1 100644 --- a/Documentation/DocBook/uio-howto.tmpl +++ b/Documentation/DocBook/uio-howto.tmpl | |||
@@ -797,7 +797,7 @@ framework to set up sysfs files for this region. Simply leave it alone. | |||
797 | perform some initialization. After that, your hardware | 797 | perform some initialization. After that, your hardware |
798 | starts working and will generate an interrupt as soon | 798 | starts working and will generate an interrupt as soon |
799 | as it's finished, has some data available, or needs your | 799 | as it's finished, has some data available, or needs your |
800 | attention because an error occured. | 800 | attention because an error occurred. |
801 | </para> | 801 | </para> |
802 | <para> | 802 | <para> |
803 | <filename>/dev/uioX</filename> is a read-only file. A | 803 | <filename>/dev/uioX</filename> is a read-only file. A |
diff --git a/Documentation/DocBook/usb.tmpl b/Documentation/DocBook/usb.tmpl index af293606fbe3..8d57c1888dca 100644 --- a/Documentation/DocBook/usb.tmpl +++ b/Documentation/DocBook/usb.tmpl | |||
@@ -690,7 +690,7 @@ usbdev_ioctl (int fd, int ifno, unsigned request, void *param) | |||
690 | </para><para> | 690 | </para><para> |
691 | This request lets kernel drivers talk to user mode code | 691 | This request lets kernel drivers talk to user mode code |
692 | through filesystem operations even when they don't create | 692 | through filesystem operations even when they don't create |
693 | a charactor or block special device. | 693 | a character or block special device. |
694 | It's also been used to do things like ask devices what | 694 | It's also been used to do things like ask devices what |
695 | device special file should be used. | 695 | device special file should be used. |
696 | Two pre-defined ioctls are used | 696 | Two pre-defined ioctls are used |
diff --git a/Documentation/DocBook/v4l/common.xml b/Documentation/DocBook/v4l/common.xml index dbab79c215c1..9028721438dc 100644 --- a/Documentation/DocBook/v4l/common.xml +++ b/Documentation/DocBook/v4l/common.xml | |||
@@ -100,7 +100,7 @@ linux-kernel@vger.kernel.org, 2002-11-20. --></para> | |||
100 | 100 | ||
101 | <para>By convention system administrators create various | 101 | <para>By convention system administrators create various |
102 | character device special files with these major and minor numbers in | 102 | character device special files with these major and minor numbers in |
103 | the <filename>/dev</filename> directory. The names recomended for the | 103 | the <filename>/dev</filename> directory. The names recommended for the |
104 | different V4L2 device types are listed in <xref linkend="devices" />. | 104 | different V4L2 device types are listed in <xref linkend="devices" />. |
105 | </para> | 105 | </para> |
106 | 106 | ||
diff --git a/Documentation/DocBook/v4l/controls.xml b/Documentation/DocBook/v4l/controls.xml index 2fae3e87ce73..a920ee80f640 100644 --- a/Documentation/DocBook/v4l/controls.xml +++ b/Documentation/DocBook/v4l/controls.xml | |||
@@ -1243,7 +1243,7 @@ values are:</entry> | |||
1243 | </row><row><entry spanname="descr">Mutes the audio when | 1243 | </row><row><entry spanname="descr">Mutes the audio when |
1244 | capturing. This is not done by muting audio hardware, which can still | 1244 | capturing. This is not done by muting audio hardware, which can still |
1245 | produce a slight hiss, but in the encoder itself, guaranteeing a fixed | 1245 | produce a slight hiss, but in the encoder itself, guaranteeing a fixed |
1246 | and reproducable audio bitstream. 0 = unmuted, 1 = muted.</entry> | 1246 | and reproducible audio bitstream. 0 = unmuted, 1 = muted.</entry> |
1247 | </row> | 1247 | </row> |
1248 | <row><entry></entry></row> | 1248 | <row><entry></entry></row> |
1249 | <row id="v4l2-mpeg-video-encoding"> | 1249 | <row id="v4l2-mpeg-video-encoding"> |
diff --git a/Documentation/DocBook/v4l/dev-subdev.xml b/Documentation/DocBook/v4l/dev-subdev.xml index 21caff6d159b..05c8fefcbcbe 100644 --- a/Documentation/DocBook/v4l/dev-subdev.xml +++ b/Documentation/DocBook/v4l/dev-subdev.xml | |||
@@ -90,7 +90,7 @@ | |||
90 | processing hardware.</para> | 90 | processing hardware.</para> |
91 | 91 | ||
92 | <figure id="pipeline-scaling"> | 92 | <figure id="pipeline-scaling"> |
93 | <title>Image Format Negotation on Pipelines</title> | 93 | <title>Image Format Negotiation on Pipelines</title> |
94 | <mediaobject> | 94 | <mediaobject> |
95 | <imageobject> | 95 | <imageobject> |
96 | <imagedata fileref="pipeline.pdf" format="PS" /> | 96 | <imagedata fileref="pipeline.pdf" format="PS" /> |
diff --git a/Documentation/DocBook/v4l/libv4l.xml b/Documentation/DocBook/v4l/libv4l.xml index c14fc3db2a81..3cb10ec51929 100644 --- a/Documentation/DocBook/v4l/libv4l.xml +++ b/Documentation/DocBook/v4l/libv4l.xml | |||
@@ -140,7 +140,7 @@ and is not locked sets the cid to the scaled value. | |||
140 | <para>int v4l2_get_control(int fd, int cid) - | 140 | <para>int v4l2_get_control(int fd, int cid) - |
141 | This function returns a value of 0 - 65535, scaled to from the actual range | 141 | This function returns a value of 0 - 65535, scaled to from the actual range |
142 | of the given v4l control id. when the cid does not exist, could not be | 142 | of the given v4l control id. when the cid does not exist, could not be |
143 | accessed for some reason, or some error occured 0 is returned. | 143 | accessed for some reason, or some error occurred 0 is returned. |
144 | </para></listitem> | 144 | </para></listitem> |
145 | </itemizedlist> | 145 | </itemizedlist> |
146 | </section> | 146 | </section> |
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml index 3c3b667b28e7..160e464d44b7 100644 --- a/Documentation/DocBook/v4l/remote_controllers.xml +++ b/Documentation/DocBook/v4l/remote_controllers.xml | |||
@@ -133,7 +133,7 @@ different IR's. Due to that, V4L2 API now specifies a standard for mapping Media | |||
133 | <row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row> | 133 | <row><entry><constant>KEY_LEFT</constant></entry><entry>Left key</entry><entry>LEFT</entry></row> |
134 | <row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row> | 134 | <row><entry><constant>KEY_RIGHT</constant></entry><entry>Right key</entry><entry>RIGHT</entry></row> |
135 | 135 | ||
136 | <row><entry><emphasis role="bold">Miscelaneous keys</emphasis></entry></row> | 136 | <row><entry><emphasis role="bold">Miscellaneous keys</emphasis></entry></row> |
137 | 137 | ||
138 | <row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row> | 138 | <row><entry><constant>KEY_DOT</constant></entry><entry>Return a dot</entry><entry>.</entry></row> |
139 | <row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row> | 139 | <row><entry><constant>KEY_FN</constant></entry><entry>Select a function</entry><entry>FUNCTION</entry></row> |
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 0ba149de2608..58ced2346e67 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -4784,7 +4784,7 @@ struct _snd_pcm_runtime { | |||
4784 | FM registers can be directly accessed through the direct-FM API, | 4784 | FM registers can be directly accessed through the direct-FM API, |
4785 | defined in <filename><sound/asound_fm.h></filename>. In | 4785 | defined in <filename><sound/asound_fm.h></filename>. In |
4786 | ALSA native mode, FM registers are accessed through | 4786 | ALSA native mode, FM registers are accessed through |
4787 | the Hardware-Dependant Device direct-FM extension API, whereas in | 4787 | the Hardware-Dependent Device direct-FM extension API, whereas in |
4788 | OSS compatible mode, FM registers can be accessed with the OSS | 4788 | OSS compatible mode, FM registers can be accessed with the OSS |
4789 | direct-FM compatible API in <filename>/dev/dmfmX</filename> device. | 4789 | direct-FM compatible API in <filename>/dev/dmfmX</filename> device. |
4790 | </para> | 4790 | </para> |