diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/media/dvb/dvbproperty.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media_api.tmpl | 2 | ||||
-rw-r--r-- | Documentation/filesystems/autofs4-mount-control.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/hfsplus.txt | 2 | ||||
-rw-r--r-- | Documentation/futex-requeue-pi.txt | 2 | ||||
-rw-r--r-- | Documentation/input/multi-touch-protocol.txt | 2 | ||||
-rw-r--r-- | Documentation/kmemcheck.txt | 2 | ||||
-rw-r--r-- | Documentation/memory-barriers.txt | 2 | ||||
-rw-r--r-- | Documentation/module-signing.txt | 10 | ||||
-rw-r--r-- | Documentation/networking/spider_net.txt | 2 | ||||
-rw-r--r-- | Documentation/power/devices.txt | 2 | ||||
-rw-r--r-- | Documentation/security/Smack.txt | 2 | ||||
-rw-r--r-- | Documentation/trace/ring-buffer-design.txt | 2 | ||||
-rw-r--r-- | Documentation/usb/WUSB-Design-overview.txt | 2 | ||||
-rw-r--r-- | Documentation/virtual/kvm/api.txt | 2 | ||||
-rw-r--r-- | Documentation/vm/unevictable-lru.txt | 2 |
17 files changed, 21 insertions, 21 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml index a9b15e34c5b2..24c22cabc668 100644 --- a/Documentation/DocBook/media/dvb/dvbproperty.xml +++ b/Documentation/DocBook/media/dvb/dvbproperty.xml | |||
@@ -196,7 +196,7 @@ get/set up to 64 properties. The actual meaning of each property is described on | |||
196 | <para>1)For satellital delivery systems, it is measured in kHz. | 196 | <para>1)For satellital delivery systems, it is measured in kHz. |
197 | For the other ones, it is measured in Hz.</para> | 197 | For the other ones, it is measured in Hz.</para> |
198 | <para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz. | 198 | <para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz. |
199 | E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of | 199 | E.g. a valid frequency could be 474143 kHz. The stepping is bound to the bandwidth of |
200 | the channel which is 6MHz.</para> | 200 | the channel which is 6MHz.</para> |
201 | 201 | ||
202 | <para>3)As in ISDB-Tsb the channel consists of only one or three segments the | 202 | <para>3)As in ISDB-Tsb the channel consists of only one or three segments the |
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index c4cac6dbf9af..86c6dd2f6b8a 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -397,7 +397,7 @@ linkend="control" />.</para> | |||
397 | 397 | ||
398 | <para>The <structfield>depth</structfield> (average number of | 398 | <para>The <structfield>depth</structfield> (average number of |
399 | bits per pixel) of a video image is implied by the selected image | 399 | bits per pixel) of a video image is implied by the selected image |
400 | format. V4L2 does not explicitely provide such information assuming | 400 | format. V4L2 does not explicitly provide such information assuming |
401 | applications recognizing the format are aware of the image depth and | 401 | applications recognizing the format are aware of the image depth and |
402 | others need not know. The <structfield>palette</structfield> field | 402 | others need not know. The <structfield>palette</structfield> field |
403 | moved into the &v4l2-pix-format;:<informaltable> | 403 | moved into the &v4l2-pix-format;:<informaltable> |
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl index 4c8d282545a2..ab56f89c8642 100644 --- a/Documentation/DocBook/media_api.tmpl +++ b/Documentation/DocBook/media_api.tmpl | |||
@@ -58,7 +58,7 @@ Foundation. A copy of the license is included in the chapter entitled | |||
58 | <title>Introduction</title> | 58 | <title>Introduction</title> |
59 | 59 | ||
60 | <para>This document covers the Linux Kernel to Userspace API's used by | 60 | <para>This document covers the Linux Kernel to Userspace API's used by |
61 | video and radio straming devices, including video cameras, | 61 | video and radio streaming devices, including video cameras, |
62 | analog and digital TV receiver cards, AM/FM receiver cards, | 62 | analog and digital TV receiver cards, AM/FM receiver cards, |
63 | streaming capture devices.</para> | 63 | streaming capture devices.</para> |
64 | <para>It is divided into four parts.</para> | 64 | <para>It is divided into four parts.</para> |
diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt index 4c95935cbcf4..aff22113a986 100644 --- a/Documentation/filesystems/autofs4-mount-control.txt +++ b/Documentation/filesystems/autofs4-mount-control.txt | |||
@@ -255,7 +255,7 @@ AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT | |||
255 | 255 | ||
256 | Obtain and release a file descriptor for an autofs managed mount point | 256 | Obtain and release a file descriptor for an autofs managed mount point |
257 | path. The open call requires an initialized struct autofs_dev_ioctl with | 257 | path. The open call requires an initialized struct autofs_dev_ioctl with |
258 | the the path field set and the size field adjusted appropriately as well | 258 | the path field set and the size field adjusted appropriately as well |
259 | as the arg1 field set to the device number of the autofs mount. The | 259 | as the arg1 field set to the device number of the autofs mount. The |
260 | device number can be obtained from the mount options shown in | 260 | device number can be obtained from the mount options shown in |
261 | /proc/mounts. The close call requires an initialized struct | 261 | /proc/mounts. The close call requires an initialized struct |
diff --git a/Documentation/filesystems/hfsplus.txt b/Documentation/filesystems/hfsplus.txt index af1628a1061c..59f7569fc9ed 100644 --- a/Documentation/filesystems/hfsplus.txt +++ b/Documentation/filesystems/hfsplus.txt | |||
@@ -56,4 +56,4 @@ References | |||
56 | 56 | ||
57 | kernel source: <file:fs/hfsplus> | 57 | kernel source: <file:fs/hfsplus> |
58 | 58 | ||
59 | Apple Technote 1150 http://developer.apple.com/technotes/tn/tn1150.html | 59 | Apple Technote 1150 https://developer.apple.com/legacy/library/technotes/tn/tn1150.html |
diff --git a/Documentation/futex-requeue-pi.txt b/Documentation/futex-requeue-pi.txt index 9dc1ff4fd536..31b16610c416 100644 --- a/Documentation/futex-requeue-pi.txt +++ b/Documentation/futex-requeue-pi.txt | |||
@@ -67,7 +67,7 @@ pthread_cond_wait_pi(cond, mutex) | |||
67 | lock(cond->__data.__lock); | 67 | lock(cond->__data.__lock); |
68 | } while(...) | 68 | } while(...) |
69 | unlock(cond->__data.__lock); | 69 | unlock(cond->__data.__lock); |
70 | /* the kernel acquired the the mutex for us */ | 70 | /* the kernel acquired the mutex for us */ |
71 | } | 71 | } |
72 | 72 | ||
73 | pthread_cond_broadcast_pi(cond) | 73 | pthread_cond_broadcast_pi(cond) |
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt index de139b18184a..7b4f59c09ee2 100644 --- a/Documentation/input/multi-touch-protocol.txt +++ b/Documentation/input/multi-touch-protocol.txt | |||
@@ -372,7 +372,7 @@ simple scheme, which is compatible with earlier usage, is: | |||
372 | 372 | ||
373 | Rationale: We have no information about the orientation of the touching | 373 | Rationale: We have no information about the orientation of the touching |
374 | ellipse, so approximate it with an inscribed circle instead. The tool | 374 | ellipse, so approximate it with an inscribed circle instead. The tool |
375 | ellipse should align with the the vector (T - C), so the diameter must | 375 | ellipse should align with the vector (T - C), so the diameter must |
376 | increase with distance(T, C). Finally, assume that the touch diameter is | 376 | increase with distance(T, C). Finally, assume that the touch diameter is |
377 | equal to the tool thickness, and we arrive at the formulas above. | 377 | equal to the tool thickness, and we arrive at the formulas above. |
378 | 378 | ||
diff --git a/Documentation/kmemcheck.txt b/Documentation/kmemcheck.txt index 9398a501fdb9..a41bdebbe87b 100644 --- a/Documentation/kmemcheck.txt +++ b/Documentation/kmemcheck.txt | |||
@@ -541,7 +541,7 @@ initialized. This is the beginning of the struct: | |||
541 | 92 } _sifields; | 541 | 92 } _sifields; |
542 | 93 } siginfo_t; | 542 | 93 } siginfo_t; |
543 | 543 | ||
544 | On 64-bit, the int is 4 bytes long, so it must the the union member that has | 544 | On 64-bit, the int is 4 bytes long, so it must the union member that has |
545 | not been initialized. We can verify this using gdb: | 545 | not been initialized. We can verify this using gdb: |
546 | 546 | ||
547 | $ gdb vmlinux | 547 | $ gdb vmlinux |
diff --git a/Documentation/memory-barriers.txt b/Documentation/memory-barriers.txt index 11c1d2049662..556f951f8626 100644 --- a/Documentation/memory-barriers.txt +++ b/Documentation/memory-barriers.txt | |||
@@ -1401,7 +1401,7 @@ code. Here are some examples of these sorts of optimizations: | |||
1401 | process_message(msg); | 1401 | process_message(msg); |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | There is nothing to prevent the the compiler from transforming | 1404 | There is nothing to prevent the compiler from transforming |
1405 | process_level() to the following, in fact, this might well be a | 1405 | process_level() to the following, in fact, this might well be a |
1406 | win for single-threaded code: | 1406 | win for single-threaded code: |
1407 | 1407 | ||
diff --git a/Documentation/module-signing.txt b/Documentation/module-signing.txt index 2b40e04d3c49..09b583e38907 100644 --- a/Documentation/module-signing.txt +++ b/Documentation/module-signing.txt | |||
@@ -77,11 +77,11 @@ This has a number of options available: | |||
77 | This presents a choice of which hash algorithm the installation phase will | 77 | This presents a choice of which hash algorithm the installation phase will |
78 | sign the modules with: | 78 | sign the modules with: |
79 | 79 | ||
80 | CONFIG_SIG_SHA1 "Sign modules with SHA-1" | 80 | CONFIG_MODULE_SIG_SHA1 "Sign modules with SHA-1" |
81 | CONFIG_SIG_SHA224 "Sign modules with SHA-224" | 81 | CONFIG_MODULE_SIG_SHA224 "Sign modules with SHA-224" |
82 | CONFIG_SIG_SHA256 "Sign modules with SHA-256" | 82 | CONFIG_MODULE_SIG_SHA256 "Sign modules with SHA-256" |
83 | CONFIG_SIG_SHA384 "Sign modules with SHA-384" | 83 | CONFIG_MODULE_SIG_SHA384 "Sign modules with SHA-384" |
84 | CONFIG_SIG_SHA512 "Sign modules with SHA-512" | 84 | CONFIG_MODULE_SIG_SHA512 "Sign modules with SHA-512" |
85 | 85 | ||
86 | The algorithm selected here will also be built into the kernel (rather | 86 | The algorithm selected here will also be built into the kernel (rather |
87 | than being a module) so that modules signed with that algorithm can have | 87 | than being a module) so that modules signed with that algorithm can have |
diff --git a/Documentation/networking/spider_net.txt b/Documentation/networking/spider_net.txt index 4b4adb8eb14f..b0b75f8463b3 100644 --- a/Documentation/networking/spider_net.txt +++ b/Documentation/networking/spider_net.txt | |||
@@ -73,7 +73,7 @@ Thus, in an idle system, the GDACTDPA, tail and head pointers will | |||
73 | all be pointing at the same descr, which should be "empty". All of the | 73 | all be pointing at the same descr, which should be "empty". All of the |
74 | other descrs in the ring should be "empty" as well. | 74 | other descrs in the ring should be "empty" as well. |
75 | 75 | ||
76 | The show_rx_chain() routine will print out the the locations of the | 76 | The show_rx_chain() routine will print out the locations of the |
77 | GDACTDPA, tail and head pointers. It will also summarize the contents | 77 | GDACTDPA, tail and head pointers. It will also summarize the contents |
78 | of the ring, starting at the tail pointer, and listing the status | 78 | of the ring, starting at the tail pointer, and listing the status |
79 | of the descrs that follow. | 79 | of the descrs that follow. |
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt index a66c9821b5ce..47d46dff70f7 100644 --- a/Documentation/power/devices.txt +++ b/Documentation/power/devices.txt | |||
@@ -391,7 +391,7 @@ When resuming from freeze, standby or memory sleep, the phases are: | |||
391 | the resume methods. This generally involves undoing the actions of the | 391 | the resume methods. This generally involves undoing the actions of the |
392 | preceding suspend_late phase. | 392 | preceding suspend_late phase. |
393 | 393 | ||
394 | 3 The resume methods should bring the the device back to its operating | 394 | 3 The resume methods should bring the device back to its operating |
395 | state, so that it can perform normal I/O. This generally involves | 395 | state, so that it can perform normal I/O. This generally involves |
396 | undoing the actions of the suspend phase. | 396 | undoing the actions of the suspend phase. |
397 | 397 | ||
diff --git a/Documentation/security/Smack.txt b/Documentation/security/Smack.txt index 7a2d30c132e3..5ea996f21d6c 100644 --- a/Documentation/security/Smack.txt +++ b/Documentation/security/Smack.txt | |||
@@ -3,7 +3,7 @@ | |||
3 | "Good for you, you've decided to clean the elevator!" | 3 | "Good for you, you've decided to clean the elevator!" |
4 | - The Elevator, from Dark Star | 4 | - The Elevator, from Dark Star |
5 | 5 | ||
6 | Smack is the the Simplified Mandatory Access Control Kernel. | 6 | Smack is the Simplified Mandatory Access Control Kernel. |
7 | Smack is a kernel based implementation of mandatory access | 7 | Smack is a kernel based implementation of mandatory access |
8 | control that includes simplicity in its primary design goals. | 8 | control that includes simplicity in its primary design goals. |
9 | 9 | ||
diff --git a/Documentation/trace/ring-buffer-design.txt b/Documentation/trace/ring-buffer-design.txt index 7d350b496585..ff747b6fa39b 100644 --- a/Documentation/trace/ring-buffer-design.txt +++ b/Documentation/trace/ring-buffer-design.txt | |||
@@ -683,7 +683,7 @@ against nested writers. | |||
683 | cmpxchg(tail_page, temp_page, next_page) | 683 | cmpxchg(tail_page, temp_page, next_page) |
684 | 684 | ||
685 | The above will update the tail page if it is still pointing to the expected | 685 | The above will update the tail page if it is still pointing to the expected |
686 | page. If this fails, a nested write pushed it forward, the the current write | 686 | page. If this fails, a nested write pushed it forward, the current write |
687 | does not need to push it. | 687 | does not need to push it. |
688 | 688 | ||
689 | 689 | ||
diff --git a/Documentation/usb/WUSB-Design-overview.txt b/Documentation/usb/WUSB-Design-overview.txt index 4c5e37939344..1cd07c017cf6 100644 --- a/Documentation/usb/WUSB-Design-overview.txt +++ b/Documentation/usb/WUSB-Design-overview.txt | |||
@@ -25,7 +25,7 @@ updated content. | |||
25 | * Design-overview.txt-1.8 | 25 | * Design-overview.txt-1.8 |
26 | 26 | ||
27 | This code implements a Ultra Wide Band stack for Linux, as well as | 27 | This code implements a Ultra Wide Band stack for Linux, as well as |
28 | drivers for the the USB based UWB radio controllers defined in the | 28 | drivers for the USB based UWB radio controllers defined in the |
29 | Wireless USB 1.0 specification (including Wireless USB host controller | 29 | Wireless USB 1.0 specification (including Wireless USB host controller |
30 | and an Intel WiNET controller). | 30 | and an Intel WiNET controller). |
31 | 31 | ||
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index c24211da4120..a9380ba54c8e 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt | |||
@@ -1491,7 +1491,7 @@ struct kvm_lapic_state { | |||
1491 | char regs[KVM_APIC_REG_SIZE]; | 1491 | char regs[KVM_APIC_REG_SIZE]; |
1492 | }; | 1492 | }; |
1493 | 1493 | ||
1494 | Copies the input argument into the the Local APIC registers. The data format | 1494 | Copies the input argument into the Local APIC registers. The data format |
1495 | and layout are the same as documented in the architecture manual. | 1495 | and layout are the same as documented in the architecture manual. |
1496 | 1496 | ||
1497 | 1497 | ||
diff --git a/Documentation/vm/unevictable-lru.txt b/Documentation/vm/unevictable-lru.txt index a68db7692ee8..744f82f86c58 100644 --- a/Documentation/vm/unevictable-lru.txt +++ b/Documentation/vm/unevictable-lru.txt | |||
@@ -453,7 +453,7 @@ putback_lru_page() function to add migrated pages back to the LRU. | |||
453 | mmap(MAP_LOCKED) SYSTEM CALL HANDLING | 453 | mmap(MAP_LOCKED) SYSTEM CALL HANDLING |
454 | ------------------------------------- | 454 | ------------------------------------- |
455 | 455 | ||
456 | In addition the the mlock()/mlockall() system calls, an application can request | 456 | In addition the mlock()/mlockall() system calls, an application can request |
457 | that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap() | 457 | that a region of memory be mlocked supplying the MAP_LOCKED flag to the mmap() |
458 | call. Furthermore, any mmap() call or brk() call that expands the heap by a | 458 | call. Furthermore, any mmap() call or brk() call that expands the heap by a |
459 | task that has previously called mlockall() with the MCL_FUTURE flag will result | 459 | task that has previously called mlockall() with the MCL_FUTURE flag will result |