Mass http -> https replacement where appropriate

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

12 files changed, 97 insertions, 100 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ebcbb4a..7ee713d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -35,7 +35,7 @@ S: Status, one of the following:
 			should be using that.
 
 For patch submission instructions, see:
-        http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+        https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
 Send all patches for modules without a specific maintainer address listed
 to xorg-devel@lists.x.org
@@ -301,84 +301,84 @@ Composite extension
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Configuration subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Damage extension
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Device Independent X (DIX)
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 DRI subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 EXA subsystem
 P:	Eric Anholt
 M:	anholt@freebsd.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 GL subsystem
 P:	Ian Romanick
 M:	idr@us.ibm.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 KDrive
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Loader subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Randr extension
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Render extension
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 XAA subsystem
 P:	Adam Jackson
 M:	ajax@nwnk.net
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Despised
 
 XACE subsystem (security policy extensions framework)
@@ -392,14 +392,14 @@ Xfixes extension
 P:	Keith Packard
 M:	keith.packard@intel.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 XKB
 P:	Daniel Stone
 M:	daniel@fooishbar.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained, being seriously overhauled
 S:	Please contact Daniel if you're planning to work on this
 
@@ -409,7 +409,7 @@ M:	daniel@fooishbar.org
 P:	Peter Hutterer
 M:	peter.hutterer@who-t.net
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained, being overhauled
 S:	Please contact Daniel or Peter if you're planning to work on this
 
@@ -427,42 +427,42 @@ FreeBSD
 P:	Eric Anholt
 M:	anholt@freebsd.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Linux/i386
 P:	Egbert Eich
 M:	eich@freedesktop.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Linux/x86_64
 P:	Egbert Eich
 M:	eich@freedesktop.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ia64
 P:	Jesse Barnes
 M:	jbarnes@virtuousgeek.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Linux/ppc
 P:	Benjamin Herrenschmidt
 M:	benh@kernel.crashing.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Linux/sparc
 P:	?
 M:	?
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Unmaintained
 
 LynxOS
@@ -474,37 +474,37 @@ M:	bbyer@apple.com
 P:	Jeremy Huddleston
 M:	jeremyhu@apple.com
 L:	xquartz-dev@lists.macosforge.org
-W:	http://xquartz.macosforge.org
+W:	https://www.xquartz.org/
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 NetBSD
 P:	?
 M:	xorg-devel@lists.x.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Unmaintained
 
 OpenBSD
 P:	Matthieu Herrb
 M:	matthieu.herrb@laas.fr
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 SCO (OpenServer 5)
 P:	Kean Johnston
 M:	jkj@freedesktop.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 System V (other than Solaris & SCO)
 P:	?
 M:	xorg-devel@lists.x.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Unmaintained (libraries/apps) ; Obsolete/Removed (Xorg server)
 
 Solaris (x86 & sparc)
@@ -520,7 +520,7 @@ USL (UnixWare 7.1.x, OpenServer 6)
 P:	Kean Johnston
 M:	jkj@freedesktop.org
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 Cygwin
@@ -529,7 +529,7 @@ M:	jon.turney@dronecode.org.uk
 P:	Yaakov Selkowitz
 M:	yselkowitz@users.sourceforge.net
 L:	cygwin-xfree@cygwin.com
-W:	http://x.cygwin.com/
+W:	https://x.cygwin.com/
 S:	Maintained
 
 MinGW
@@ -541,7 +541,7 @@ S:	Maintained
 GNU/Hurd
 P:	Samuel Thibault
 M:	samuel.thibault@ens-lyon.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 L:	bug-hurd@gnu.org
 S:	Maintained
 
@@ -747,7 +747,7 @@ xf86-input-vmmouse
 P:	VMware Linux Graphics Maintainer
 M:	linux-graphics-maintainer@vmware.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org/wiki/vmware
+W:	https://wiki.x.org/wiki/vmware
 S:	Supported
 
 xf86-input-void
