foxygit / doom Log in
commit 2137da434ecd74f40dd8c9fd9bea59d4808e71e1
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Feb 28 14:20:19 2016 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Feb 28 14:20:19 2016 -0500

    Change all chocolate-doom.org URLs to https:

    The website is now available over encrypted https: and there's no
    reason to direct people to unencrypted http: URLs any more.
---
 README                     | 2 +-
 configure.ac               | 2 +-
 rpm.spec.in                | 2 +-
 src/doom.appdata.xml.in    | 8 ++++----
 src/doom/d_main.c          | 2 +-
 src/heretic.appdata.xml.in | 8 ++++----
 src/hexen.appdata.xml.in   | 8 ++++----
 src/setup/compatibility.c  | 2 +-
 src/setup/display.c        | 2 +-
 src/setup/joystick.c       | 2 +-
 src/setup/keyboard.c       | 2 +-
 src/setup/mainmenu.c       | 2 +-
 src/setup/mouse.c          | 2 +-
 src/setup/multiplayer.c    | 8 ++++----
 src/setup/sound.c          | 2 +-
 src/strife.appdata.xml.in  | 8 ++++----
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/README b/README
index 9ee5610b..814b95e7 100644
--- a/README
+++ b/README
@@ -73,7 +73,7 @@ Here are some examples:
  * More information, including information about how to play various
    classic TCs, is available on the Chocolate Doom website:

-     http://www.chocolate-doom.org/
+     https://www.chocolate-doom.org/

    You are encouraged to sign up and contribute any useful information
    you may have regarding the port!
diff --git a/configure.ac b/configure.ac
index 20cde8f4..f6bd9e40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ PACKAGE_SHORTDESC="Conservative source port"
 PACKAGE_COPYRIGHT="Copyright (C) 1993-2015"
 PACKAGE_LICENSE="GNU General Public License, version 2"
 PACKAGE_MAINTAINER="Simon Howard"
-PACKAGE_URL="http://www.chocolate-doom.org/"
+PACKAGE_URL="https://www.chocolate-doom.org/"
 PACKAGE_ISSUES="https://github.com/chocolate-doom/chocolate-doom/issues"

 AC_CONFIG_AUX_DIR(autotools)
diff --git a/rpm.spec.in b/rpm.spec.in
index 67976019..1bc25c10 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -3,7 +3,7 @@ Name: @PACKAGE@
 Summary: @PACKAGE_SHORTDESC@
 Version: @VERSION@
 Release: 1
-Source: http://www.chocolate-doom.org/downloads/@VERSION@/@PACKAGE@-@VERSION@.tar.gz
+Source: https://www.chocolate-doom.org/downloads/@VERSION@/@PACKAGE@-@VERSION@.tar.gz
 URL: @PACKAGE_URL@
 Group: Amusements/Games
 BuildRoot: /var/tmp/@PACKAGE@-buildroot
diff --git a/src/doom.appdata.xml.in b/src/doom.appdata.xml.in
index 1c3aa545..ed499f47 100644
--- a/src/doom.appdata.xml.in
+++ b/src/doom.appdata.xml.in
@@ -26,19 +26,19 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.chocolate-doom.org/wiki/images/9/97/GNOME_FreeDM_DEMO4.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/9/97/GNOME_FreeDM_DEMO4.png</image>
       <caption>FreeDM, DM05: Metal</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/a/a6/GNOME_Doom_II_DEMO2.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/a/a6/GNOME_Doom_II_DEMO2.png</image>
       <caption>Doom II, Level 5: The Waste Tunnels</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/4/41/GNOME_Doomsday_of_UAC.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/4/41/GNOME_Doomsday_of_UAC.png</image>
       <caption>Doomsday of UAC (uac_dead.wad)</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/2/2a/GNOME_Freedoom_DTWID_DEMO3.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/2/2a/GNOME_Freedoom_DTWID_DEMO3.png</image>
       <caption>Doom the Way id Did, on Freedoom. Level 3-2: City of Corpses</caption>
     </screenshot>
   </screenshots>
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 31c7483a..44898495 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -1640,7 +1640,7 @@ void D_DoomMain (void)
         printf(" WARNING: You are playing using one of the Freedoom IWAD\n"
                " files, which might not work in this port. See this page\n"
                " for more information on how to play using Freedoom:\n"
-               "   http://www.chocolate-doom.org/wiki/index.php/Freedoom\n");
+               "   https://www.chocolate-doom.org/wiki/index.php/Freedoom\n");
         I_PrintDivider();
     }

diff --git a/src/heretic.appdata.xml.in b/src/heretic.appdata.xml.in
index dff84410..36a1739a 100644
--- a/src/heretic.appdata.xml.in
+++ b/src/heretic.appdata.xml.in
@@ -25,19 +25,19 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.chocolate-doom.org/wiki/images/9/93/GNOME_Heretic_E5M4.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/9/93/GNOME_Heretic_E5M4.png</image>
       <caption>Level E5M4: Courtyard</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/1/14/GNOME_Heretic_Shareware_DEMO3.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/1/14/GNOME_Heretic_Shareware_DEMO3.png</image>
       <caption>Shareware Level E1M9: The Graveyard</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/3/34/GNOME_Heretic_E4M1.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/3/34/GNOME_Heretic_E4M1.png</image>
       <caption>Level E4M1: Catafalque</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/4/42/GNOME_Heretic_Shareware_DEMO1.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/4/42/GNOME_Heretic_Shareware_DEMO1.png</image>
       <caption>Shareware Level E1M3: The Gatehouse</caption>
     </screenshot>
   </screenshots>
