Updated URLs (switch http to https, where applicable; change URL, when target has changed the address; add a hint, when URL is dead)

1 files changed, 31 insertions, 24 deletions

diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index 8da81b833..3dedc989c 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -136,31 +136,31 @@
 <!--
   misc
   -->
-<!ENTITY url-osd "http://opensource.org/osd">
+<!ENTITY url-osd "https://opensource.org/osd">
 <!ENTITY url-debian-wiki-software "https://&wiki-debian-org;/DebianSoftware">
 
 <!-- GPL -->
-<!ENTITY url-gnu-copyleft "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">
+<!ENTITY url-gnu-copyleft "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">
 
 <!-- Linux Kernel entities -->
-<!ENTITY url-kernel-org "http://www.kernel.org/">
-<!ENTITY url-linux-kernel-list-faq "http://www.tux.org/lkml/">
+<!ENTITY url-kernel-org "https://www.kernel.org/">
+<!ENTITY url-linux-kernel-list-faq "https://lkml.org/">
 <!-- Next entity is no longer used; delete when translations are updated -->
 <!ENTITY url-kernel-traffic "http://www.kerneltraffic.org/kernel-traffic/index.html">
 
 <!-- Linux History page -->
-<!ENTITY url-linux-history "http://www.cs.cmu.edu/~awb/linux.history.html">
+<!ENTITY url-linux-history "https://www.cs.cmu.edu/~awb/linux.history.html">
 
 <!-- Introductions to the FSF and GNU Project -->
-<!ENTITY url-fsf "http://www.fsf.org/">
-<!ENTITY url-gnu "http://www.gnu.org/">
-<!ENTITY url-gnu-intro "http://www.gnu.org/gnu/the-gnu-project.html">
+<!ENTITY url-fsf "https://www.fsf.org/">
+<!ENTITY url-gnu "https://www.gnu.org/">
+<!ENTITY url-gnu-intro "https://www.gnu.org/gnu/the-gnu-project.html">
 
 <!-- Kernel archives -->
 <!ENTITY url-kernel-org "http://www.kernel.org/">
 
 <!-- Linux Standard Base -->
-<!ENTITY url-lsb-org "http://www.linuxbase.org/">
+<!ENTITY url-lsb-org "https://wiki.linuxfoundation.org/lsb/start">
 
 <!-- Filesystem Hierarchy Standard -->
 <!ENTITY url-fhs-home "http://refspecs.linuxfoundation.org/fhs.shtml">
@@ -169,7 +169,7 @@
 <!ENTITY url-luks "https://gitlab.com/cryptsetup/cryptsetup">
 
 <!-- US keyboard layout -->
-<!ENTITY url-us-keymap "http://en.wikipedia.org/wiki/Keyboard_layout#United_States">
+<!ENTITY url-us-keymap "https://en.wikipedia.org/wiki/Keyboard_layout#United_States">
 
 
 <!-- ******************************************
@@ -205,6 +205,7 @@
 
 <!ENTITY url-large-disk-howto "&url-ldp;HOWTO/Large-Disk-HOWTO.html">
 
+<!-- the following URL is dead; however it is used in some translations  -->
 <!ENTITY url-phoenix-bios-faq-large-disk
   "http://www.phoenix.com/en/Customer+Services/BIOS/BIOS+FAQ/default.htm">
 
@@ -216,34 +217,33 @@
 
 <!ENTITY url-plip-install-howto "&url-ldp;HOWTO/PLIP-Install-HOWTO.html">
 
-<!ENTITY url-x86-laptop	"http://www.linux-laptop.net/">
+<!ENTITY url-x86-laptop	"https://www.linux-laptop.net/">
 
 <!ENTITY url-pc-hw-faq "http://www.faqs.org/faqs/pc-hardware-faq/part1/">
 
-<!ENTITY url-xorg "http://xorg.freedesktop.org/">
+<!ENTITY url-xorg "https://wiki.freedesktop.org/xorg/">
 
 <!-- Next entity is no longer used; delete when translations are updated -->
 <!ENTITY url-simtel "ftp://ftp.simtel.net/pub/simtelnet/msdos/">
 
-<!ENTITY url-brltty "http://brltty.com/">
-<!ENTITY url-brltty-manual "http://brltty.com/doc/Manual-BRLTTY/English/BRLTTY.html">
-<!ENTITY url-brltty-driver-help "http://brltty.com/doc/KeyBindings/">
+<!ENTITY url-brltty "https://brltty.com/">
+<!ENTITY url-brltty-manual "https://brltty.com/doc/Manual-BRLTTY/English/BRLTTY.html">
+<!ENTITY url-brltty-driver-help "https://brltty.com/doc/KeyBindings/">
 
 <!ENTITY url-speakup "http://www.linux-speakup.org/">
 <!ENTITY url-speakup-guide "http://www.linux-speakup.org/spkguide.txt">
 