@@ -805,7 +805,7 @@ xf86-video-cyrix
 P:	?
 M:	?
 L:	xorg-driver-geode@lists.x.org
-W:	http://www.x.org/wiki/GeodeDriver
+W:	https://www.x.org/wiki/GeodeDriver
 S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-dummy
@@ -826,8 +826,8 @@ xf86-video-geode
 P:	?
 M:	?
 L:	xorg-driver-geode@lists.x.org
-W:	http://lists.x.org/mailman/listinfo/xorg-driver-geode
-W:	http://www.x.org/wiki/GeodeDriver
+W:	https://lists.x.org/mailman/listinfo/xorg-driver-geode
+W:	https://www.x.org/wiki/GeodeDriver
 S:	Maintained
 
 xf86-video-glide
@@ -919,14 +919,14 @@ xf86-video-nsc
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
 L:	xorg-driver-geode@lists.x.org
-W:	http://www.x.org/wiki/GeodeDriver
+W:	https://www.x.org/wiki/GeodeDriver
 S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-nv
 P:	Aaron Plattner
 M:	aplattner@freedesktop.org
 L:	https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Maintained
 
 xf86-video-omap
@@ -965,7 +965,7 @@ P:      Ben Herrenschmidt
 P:      et al
 M:	?
 L:	xorg-driver-ati@lists.x.org
-W:	http://www.x.org/wiki/radeon
+W:	https://www.x.org/wiki/radeon
 S:	Maintained
 
 xf86-video-s3
@@ -1111,7 +1111,7 @@ xf86-video-vmware
 P:	VMware Linux Graphics Maintainer
 M:	linux-graphics-maintainer@vmware.com
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org/vmware
+W:	https://wiki.x.org/vmware
 S:	Maintained
 
 xf86-video-voodoo
@@ -1162,20 +1162,20 @@ Mailing lists (lists.x.org)
 P:	?
 M:	mailman@lists.x.org
 L:	mailman@lists.x.org
-W:	http://lists.x.org/mailman/listinfo/
+W:	https://lists.x.org/mailman/listinfo/
 S:	Maintained
 
 Website (www.x.org)
 P:	Stuart Anderson
 M:	anderson@netsweng.com
 L:	xorg-devel@lists.x.org
-W:	http://www.x.org/
+W:	https://www.x.org/
 S:	Maintained
 
 Supply of pastries, other food, beverages
 P:	Luc Verhaegen
 M:	libv@skynet.be
 L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+W:	https://wiki.x.org
 S:	Disrepair
 S:	'Other food' may induce illness.  Beware.
diff --git a/general/License.xml b/general/License.xml
index a01be2c..9f04ef7 100644
--- a/general/License.xml
+++ b/general/License.xml
@@ -34,10 +34,10 @@ contact us with details at <email>xorg@lists.freedesktop.org</email>.
 <para>
 Most of these licenses are based on the MIT, X Consortium, or BSD
 (original and revised) licenses.  All of them are consistent with the
-<ulink url="http://www.opensource.org/docs/definition.php"
+<ulink url="https://www.opensource.org/docs/definition.php"
 >Open Source Definition</ulink>, and most are
 consistent with the Free Software Foundation's <ulink
-url="http://www.fsf.org/philosophy/free-sw.html">Free Software
+url="https://www.fsf.org/philosophy/free-sw.html">Free Software
 Definition</ulink>.
 </para>
 
@@ -45,7 +45,7 @@ Definition</ulink>.
 While the current licenses are all open source licenses, the
 X.Org Foundation is attempting, over time, to bring as much as
 possible of the code's licenses in the distribution into compliance with the
-<ulink url="http://www.debian.org/social_contract#guidelines"
+<ulink url="https://www.debian.org/social_contract#guidelines"
 >Debian Free Software Guidelines</ulink>.
 </para>
 
