From d2af06a10dbfe5e1853b145b1a631f2c1d6db112 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 10 Mar 2016 01:30:55 +0100
Subject: [PATCH 3/4] Update links

Switch http: to https:, remove dead links, and update VCS links to
canonical URLs.
---
 dblatex.xsl    |  2 +-
 debian/control |  4 ++--
 entries.dbk    | 32 ++++++++++++++++----------------
 refcard.dbk    | 11 ++++-------
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/dblatex.xsl b/dblatex.xsl
index 671c41e..1d1e1c4 100644
--- a/dblatex.xsl
+++ b/dblatex.xsl
@@ -100,7 +100,7 @@
     <xsl:text>{\scriptsize \DBKcopyright \\&#10;</xsl:text>
     <xsl:value-of
       select="/article/articleinfo/keywordset/keyword[@role='madeby']"/>
-    <xsl:text>: \url{http://www.debian.org/doc/user-manuals#refcard}}&#10;</xsl:text>
+    <xsl:text>: \url{https://www.debian.org/doc/user-manuals#refcard}}&#10;</xsl:text>
     <xsl:text>\end{minipage}&#10;</xsl:text>
   </xsl:template>
 
diff --git a/debian/control b/debian/control
index 08737e4..6835d61 100644
--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,8 @@ Build-Depends: cdbs,
                xmlroff,
                xsltproc
 Vcs-Svn: svn://anonscm.debian.org/ddp/manuals/trunk/refcard
-Vcs-Browser: http://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/
-Homepage: http://www.debian.org/doc/user-manuals#refcard
+Vcs-Browser: https://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/
+Homepage: https://www.debian.org/doc/user-manuals#refcard
 
 Package: debian-refcard
 Architecture: all
diff --git a/entries.dbk b/entries.dbk
index bbfcdde..4affe22 100644
--- a/entries.dbk
+++ b/entries.dbk
@@ -25,7 +25,7 @@
     <legalnotice>
       <para>This document may be used under the terms of the GNU General
       Public License version 3 or higher. The license text can be found at <ulink
-      url="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</ulink>
+      url="https://www.gnu.org/copyleft/gpl.html">https://www.gnu.org/copyleft/gpl.html</ulink>
       and
       <filename>/usr/share/common-licenses/GPL-3</filename>.</para>
     </legalnotice>
@@ -62,21 +62,21 @@
 	specifics.</para></glossdef>
       </glossentry>
       <glossentry id="www-debian-org">
-	<glossterm><ulink url="http://www.debian.org/doc/">Web
+	<glossterm><ulink url="https://www.debian.org/doc/">Web
 	documentation</ulink></glossterm>
 	<glossdef><para>Reference, manuals, FAQs, HOWTOs, etc. at
-	<literal>http://www.debian.org/doc/</literal></para></glossdef>
+	<literal>https://www.debian.org/doc/</literal></para></glossdef>
       </glossentry>
       <glossentry id="lists-debian-org">
-	<glossterm><ulink url="http://lists.debian.org/">Mailing
+	<glossterm><ulink url="https://lists.debian.org/">Mailing
 	lists</ulink> at
-	<literal>http://lists.debian.org/</literal></glossterm>
+	<literal>https://lists.debian.org/</literal></glossterm>
 	<glossdef><para>The community is always helpful, search for
 	<literal>users</literal>.</para></glossdef>
       </glossentry>
       <glossentry id="wiki-debian-org">
-	<glossterm><ulink url="http://wiki.debian.org/">The Wiki</ulink> at
-	<literal>http://wiki.debian.org/</literal></glossterm>
+	<glossterm><ulink url="https://wiki.debian.org/">The Wiki</ulink> at
+	<literal>https://wiki.debian.org/</literal></glossterm>
 	<glossdef><para>Contains all kind of useful
 	information.</para></glossdef>
       </glossentry>
@@ -87,16 +87,16 @@
     <glosslist>
       <glossentry id="installer">
 	<glossterm><ulink
-	url="http://www.debian.org/devel/debian-installer/">Installer</ulink></glossterm>
+	url="https://www.debian.org/devel/debian-installer/">Installer</ulink></glossterm>
 	<glossdef><para>All information about it at
-	<literal>http://www.debian.org/devel/debian-installer/</literal></para></glossdef>
+	<literal>https://www.debian.org/devel/debian-installer/</literal></para></glossdef>
       </glossentry>
       <glossentry id="installer-image">
 	<glossterm><ulink
-	url="http://www.debian.org/distrib/">CD
+	url="https://www.debian.org/distrib/">CD
 	images</ulink></glossterm>
 	<glossdef><para>Download from
-	<literal>http://www.debian.org/distrib/</literal></para></glossdef>
+	<literal>https://www.debian.org/distrib/</literal></para></glossdef>
       </glossentry>
       <glossentry id="boot-expert">
 	<glossterm><literal>boot: expert</literal></glossterm>
@@ -109,16 +109,16 @@
     <title>Bugs</title>
     <glosslist>
       <glossentry id="bugs-debian-org">
-	<glossterm><ulink url="http://bugs.debian.org/">Bug
+	<glossterm><ulink url="https://bugs.debian.org/">Bug
 	Tracking</ulink> at
-	<literal>http://bugs.debian.org/</literal></glossterm>
+	<literal>https://bugs.debian.org/</literal></glossterm>
 	<glossdef><para>All about existing and fixed
 	bugs.</para></glossdef>
       </glossentry>
       <glossentry id="bugs-debian-org-package">
 	<glossterm>Package specific</glossterm>
 	<glossdef><para>See
-	<literal>http://bugs.debian.org/<replaceable>package-name</replaceable>/</literal>,
+	<literal>https://bugs.debian.org/<replaceable>package-name</replaceable>/</literal>,
 	use <literal>wnpp</literal> to ask for new
 	packages.</para></glossdef>
       </glossentry>
@@ -128,9 +128,9 @@
       </glossentry>
       <glossentry id="reporting">
 	<glossterm><ulink
-	url="http://www.debian.org/Bugs/Reporting">Reporting</ulink></glossterm>
+	url="https://www.debian.org/Bugs/Reporting">Reporting</ulink></glossterm>
 	<glossdef><para>Instructions at
-	<literal>http://www.debian.org/Bugs/Reporting</literal></para></glossdef>
+	<literal>https://www.debian.org/Bugs/Reporting</literal></para></glossdef>
       </glossentry>
     </glosslist>
   </section>
diff --git a/refcard.dbk b/refcard.dbk
index bbf8d01..4007390 100644
--- a/refcard.dbk
+++ b/refcard.dbk
@@ -7,7 +7,7 @@
   <articleinfo>
     <corpauthor>
       <ulink
-       url="http://www.debian.org/">
+       url="https://www.debian.org/">
 	<inlinemediaobject>
 	  <imageobject>
 	    <imagedata
@@ -54,7 +54,7 @@
     <legalnotice>
       <para>This document may be used under the terms of the GNU General
       Public License version 3 or higher. The license text can be found at <ulink
-      url="http://www.gnu.org/copyleft/gpl.html">http://www.gnu.org/copyleft/gpl.html</ulink>
+      url="https://www.gnu.org/copyleft/gpl.html">https://www.gnu.org/copyleft/gpl.html</ulink>
       and
       <filename>/usr/share/common-licenses/GPL-3</filename>.</para>
     </legalnotice>
@@ -263,9 +263,9 @@
   <section id="availability">
     <title>Availability</title>
     <para>The source code of this card is available via the <ulink
-    url="http://svn.debian.org/">Debian Subversion server</ulink> in
+    url="https://svn.debian.org/">Debian Subversion server</ulink> in
     DocBook/XML format.  You may access the repository via the <ulink
-    url="http://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/">web
+    url="https://anonscm.debian.org/viewvc/ddp/manuals/trunk/refcard/">web
     interface</ulink>.  Or check out the latest version using the
     commands:</para>
 
@@ -990,9 +990,6 @@
       <member><ulink
       url="http://www.riverland.net.au/~clytie/viet/netacrvn.html">English
       and Vietnamese explanations</ulink></member>
-      <member><ulink url="http://women.alioth.debian.org/dicts/">A
-      dictionary by the Debian women, useful for
-      everyone, in many languages</ulink></member>
       <member><ulink
       url="http://www.witch.westfalen.de/debian-women/about.html">Debian
       Women Dictionary, useful for everyone</ulink></member>
-- 
2.8.1

