aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMasanari Iida <standby24x7@gmail.com>2013-08-20 08:53:49 -0400
committerJiri Kosina <jkosina@suse.cz>2013-08-27 04:50:52 -0400
commitac20ad14c3bdb9ed2c43ae16fd949ede9c339502 (patch)
tree757aaf829529ebcb6f8ea679cff68d1212a18ead /Documentation
parent8e33a52fadddcfc9f85594a7ab4802c60ee0046a (diff)
doc: Fix typo "is is" in Documentations
Fix double words "is is" in Documentations. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Acked-by: Rob Landley <rob@landley.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-g-parm.xml4
-rw-r--r--Documentation/fmc/carrier.txt2
-rw-r--r--Documentation/hwmon/submitting-patches2
-rw-r--r--Documentation/mtd/nand_ecc.txt2
-rw-r--r--Documentation/sound/alsa/README.maya442
5 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
index 9058224d1bbf..f4e28e7d4751 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-parm.xml
@@ -132,7 +132,7 @@ devices.</para>
132 <row> 132 <row>
133 <entry>&v4l2-fract;</entry> 133 <entry>&v4l2-fract;</entry>
134 <entry><structfield>timeperframe</structfield></entry> 134 <entry><structfield>timeperframe</structfield></entry>
135 <entry><para>This is is the desired period between 135 <entry><para>This is the desired period between
136successive frames captured by the driver, in seconds. The 136successive frames captured by the driver, in seconds. The
137field is intended to skip frames on the driver side, saving I/O 137field is intended to skip frames on the driver side, saving I/O
138bandwidth.</para><para>Applications store here the desired frame 138bandwidth.</para><para>Applications store here the desired frame
@@ -193,7 +193,7 @@ applications must set the array to zero.</entry>
193 <row> 193 <row>
194 <entry>&v4l2-fract;</entry> 194 <entry>&v4l2-fract;</entry>
195 <entry><structfield>timeperframe</structfield></entry> 195 <entry><structfield>timeperframe</structfield></entry>
196 <entry>This is is the desired period between 196 <entry>This is the desired period between
197successive frames output by the driver, in seconds.</entry> 197successive frames output by the driver, in seconds.</entry>
198 </row> 198 </row>
199 <row> 199 <row>
diff --git a/Documentation/fmc/carrier.txt b/Documentation/fmc/carrier.txt
index 173f6d65c88d..5e4f1dd3e98b 100644
--- a/Documentation/fmc/carrier.txt
+++ b/Documentation/fmc/carrier.txt
@@ -213,7 +213,7 @@ The individual methods perform the following tasks:
213 methods: for example the SPEC driver may define that its carrier 213 methods: for example the SPEC driver may define that its carrier
214 I2C memory is seen at offset 1M and the internal SPI flash is seen 214 I2C memory is seen at offset 1M and the internal SPI flash is seen
215 at offset 16M. This multiplexing of several flash memories in the 215 at offset 16M. This multiplexing of several flash memories in the
216 same address space is is carrier-specific and should only be used 216 same address space is carrier-specific and should only be used
217 by a driver that has verified the `carrier_name' field. 217 by a driver that has verified the `carrier_name' field.
218 218
219 219
diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches
index 46286460462b..3d1bac399a22 100644
--- a/Documentation/hwmon/submitting-patches
+++ b/Documentation/hwmon/submitting-patches
@@ -1,7 +1,7 @@
1 How to Get Your Patch Accepted Into the Hwmon Subsystem 1 How to Get Your Patch Accepted Into the Hwmon Subsystem
2 ------------------------------------------------------- 2 -------------------------------------------------------
3 3
4This text is is a collection of suggestions for people writing patches or 4This text is a collection of suggestions for people writing patches or
5drivers for the hwmon subsystem. Following these suggestions will greatly 5drivers for the hwmon subsystem. Following these suggestions will greatly
6increase the chances of your change being accepted. 6increase the chances of your change being accepted.
7 7
diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/mtd/nand_ecc.txt
index 990efd7a9818..e129b2479ea8 100644
--- a/Documentation/mtd/nand_ecc.txt
+++ b/Documentation/mtd/nand_ecc.txt
@@ -543,7 +543,7 @@ THe code within the for loop was changed to:
543 } 543 }
544 544
545As you can see tmppar is used to accumulate the parity within a for 545As you can see tmppar is used to accumulate the parity within a for
546iteration. In the last 3 statements is is added to par and, if needed, 546iteration. In the last 3 statements is added to par and, if needed,
547to rp12 and rp14. 547to rp12 and rp14.
548 548
549While making the changes I also found that I could exploit that tmppar 549While making the changes I also found that I could exploit that tmppar
diff --git a/Documentation/sound/alsa/README.maya44 b/Documentation/sound/alsa/README.maya44
index 0e41576fa13e..67b2ea1cc31d 100644
--- a/Documentation/sound/alsa/README.maya44
+++ b/Documentation/sound/alsa/README.maya44
@@ -120,7 +120,7 @@ Mic Phantom+48V: switch for +48V phantom power for electrostatic microphones on
120 Make sure this is not turned on while any other source is connected to input 1/2. 120 Make sure this is not turned on while any other source is connected to input 1/2.
121 It might damage the source and/or the maya44 card. 121 It might damage the source and/or the maya44 card.
122 122
123Mic/Line input: if switch is is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo). 123Mic/Line input: if switch is on, input jack 1/2 is microphone input (mono), otherwise line input (stereo).
124 124
125Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver. 125Bypass: analogue bypass from ADC input to output for channel 1+2. Same as "Monitor" in the windows driver.
126Bypass 1: same for channel 3+4. 126Bypass 1: same for channel 3+4.