@@ -59,7 +59,7 @@ The X.Org Foundation has chosen the following format of the MIT
 License as the preferred format for code included in the X Window System
 distribution.   This is a slight variant of the common MIT license
 form published by the Open Source Initiative at
-<ulink url="http://www.opensource.org/licenses/mit-license.php"></ulink>.
+<ulink url="https://www.opensource.org/licenses/mit-license.php"></ulink>.
 </para>
 
 <blockquote>
diff --git a/general/README.xml b/general/README.xml
index b7fe484..cc67c7a 100644
--- a/general/README.xml
+++ b/general/README.xml
@@ -10,7 +10,7 @@
 
 <title>README for X11R&relvers;</title>
 
-<corpauthor><ulink url="http://www.x.org/wiki/XorgFoundation">
+<corpauthor><ulink url="https://www.x.org/wiki/XorgFoundation">
 The X.Org Foundation
 </ulink></corpauthor>
 
@@ -111,7 +111,7 @@ in the X.Org Foundation is free to all participants. Applications for
 Membership are now being accepted, and active participants in the
 further development of the X Window Technology are invited to complete a
 <ulink
-url="http://www.x.org/wiki/Membership"
+url="https://www.x.org/wiki/Membership"
 >membership application</ulink>.  The X11R&relvers; release has been
 produced by the many contributors to the X.Org community and members of
 the X.Org Foundation and includes code from the X Consortium, the Open
@@ -178,11 +178,11 @@ Attributions are included with documentation accompanying binaries.
 Most of these licenses are based on the MIT, X Consortium, or BSD
 (original and revised) licenses.  All of them are consistent with the
 <ulink
-url="http://www.opensource.org/docs/definition.php"
+url="https://www.opensource.org/docs/definition.php"
 >Open Source Definition</ulink
 >, and most are
 consistent with the Free Software Foundation's <ulink
-url="http://www.fsf.org/philosophy/free-sw.html"
+url="https://www.fsf.org/philosophy/free-sw.html"
 >Free Software Definition</ulink
 >.
 </para>
@@ -197,7 +197,7 @@ If you find any omissions in that document, please contact us with details at
 While the current licenses are all open source licenses, the
 X.Org Foundation is attempting, with time, to bring as much as
 possible of the code's licenses in the distribution into compliance with the
-<ulink url="http://www.debian.org/social_contract#guidelines"
+<ulink url="https://www.debian.org/social_contract#guidelines"
 >Debian Free Software Guidelines</ulink>.
 </para>
 
@@ -208,7 +208,7 @@ possible of the code's licenses in the distribution into compliance with the
 
 <para>
 The documentation for this release can be found online at the <ulink
-url="http://www.x.org/">X.Org web site</ulink>.
+url="https://www.x.org/">X.Org web site</ulink>.
 </para>
 
 <para>
@@ -218,7 +218,7 @@ Document</olink>.
 </para>
 
 <para>
-Additional information may be available at the <ulink url="http://wiki.x.org/"
+Additional information may be available at the <ulink url="https://wiki.x.org/"
 >X.Org Foundation Wiki</ulink>.
 </para>
 
@@ -229,10 +229,10 @@ Additional information may be available at the <ulink url="http://wiki.x.org/"
 
 <para>
 Current information about the X.Org Foundation public mailing lists is
-available on <ulink url="http://www.x.org/wiki/XorgMailingLists">the X.Org
+available on <ulink url="https://www.x.org/wiki/XorgMailingLists">the X.Org
 mailing list page</ulink> and related desktop
 technology mailing lists can be found on <ulink
-url="http://freedesktop.org/mailman/listinfo">Freedesktop.org's mailing list
+url="https://freedesktop.org/mailman/listinfo/">Freedesktop.org's mailing list
 page</ulink>.
 </para>
 
@@ -260,7 +260,7 @@ SubmittingPatches</ulink> page of the X.Org wiki.
 <!--
 <![ %snapshot; [
 <para>
-X11R&relvers; can be found from the <ulink url="http://wiki.x.org">X.Org
+X11R&relvers; can be found from the <ulink url="https://wiki.x.org">X.Org
 Foundation wiki</ulink>, and at mirrors of this server.
 </para>
 ]]>