diff --git a/src/hexen.appdata.xml.in b/src/hexen.appdata.xml.in
index e7745bed..b5a526f2 100644
--- a/src/hexen.appdata.xml.in
+++ b/src/hexen.appdata.xml.in
@@ -25,19 +25,19 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.chocolate-doom.org/wiki/images/0/0f/GNOME_Hexen_Guardian_of_Fire.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/0/0f/GNOME_Hexen_Guardian_of_Fire.png</image>
       <caption>Level "Guardian of Fire"</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/5/5c/GNOME_Hexen_Effluvium.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/5/5c/GNOME_Hexen_Effluvium.png</image>
       <caption>Level "Effluvium"</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/c/c1/GNOME_Hexen_Dragon_Chapel.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/c/c1/GNOME_Hexen_Dragon_Chapel.png</image>
       <caption>Level "Dragon Chapel"</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/a/a7/GNOME_Hexen_Darkmere.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/a/a7/GNOME_Hexen_Darkmere.png</image>
       <caption>Level "Darkmere"</caption>
     </screenshot>
   </screenshots>
diff --git a/src/setup/compatibility.c b/src/setup/compatibility.c
index 14d5bc35..8cb2525f 100644
--- a/src/setup/compatibility.c
+++ b/src/setup/compatibility.c
@@ -22,7 +22,7 @@

 #include "compatibility.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-compat"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-compat"

 int vanilla_savegame_limit = 1;
 int vanilla_demo_limit = 1;
diff --git a/src/setup/display.c b/src/setup/display.c
index 4fbee1e8..6cb0d8d1 100644
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@ -28,7 +28,7 @@
 #include "display.h"
 #include "config.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-display"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-display"

 extern void RestartTextscreen(void);

diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index ec9ab68a..1b47669f 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -29,7 +29,7 @@
 #include "txt_joyaxis.h"
 #include "txt_joybinput.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-gamepad"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-gamepad"

 typedef struct
 {
diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c
index 9c02ad07..18accf86 100644
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -25,7 +25,7 @@
 #include "joystick.h"
 #include "keyboard.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-keyboard"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-keyboard"

 int vanilla_keyboard_mapping = 1;

diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index e4756f64..2a794ba0 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -38,7 +38,7 @@
 #include "multiplayer.h"
 #include "sound.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup"

 static const int cheat_sequence[] =
 {
diff --git a/src/setup/mouse.c b/src/setup/mouse.c
index 3cb8eaf7..36a8ef80 100644
--- a/src/setup/mouse.c
+++ b/src/setup/mouse.c
@@ -25,7 +25,7 @@
 #include "mode.h"
 #include "mouse.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-mouse"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-mouse"

 static int usemouse = 1;

diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index 0d66700e..90aa99af 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -34,10 +34,10 @@
 #include "net_io.h"
 #include "net_query.h"

-#define MULTI_START_HELP_URL "http://www.chocolate-doom.org/setup-multi-start"
-#define MULTI_JOIN_HELP_URL "http://www.chocolate-doom.org/setup-multi-join"
-#define MULTI_CONFIG_HELP_URL "http://www.chocolate-doom.org/setup-multi-config"
-#define LEVEL_WARP_HELP_URL "http://www.chocolate-doom.org/setup-level-warp"
+#define MULTI_START_HELP_URL "https://www.chocolate-doom.org/setup-multi-start"
+#define MULTI_JOIN_HELP_URL "https://www.chocolate-doom.org/setup-multi-join"
+#define MULTI_CONFIG_HELP_URL "https://www.chocolate-doom.org/setup-multi-config"
+#define LEVEL_WARP_HELP_URL "https://www.chocolate-doom.org/setup-level-warp"

 #define NUM_WADS 10
 #define NUM_EXTRA_PARAMS 10
diff --git a/src/setup/sound.c b/src/setup/sound.c
index 7001907c..3a8533b1 100644
--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -25,7 +25,7 @@
 #include "mode.h"
 #include "sound.h"

-#define WINDOW_HELP_URL "http://www.chocolate-doom.org/setup-sound"
+#define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-sound"

 typedef enum
 {
diff --git a/src/strife.appdata.xml.in b/src/strife.appdata.xml.in
index ff545539..7be869c3 100644
--- a/src/strife.appdata.xml.in
+++ b/src/strife.appdata.xml.in
@@ -26,19 +26,19 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.chocolate-doom.org/wiki/images/b/b2/GNOME_Strife_Rowan.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/b/b2/GNOME_Strife_Rowan.png</image>
       <caption>Talking to Rowan</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/1/1f/GNOME_Strife_Town.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/1/1f/GNOME_Strife_Town.png</image>
       <caption>The Town</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/8/8a/GNOME_Strife_Opening.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/8/8a/GNOME_Strife_Opening.png</image>
       <caption>Opening Cinematic</caption>
     </screenshot>
     <screenshot>
-      <image>http://www.chocolate-doom.org/wiki/images/c/c4/GNOME_Strife_Sewage.png</image>
+      <image>https://www.chocolate-doom.org/wiki/images/c/c4/GNOME_Strife_Sewage.png</image>
       <caption>In the sewage</caption>
     </screenshot>
   </screenshots>