xserver: Branch 'master'

[GitLab Mirror]

 hw/dmx/man/Xdmx.man          |    2 +-
 hw/xfree86/man/Xorg.man      |    8 ++++----
 hw/xfree86/man/xorg.conf.man |    2 +-
 hw/xquartz/man/Xquartz.man   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a5151f58cf98d1696d60a3577dc50851f159da8a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun May 10 17:46:33 2020 -0700

    Update URL's in man pages
    
    Mostly http->https conversions, but also replaces gitweb.fd.o
    with gitlab.fd.o, and xquartz.macosforge.org with xquartz.org.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man
index 36ae9117f..a5bdccd58 100644
--- a/hw/dmx/man/Xdmx.man
+++ b/hw/dmx/man/Xdmx.man
@@ -729,4 +729,4 @@ Portions of
 are based on code from The XFree86 Project
 .RI ( http://www.xfree86.org )
 and X.Org
-.RI ( http://www.x.org ).
+.RI ( https://www.x.org ).
diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man
index af4267c74..3ec6e2c25 100644
--- a/hw/xfree86/man/Xorg.man
+++ b/hw/xfree86/man/Xorg.man
@@ -561,7 +561,7 @@ vesa(@drivermansuffix@),
 vmware(@drivermansuffix@),
 .br
 Web site
-.IR <http://www.x.org> .
+.IR <https://www.x.org> .
 
 .SH AUTHORS
 Xorg has many contributors world wide.  The names of most of them
@@ -614,9 +614,9 @@ Orest Zborowski    \fIorestz at eskimo.com\fP
 .PP
 Xorg source is available from the FTP server
 \fI<ftp://ftp.x.org/>\fP, and from the X.Org
-server \fI<http://gitweb.freedesktop.org/>\fP.  Documentation and other
+server \fI<https://gitlab.freedesktop.org/xorg/>\fP.  Documentation and other
 information can be found from the X.Org web site
-\fI<http://www.x.org/>\fP.
+\fI<https://www.x.org/>\fP.
 
 .SH LEGAL
 .PP
@@ -626,7 +626,7 @@ and redistribution in source and binary form without fee.
 .B Xorg is copyright by numerous authors and
 contributors from around the world.  Licensing information can be found
 at
-.IR <http://www.x.org> .
+.IR <https://www.x.org> .
 Refer to the source code for specific copyright notices.
 .PP
 .B XFree86(TM)
diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
index dac9fa53f..ac88d7e7a 100644
--- a/hw/xfree86/man/xorg.conf.man
+++ b/hw/xfree86/man/xorg.conf.man
@@ -2508,7 +2508,7 @@ section for a dual headed configuration with two mice:
 This optional section is used to provide some information for the
 Direct Rendering Infrastructure.
 Details about the format of this section can be found on-line at
-.IR <http://dri.freedesktop.org/> .
+.IR <https://dri.freedesktop.org/> .
 .SH "VENDOR SECTION"
 The optional
 .B Vendor
diff --git a/hw/xquartz/man/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 6f19202d6..14aa872c0 100644
--- a/hw/xquartz/man/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man
@@ -136,7 +136,7 @@ instead of -d.
 .PP
 X(@miscmansuffix@), Xserver(1), xdm(1), xinit(1), syslog(1), syslogd(8)
 .PP
-http://xquartz.macosforge.org
+https://www.xquartz.org/
 .PP
 .SH AUTHORS / HISTORY
 X11 was originally ported to Mac OS X Server by John Carmack.  Dave