@@ -270,7 +270,7 @@ Foundation wiki</ulink>, and at mirrors of this server.
 <para>
 Information about X11R&relvers; can be found from the
 <ulink
-url="http://wiki.x.org"
+url="https://wiki.x.org"
 >X.Org Foundation wiki</ulink>, and at
 mirrors of this server.
 </para>
@@ -292,7 +292,7 @@ list of the tarballs.
 
 <para>
 For information on how to build the modular tree packages see the <ulink
-url="http://wiki.x.org/wiki/ModularDevelopersGuide"
+url="https://wiki.x.org/wiki/ModularDevelopersGuide"
 >Modular Developer's Guide</ulink
 >.  This guide also
 contains information for developers who want to help improve the modular
diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index 0aa9ee1..4ec3290 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -12,7 +12,7 @@
     <title>Release Notes for X11R&relvers;</title>
 
     <corpauthor>
-      <ulink url="http://www.x.org/wiki/XorgFoundation">
+      <ulink url="https://www.x.org/wiki/XorgFoundation">
 	The X.Org Foundation
       </ulink>
     </corpauthor>
@@ -71,7 +71,7 @@
     <para>
       Once their window system build is established, most builders watch for
       announcements of individual module updates on the <ulink
-	url="http://lists.x.org/mailman/listinfo/xorg-announce"
+	url="https://lists.x.org/mailman/listinfo/xorg-announce"
 	>xorg-announce mailing list</ulink> and update to those as needed.
       The X.Org Foundation currently releases the X Window System
       katamari releases approximately once a year, but many modules,
@@ -81,7 +81,7 @@
 
     <para>
       For help with how to build and develop in the modular tree see the
-      <ulink url="http://wiki.x.org/wiki/ModularDevelopersGuide">Modular
+      <ulink url="https://wiki.x.org/wiki/ModularDevelopersGuide">Modular
 	Developer's Guide</ulink> in the X.Org wiki.
     </para>
 
@@ -91,7 +91,7 @@
 <ulink url="https://gitlab.freedesktop.org/xorg">the gitlab.freedesktop.org code management system</ulink>.
       More details on patch submission and review process are available on the
       <ulink
-       url="http://www.x.org/wiki/Development/Documentation/SubmittingPatches">
+       url="https://www.x.org/wiki/Development/Documentation/SubmittingPatches">
 	SubmittingPatches</ulink> page of the X.Org wiki.
     </para>
 
@@ -183,7 +183,7 @@ The next section describes what is new in the latest version
 	    hase been added.  On most systems these documents will be
 	    installed under <filename>/usr/share/doc/</filename>.  They
 	    are also posted on the X.Org website at
-	    <ulink url="http://www.x.org/releases/X11R7.7/" />.
+	    <ulink url="https://www.x.org/releases/X11R7.7/" />.
 	  </para>
         </listitem>
 
@@ -793,9 +793,9 @@ The next section describes what is new in the latest version
         Direct rendered OpenGL&reg; support is provided for several
         hardware platforms by the Direct Rendering Infrastructure (DRI).
         Further information about DRI can be found at the <ulink
-        url="http://dri.sf.net/">DRI Project's web site</ulink>.  The 3D
+        url="https://dri.freedesktop.org/">DRI Project's web site</ulink>.  The 3D
         core rendering component is provided by <ulink
-        url="http://www.mesa3d.org">Mesa</ulink>.
+        url="https://www.mesa3d.org">Mesa</ulink>.
         </para>
 
         <para>
@@ -886,7 +886,7 @@ The next section describes what is new in the latest version
             X server in this release be sure to also ensure xkeyboard-config
             is a safe version.   More details about this issue may be found
             in <ulink
-url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
+url="https://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
             >advisories for CVE-2012-0064</ulink>.
           </para>
         </warning>
