3 files changed, 11 insertions, 9 deletions

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 7583dc7cf64d..910c923a9b86 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -389,7 +389,7 @@
       </para>
       <para>
         If your driver supports memory management (it should!), you'll
-        need to set that up at load time as well.  How you intialize
+        need to set that up at load time as well.  How you initialize
         it depends on which memory manager you're using, TTM or GEM.
       </para>
       <sect3>
@@ -399,7 +399,7 @@
           aperture space for graphics devices. TTM supports both UMA devices
           and devices with dedicated video RAM (VRAM), i.e. most discrete
           graphics devices.  If your device has dedicated RAM, supporting
-          TTM is desireable.  TTM also integrates tightly with your
+          TTM is desirable.  TTM also integrates tightly with your
           driver specific buffer execution function.  See the radeon
           driver for examples.
         </para>
@@ -443,7 +443,7 @@
           likely eventually calling ttm_bo_global_init and
           ttm_bo_global_release, respectively.  Also like the previous
           object, ttm_global_item_ref is used to create an initial reference
-          count for the TTM, which will call your initalization function.
+          count for the TTM, which will call your initialization function.
         </para>
       </sect3>
       <sect3>
@@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev)
           CRT connector and encoder combination is created.  A device
           specific i2c bus is also created, for fetching EDID data and
           performing monitor detection.  Once the process is complete,
-          the new connector is regsitered with sysfs, to make its
+          the new connector is registered with sysfs, to make its
           properties available to applications.
         </para>
         <sect4>
@@ -581,12 +581,12 @@ void intel_crt_init(struct drm_device *dev)
         <para>
           For each encoder, CRTC and connector, several functions must
           be provided, depending on the object type.  Encoder objects
-          need should provide a DPMS (basically on/off) function, mode fixup
+          need to provide a DPMS (basically on/off) function, mode fixup
           (for converting requested modes into native hardware timings),
           and prepare, set and commit functions for use by the core DRM
           helper functions.  Connector helpers need to provide mode fetch and
           validity functions as well as an encoder matching function for
-          returing an ideal encoder for a given connector.  The core
+          returning an ideal encoder for a given connector.  The core
           connector functions include a DPMS callback, (deprecated)
           save/restore routines, detection, mode probing, property handling,
           and cleanup functions.
diff --git a/Documentation/DocBook/v4l/v4l2.xml b/Documentation/DocBook/v4l/v4l2.xml
index 9737243377a3..7c3c098d5d08 100644
--- a/Documentation/DocBook/v4l/v4l2.xml
+++ b/Documentation/DocBook/v4l/v4l2.xml
@@ -58,7 +58,7 @@ MPEG stream embedded, sliced VBI data format in this specification.
 </contrib>
         <affiliation>
           <address>
-            <email>awalls@radix.net</email>
+            <email>awalls@md.metrocast.net</email>
           </address>
         </affiliation>
       </author>
diff --git a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
index 87e4f0f6151c..402229ee06f6 100644
--- a/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
+++ b/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml
@@ -53,8 +53,10 @@ input</refpurpose>
 automatically, similar to sensing the video standard. To do so, applications
 call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a
 &v4l2-dv-preset; type. Once the hardware detects a preset, that preset is
-returned in the preset field of &v4l2-dv-preset;. When detection is not
-possible or fails, the value V4L2_DV_INVALID is returned.</para>
+returned in the preset field of &v4l2-dv-preset;. If the preset could not be
+detected because there was no signal, or the signal was unreliable, or the
+signal did not map to a supported preset, then the value V4L2_DV_INVALID is
+returned.</para>
   </refsect1>
 
   <refsect1>