-<!ENTITY url-debian-wiki-accessibility "http://&wiki-debian-org;/accessibility">
+<!ENTITY url-debian-wiki-accessibility "https://&wiki-debian-org;/accessibility">
 
 <!-- ****************************************** m68k links -->
 
-<!-- still used for credits in administrativa -->
+<!-- urls dead; still used for credits in administrativa -->
 <!ENTITY url-m68k-faq "http://www.linux-m68k.org/faq/faq.html">
-
 <!ENTITY url-m68k-old-amiga-install "http://www.informatik.uni-oldenburg.de/~amigo/debian_inst.html">
 
 <!-- ****************************************** alpha links -->
 
-<!-- still used for credits in administrativa -->
+<!-- url dead; still used for credits in administrativa -->
 <!ENTITY url-alpha-faq "http://linux.iol.unh.edu/linux/alpha/faq/">
 
 
@@ -251,8 +251,9 @@
 
 <!ENTITY url-linaro-releases "http://releases.linaro.org/">
 
-<!ENTITY url-juno-firmware "&url-linaro-releases;latest/members/arm/">
+<!ENTITY url-juno-firmware "&url-linaro-releases;members/arm/platforms/latest/">
 
+<!-- url dead; no longer used -->
 <!ENTITY url-slug-firmware "http://www.slug-firmware.net/">
 
 <!ENTITY url-arm-cyrius-dns323 "http://www.cyrius.com/debian/orion/d-link/dns-323">
@@ -281,25 +282,29 @@
   http://users.ai-lab.fh-furtwangen.de/~eble/sparclinux/installation-howto.html
   -->
 
+<!-- url dead -->
 <!ENTITY url-sparc-linux "http://www.ultralinux.org/">
 
+<!-- url dead -->
 <!ENTITY url-sparc-linux-faq "&url-sparc-linux;faq.html">
 
 <!ENTITY url-openboot "http://docs.sun.com/app/docs/doc/805-4436">
 
+<!-- url dead -->
 <!ENTITY url-sun-nvram-faq "http://www.squirrel.com/sun-nvram-hostid.faq.html">
 
 
 <!-- ****************************************** powerpc links -->
 
 <!ENTITY url-powerpc-yaboot-faq
-  "http://&www-debian-org;/ports/powerpc/inst/yaboot-howto/">
+  "https://&www-debian-org;/ports/powerpc/inst/yaboot-howto/">
 
+<!-- url dead -->
 <!ENTITY url-powerpc-quik-faq
   "http://penguinppc.org/projects/quik/">
 
 <!ENTITY url-netbsd-powerpc-faq 
-   "http://www.netbsd.org/Ports/macppc/faq.html">
+   "https://www.netbsd.org/Ports/macppc/faq.html">
 
 <!ENTITY url-mac-fdisk-tutorial
   "www.alaska.net/~erbenson/doc/mac-fdisk-basics.txt">
@@ -307,15 +312,17 @@
 <!ENTITY url-powerpc-of 
    "http://debian-imac.sourceforge.net/">
 
+<!-- url dead -->
 <!ENTITY url-powerpc-suntar 
    "http://hyperarchive.lcs.mit.edu/HyperArchive/Archive/cmp/suntar-223.hqx">
 
 <!ENTITY url-powerpc-creator-changer 
-   "http://www.gryphel.com/c/sw/sysutils/crtrchng/">
+   "https://www.gryphel.com/c/sw/sysutils/crtrchng/">
 
 <!ENTITY url-powerpc-diskcopy 
    "http://download.info.apple.com/Apple_Support_Area/Apple_Software_Updates/English-North_American/Macintosh/Utilities/Disk_Copy/Disk_Copy_6.3.3.smi.bin">
 
+<!-- url dead -->
 <!ENTITY url-powerpc-bootx
    "http://penguinppc.org/projects/bootx/">
 
@@ -327,7 +334,7 @@
 
 <!-- ****************************************** mips links -->
 
-<!ENTITY url-linux-mips "http://www.linux-mips.org/">
+<!ENTITY url-linux-mips "https://www.linux-mips.org/wiki/Main_Page">
 
 <!ENTITY url-bcm91250a-hardware "http://www.cyrius.com/debian/bcm91250a/hardware.html">