@@ -1098,7 +1098,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
 	  <listitem>
 	    <para>
 	      Enables or disables use of the <ulink
-	        url="http://xmlgraphics.apache.org/fop/"
+	        url="https://xmlgraphics.apache.org/fop/"
 	      >Apache <command>fop</command></ulink> command to translate
 	      DocBook XML to PostScript and PDF formats.
 	    </para>
@@ -1235,7 +1235,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
 	  <listitem>
 	    <para>
 	      Xorg server 1.4 started using the <ulink
-	      url="http://www.freedesktop.org/wiki/Software/hal">HAL
+	      url="https://www.freedesktop.org/wiki/Software/hal">HAL
 	      framework</ulink> to discover connected input devices,
 	      receive notification of hotplug events for them, and to
 	      retrieve configuration parameters for them. The HAL
@@ -1746,7 +1746,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
 	<member>Zhigang Gong</member>
 	<member>Zou Nan hai</member>
       </simplelist>
-      and the members of <ulink url="http://translationproject.org/">the
+      and the members of <ulink url="https://translationproject.org/">the
       Translation Project</ulink>.
     </para>
 
@@ -2200,12 +2200,12 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
 
     <para>
     This product includes software developed by The XFree86 Project, Inc
-    (<ulink url="http://www.xfree86.org/"></ulink>) and its contributors.
+    (<ulink url="https://www.xfree86.org/"></ulink>) and its contributors.
     </para>
 
     <para>
     This product includes software that is based in part on the work of the
-    FreeType Team (<ulink url="http://www.freetype.org/"></ulink>).
+    FreeType Team (<ulink url="https://www.freetype.org/"></ulink>).
     </para>
 
     <para>
@@ -2219,7 +2219,7 @@ url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html"
 
     <para>
     This product includes software developed by the NetBSD Foundation, Inc.
-      (<ulink url="http://www.netbsd.org/"></ulink>) and its contributors.
+      (<ulink url="https://www.netbsd.org/"></ulink>) and its contributors.
     </para>
 
     <para>
diff --git a/general/fonts/fonts.xml b/general/fonts/fonts.xml
index 8a99f9b..1516aeb 100644
--- a/general/fonts/fonts.xml
+++ b/general/fonts/fonts.xml
@@ -86,7 +86,7 @@ system to access newly-installed fonts.
 
 <para>
 Xft has no configuration mechanism itself, it relies upon the
-<ulink url="http://www.fontconfig.org/">fontconfig</ulink>
+<ulink url="https://www.fontconfig.org/">fontconfig</ulink>
 library to configure and customise fonts.  That library is
 not specific to the X Window system, and does not rely on any
 particular font output mechanism.
@@ -862,7 +862,7 @@ to TrueType and Type1 font programs and implemented the grid-fitting
 For more information, please contact
 <email>design@bigelowandholmes.com</email> or
 <email>info@urwpp.de</email>, or consult
-<ulink url="http://www.urwpp.de">the URW++ web site</ulink>.
+<ulink url="https://www.urwpp.de/">the URW++ web site</ulink>.
 </para>
 
 <para>
@@ -1517,7 +1517,7 @@ url="mkfontdir.1.html"
 <para>
 The <emphasis remap="it">FreeType</emphasis> backend (formerly <emphasis remap="it">xfsft</emphasis>)
 is a backend based on version 2 of the FreeType library (see <ulink
-url="http://www.freetype.org/"
+url="https://www.freetype.org/"
 >the FreeType web site</ulink
 >) and has
 the X-TT functionalities for CJKV support provided by the After X-TT
@@ -1812,10 +1812,7 @@ standard <quote><literal remap="tt">fixed</literal></quote> and <quote><literal
 <title>Unicode</title>
 
 <para>
