---

yaml
---
r: 275188
b: refs/heads/master
c: 2c267e9
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c54781bc5aaec1e23bc50a4ef757b8e8bfc693b
+refs/heads/master: 2c267e9e016da3e19a95261875a5f3b19dd6e9f6

trunk/Documentation/DocBook/drm.tmpl

@@ -154,8 +154,8 @@
     </programlisting>
     <para>
       In the example above, taken from the i915 DRM driver, the driver
-      sets several flags indicating what core features it supports.
-      We go over the individual callbacks in later sections.  Since
+      sets several flags indicating what core features it supports;
+      we go over the individual callbacks in later sections.  Since
       flags indicate which features your driver supports to the DRM
       core, you need to set most of them prior to calling drm_init().  Some,
       like DRIVER_MODESET can be set later based on user supplied parameters,
@@ -647,8 +647,8 @@ void intel_crt_init(struct drm_device *dev)
   <sect1>
     <title>Memory management</title>
     <para>
-      The memory manager lies at the heart of many DRM operations, and
-      is also required to support advanced client features like OpenGL
+      The memory manager lies at the heart of many DRM operations; it
+      is required to support advanced client features like OpenGL
       pbuffers.  The DRM currently contains two memory managers, TTM
       and GEM.
     </para>