xserver: Branch 'master' - 2 commits

[Adam Jackson]

 README |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit ea91996a9c2081d0692f5c2f79a9fda9effba358
Author: Daniel Stone <daniels at collabora.com>
Date:   Tue Apr 11 07:55:00 2017 +0100

    README: Add link to fd.o CoC
    
    The Contributor Covenant applies to all fd.o-hosted resources, including
    lists and Bugzilla. Add a note to the README, reminding people to act
    like human beings.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Daniel Stone <daniels at collabora.com>

diff --git a/README b/README
index d95aacb21..529526d18 100644
--- a/README
+++ b/README
@@ -36,3 +36,9 @@ For more information on the git code manager, see:
 
         https://wiki.x.org/wiki/GitPage
 
+As with other projects hosted on freedesktop.org, X.Org follows its
+Code of Conduct, based on the Contributor Covenant. Please conduct
+yourself in a respectful and civilized manner when using the above
+mailing lists, bug trackers, etc:
+
+	https://www.freedesktop.org/wiki/CodeOfConduct
commit 8bdf340e478524262c85fb81687d7f02b14ad71c
Author: Daniel Stone <daniels at collabora.com>
Date:   Tue Apr 11 07:54:59 2017 +0100

    README: HTTPS everywhere
    
    All fd.o HTTP services are now HTTPS-only (with redirects, but still).
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Daniel Stone <daniels at collabora.com>

diff --git a/README b/README
index b2499a059..d95aacb21 100644
--- a/README
+++ b/README
@@ -11,12 +11,12 @@ and draggable titlebars and borders.
 
 For a comprehensive overview of X Server and X Window System, consult the
 following article:
-http://en.wikipedia.org/wiki/X_server
+https://en.wikipedia.org/wiki/X_server
 
 All questions regarding this software should be directed at the
 Xorg mailing list:
 
-        http://lists.freedesktop.org/mailman/listinfo/xorg
+        https://lists.freedesktop.org/mailman/listinfo/xorg
 
 Please submit bug reports to the Xorg bugzilla:
 
@@ -26,13 +26,13 @@ The master development code repository can be found at:
 
         git://anongit.freedesktop.org/git/xorg/xserver
 
-        http://cgit.freedesktop.org/xorg/xserver
+        https://cgit.freedesktop.org/xorg/xserver
 
 For patch submission instructions, see:
 
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+	https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
 For more information on the git code manager, see:
 
-        http://wiki.x.org/wiki/GitPage
+        https://wiki.x.org/wiki/GitPage