-Unicode (<ulink
-url="http://www.unicode.org"
->http://www.unicode.org</ulink
->) is a coded character
+Unicode (<ulink url="https://www.unicode.org/" />) is a coded character
 set with the goal of uniquely identifying all characters for all
 scripts, current and historical.  While Unicode was explicitly not
 designed as a glyph encoding scheme, it is often possible to use it as
@@ -1895,7 +1892,7 @@ of information about digital fonts.
 <para>
 Xft and Fontconfig are described on
 <ulink
-url="http://www.fontconfig.org"
+url="https://www.fontconfig.org"
 >the Fontconfig site</ulink
 >.
 </para>
@@ -1934,12 +1931,12 @@ url="http://x-tt.sourceforge.jp/"
 
 <para>
 While the <ulink
-url="http://www.unicode.org"
+url="https://www.unicode.org/"
 >Unicode consortium site</ulink
 >
 may be of interest,  you are more likely to find what you need in
 Markus Kuhn's <ulink
-url="http://www.cl.cam.ac.uk/~mgk25/unicode.html"
+url="https://www.cl.cam.ac.uk/~mgk25/unicode.html"
 >UTF-8 and Unicode FAQ</ulink
 >.
 </para>
diff --git a/general/input/XKB-Config.xml b/general/input/XKB-Config.xml
index cda04d2..67d4013 100644
--- a/general/input/XKB-Config.xml
+++ b/general/input/XKB-Config.xml
@@ -31,7 +31,7 @@ of view. It covers basic configuration syntax and gives also a few examples.
       <para>
 This version covers Xorg server versions 1.8 and later, used with the
 data files from the <ulink
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 >xkeyboard-config</ulink> project.
       </para>
 
@@ -118,7 +118,7 @@ files of rules to be used for keyboard mapping composition
     <para>
 The rules file used depends on your system.  The rules files commonly
 used with Xorg are provided by the <ulink
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 >xkeyboard-config</ulink> project.
 On Linux systems, the <filename>evdev</filename> rules are most
 commonly used, on other systems the <filename>base</filename> rules
diff --git a/general/input/XKB-Enhancing.xml b/general/input/XKB-Enhancing.xml
index b0b63ca..c15d479 100644
--- a/general/input/XKB-Enhancing.xml
+++ b/general/input/XKB-Enhancing.xml
@@ -38,7 +38,7 @@ keyboard layout. Unlike other documents this guide accents the keymap developer'
     <para>
 The developer of a new layout should read the xkb
 protocol specification (<ulink
-url="http://www.x.org/docs/XKB/XKBproto.pdf"
+url="https://www.x.org/docs/XKB/XKBproto.pdf"
 >The X Keyboard Extension: Protocol Specification</ulink
 >) at least
 to clarify for himself some xkb-specific terms used in this document
diff --git a/general/platforms/Darwin.xml b/general/platforms/Darwin.xml
index 38e6801..c6b1a79 100644
--- a/general/platforms/Darwin.xml
+++ b/general/platforms/Darwin.xml
@@ -21,21 +21,21 @@
     <para>
       <productname>X11R&relvers;</productname>, a freely
       redistributable open-source implementation of the
-      <ulink url="http://www.x.org/">X Window System</ulink> from
-      the <ulink url="http://www.x.org/wiki/XorgFoundation">X.Org
+      <ulink url="https://www.x.org/">X Window System</ulink> from
+      the <ulink url="https://www.x.org/wiki/XorgFoundation">X.Org
 	Foundation</ulink>, has been ported to
       <ulink url="http://developer.apple.com/Darwin/">Darwin</ulink>
-      and <ulink url="http://www.apple.com/macosx/">Mac OS&nbsp;X</ulink>.
+      and <ulink url="https://www.apple.com/macosx/">Mac OS&nbsp;X</ulink>.
     </para>
 
     <para>
       Most of the current work on X for Darwin and Mac OS&nbsp;X is
       centered around the
