proto/randrproto: Branch 'master'

[Aaron Plattner]

 randrproto.txt |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a4a6694c059d74247c16527eef4a0ec9f56bbef6
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jan 6 21:34:51 2014 -0800

    spec: RRCrtcChangeMask and RROutputChangeMask are not things
    
    The correct names for these are RRCrtcChangeNotifyMask and
    RROutputChangeNotifyMask, respectively.
    
    v2: "when a the configuration" is also not a thing.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/randrproto.txt b/randrproto.txt
index 2123e7e..864268e 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -406,19 +406,19 @@ The name of this extension is "RANDR".
 
 	New for version 1.2:
 
-	If 'enable' contains RRCrtcChangeMask, RRCrtcChangeNotify events
-	will be sent when a the configuration for a CRTC associated with the
+	If 'enable' contains RRCrtcChangeNotifyMask, RRCrtcChangeNotify events
+	will be sent when the configuration for a CRTC associated with the
 	screen changes, either through this protocol extension or due to
 	detected external changes. RRCrtcChangeNotify may also be sent when
 	this request executes if the CRTC configuration has changed since
 	the client connected, to avoid race conditions.
 
-	If 'enable' contains RROutputChangeMask, RROutputChangeNotify events
-	will be sent when a the configuration for an output associated with
+	If 'enable' contains RROutputChangeNotifyMask, RROutputChangeNotify
+	events will be sent when the configuration for an output associated with
 	the screen changes, either through this protocol extension or due to
-	detected external changes. RROutputChangeNotify may also be sent
-	when this request executes if the output configuration has changed
-	since the client connected, to avoid race conditions.
+	detected external changes. RROutputChangeNotify may also be sent when
+	this request executes if the output configuration has changed since the
+	client connected, to avoid race conditions.
 
 	If 'enable' contains RROutputPropertyNotifyMask,
 	RROutputPropertyNotify events will be sent when properties change on