xserver: Branch 'master'

[GitLab Mirror]

 Makefile.am |    1 +
 README.md   |   23 ++++++++---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 80c1e0d964543c7ab507fd10fbc5eefbb633490a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Nov 19 23:23:27 2018 -0800

    Update README for gitlab migration
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/Makefile.am b/Makefile.am
index a58faca..0855985 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -503,6 +503,7 @@ EXTRA_DIST = \
     COPYING-xf86rushproto \
     COPYING-xf86vidmodeproto \
     COPYING-xineramaproto \
+    README.md \
     include/GL/internal/meson.build \
     include/GL/meson.build \
     include/meson.build \
diff --git a/README b/README.md
similarity index 61%
rename from README
rename to README.md
index b0eb5be..4237f7f 100644
--- a/README
+++ b/README.md
@@ -1,4 +1,5 @@
-		X Window System Unified Protocol
+X Window System Unified Protocol
+--------------------------------
 
 This package provides the headers and specification documents defining
 the core protocol and (many) extensions for the X Window System. The
@@ -13,29 +14,21 @@ versions of the X11 suite. If you are looking for a machine-readable
 protocol description suitable for code generation or use in new
 projects, please refer to the XCB project:
 
-        https://xcb.freedesktop.org/
-        https://cgit.freedesktop.org/xcb/proto
+  https://xcb.freedesktop.org/
+  https://cgit.freedesktop.org/xcb/proto
 
 All questions regarding this software should be directed at the
 Xorg mailing list:
 
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+  https://lists.x.org/mailman/listinfo/xorg
 
 The master development code repository can be found at:
 
-        git://anongit.freedesktop.org/git/xorg/proto/xorgproto
+  https://gitlab.freedesktop.org/xorg/proto/xorgproto
 
-        http://cgit.freedesktop.org/xorg/proto/xorgproto
+Please submit bug reports and requests to merge patches there.
 
 For patch submission instructions, see:
 
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
+  https://www.x.org/wiki/Development/Documentation/SubmittingPatches