-      <ulink url="http://xquartz.macosforge.org/">XQuartz Project</ulink>
-      at <ulink url="http://macosforge.org/">MacOSforge</ulink>.
+      <ulink url="https://www.xquartz.org/">XQuartz Project</ulink>
+      at <ulink url="https://macosforge.org/">MacOSforge</ulink>.
       If you are interested in up-to-date status, want to report a bug,
       or are interested in working on X11 for Darwin, stop by the project
-      website at <ulink url="http://xquartz.macosforge.org/"></ulink>
+      website at <ulink url="https://www.xquartz.org/"></ulink>
     </para>
 
   </sect1>
diff --git a/general/platforms/Solaris.xml b/general/platforms/Solaris.xml
index 953e733..1232828 100644
--- a/general/platforms/Solaris.xml
+++ b/general/platforms/Solaris.xml
@@ -15,19 +15,19 @@
  <authorgroup>
   <author>
     <firstname>David</firstname><surname>Holland</surname>
-      <affiliation><orgname><ulink url="http://www.xfree86.org/">XFree86
+      <affiliation><orgname><ulink url="https://www.xfree86.org/">XFree86
 	      Project</ulink></orgname></affiliation>
   </author>
 
   <author>
     <firstname>Marc</firstname><surname>Aurele La France</surname>
-      <affiliation><orgname><ulink url="http://www.xfree86.org/">XFree86
+      <affiliation><orgname><ulink url="https://www.xfree86.org/">XFree86
 	      Project</ulink></orgname></affiliation>
   </author>
 
   <author>
       <firstname>Alan</firstname><surname>Coopersmith</surname>
-      <affiliation><orgname><ulink url="http://www.oracle.com/">Oracle
+      <affiliation><orgname><ulink url="https://www.oracle.com/">Oracle
 	      Corp.</ulink></orgname></affiliation>
   </author>
  </authorgroup>
diff --git a/man/X.man b/man/X.man
index 8aa4014..cb45dde 100644
--- a/man/X.man
+++ b/man/X.man
@@ -88,7 +88,7 @@ and various toolkit documents.
 .\"
 Those manuals, specifications, & documents may be found in
 __datadir__/doc or on the X.Org Foundation website at
-.UR "http://www.x.org/releases/current/doc/"
+.UR "https://www.x.org/releases/current/doc/"
 .UE .
 .PP
 The number of programs that use \fIX\fP is quite large.
diff --git a/man/XOrgFoundation.man b/man/XOrgFoundation.man
index 13d7da7..d7f41d3 100644
--- a/man/XOrgFoundation.man
+++ b/man/XOrgFoundation.man
@@ -48,7 +48,7 @@ to the X Window System were assigned to The Open Group (then known as the
 Open Software Foundation).
 .PP
 .SH "ADDRESSES"
-The X.Org Foundation's web site is http://www.x.org/
+The X.Org Foundation's web site is https://www.x.org/
 .PP
 The X.Org Foundation's public ftp site is ftp://ftp.x.org/
 .PP
diff --git a/registry b/registry
index 81c28f9..1afe6c7 100644
--- a/registry
+++ b/registry
@@ -1077,7 +1077,7 @@ REFERENCES
 [7]	The Open Group
 	Apex Plaza,Forbury Road,
 	Reading,Berks.RG1 1AX,England
-	http://www.opengroup.org/contacts/
+	https://www.opengroup.org/offices
 
 [8]	The X standards body maintaining X11 and related standards:
 	1988-1993 The MIT X Consortium
@@ -1088,13 +1088,13 @@ REFERENCES
 
 	The X.Org Foundation current contact information:
 
-	X.Org website:		http://www.x.org/
+	X.Org website:		https://www.x.org/
 
 	X.Org mailing lists: 	
-		http://www.x.org/wiki/XorgMailingLists
+		https://www.x.org/wiki/XorgMailingLists
 
 	X.Org Foundation Board of Directors:
-	    http://www.x.org/wiki/BoardOfDirectors
+	    https://www.x.org/wiki/BoardOfDirectors
 	    board@foundation.x.org
 
 	    Board Secretary: