From c78bbbdce927f4907e9dca39dc89fbc9d8caa87e Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <lynxlupodian@users.sourceforge.net>
Date: Thu, 2 Jul 2020 17:46:21 +0200
Subject: [PATCH] fixed a bunch of website links
---
CONTRIBUTING.md | 8 ++++----
README.md | 8 ++++----
admin/announcement.template | 6 +++---
gemrb/core/Interface.cpp | 2 +-
tools/tlk_convert/tlk.py | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5f956b86d8..dc7e658a7a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,10 +58,10 @@ If you're a web developer, check the website [reports](https://github.com/gemrb/
1. GemRB comes with a bundled demo, but it is trivial. The challenge is to enhance it, but
a lot of (compatibly licensed) art is missing. See also the docs on
-[creating a new game](http://www.gemrb.org/wiki/doku.php?id=newgame:newgame)
+[creating a new game](https://gemrb.org/New-game.html)
2. Some GemRB mods are in the [gemrb-mods repo](https://github.com/lynxlynxlynx/gemrb-mods).
-The [mod idea page](http://www.gemrb.org/wiki/doku.php?id=developers:mods) also lists
+The [mod idea page](https://gemrb.org/Modding.html) also lists
several ideas from simple tweaks to more complex mods. If you know WeiDU, a good task would be to add
more of the documented tweaks (idea page) to the tweakpack.
@@ -123,8 +123,8 @@ so we can improve our process and documentation!
## Useful links
- [IESDP](https://gibberlings3.github.io/iesdp/),
-- [engine overview](http://www.gemrb.org/wiki/doku.php?id=engine:start),
-- [GUIScript documentation](http://www.gemrb.org/wiki/doku.php?id=documentation),
+- [engine overview](https://gemrb.org/Engine-overview.html),
+- [GUIScript documentation](https://gemrb.org/GUIScript/Index.html),
- [plaintext dumps](http://lynxlynx.info/ie/string-dumps.zip) of game strings with matching strrefs,
- the buildbots are accessible through any PR or commit
- the tools mentioned in the README links section
diff --git a/README.md b/README.md
index 56f026bd91..e77a733660 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
## Introduction
-[GemRB](http://gemrb.org) (Game Engine Made with preRendered Background) is a portable open-source
+[GemRB](https://gemrb.org) (Game Engine Made with preRendered Background) is a portable open-source
reimplementation of the Infinity Engine that underpinned Baldur's Gate,
Icewind Dale and Planescape: Torment. It sports a cleaner design, greater
extensibility and several innovations.
@@ -23,9 +23,9 @@ the included trivial demo. On non-windows systems either copy it over from
a windows install, use a compatible installer, WINE or extract it manually
from the CDs using the unshield tool.
-Documentation can be found on the [website](https://gemrb.github.io/Documentation),
+Documentation can be found on the [website](https://gemrb.org/Documentation),
while the sources are in gemrb/docs/en/ and the
-[gemrb.6 man page](http://www.gemrb.org/wiki/doku.php?id=docs:manpage).
+[gemrb.6 man page](https://gemrb.org/Manpage.html).
If you want to help out, start by reading this
list of [options, tips and priorities](https://github.com/gemrb/gemrb/blob/master/CONTRIBUTING.md).
@@ -50,7 +50,7 @@ See the INSTALL [file](https://github.com/gemrb/gemrb/blob/master/INSTALL).
## Contacts
There are several ways you can get in touch:
-* [Homepage](http://gemrb.org)
+* [Homepage](https://gemrb.org)
* [GemRB forum](https://www.gibberlings3.net/forums/forum/91-gemrb/)
* [IRC channel](http://webchat.freenode.net/?channels=GemRB), #GemRB on the FreeNode IRC network
* [Discord channel](https://discord.gg/64rEVAk) (Gibberlings3 server)
diff --git a/admin/announcement.template b/admin/announcement.template
index 8f0a51b74f..43f2892f73 100644
--- a/admin/announcement.template
+++ b/admin/announcement.template
@@ -1,11 +1,11 @@
******************* FORUM ***************************
GemRB 0.9.0 released!
-The [url=http://gemrb.org]GemRB[/url] team is proud to announce a new (minor) release.
+The [url=https://gemrb.org]GemRB[/url] team is proud to announce a new (minor) release.
(short description of major changes)
-Currently only the sources and some packages are available. You can get them from [url=http://gemrb.org/wiki/doku.php?id=download]here[/url].
+Currently only the sources and some packages are available. You can get them from [url=https://gemrb.org/Install]here[/url].
Full changelog digest:
[code]
@@ -21,7 +21,7 @@ https://github.com/mntnr/name-your-contributors is preferred
******************* MODDING RING ********************
For the modding news blurb, just skip the changelog digest and put a link
to the main forum post. Also add a general intro, since this is syndicated:
-[url=http://gemrb.org]GemRB[/url] is a portable open-source implementation of Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment).
+[url=https://gemrb.org]GemRB[/url] is a portable open-source implementation of Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment).
(short description of major changes)
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index 0e1162e8e5..ae023d1066 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -2409,7 +2409,7 @@ bool Interface::LoadEncoding()
// TODO: lists are incomplete
// maybe want to externalize this
- // list compiled form wiki: http://www.gemrb.org/wiki/doku.php?id=engine:encodings
+ // list compiled form wiki: https://gemrb.org/Text-encodings.html
const char* wideEncodings[] = {
// Chinese
"GBK", "BIG5",
diff --git a/tools/tlk_convert/tlk.py b/tools/tlk_convert/tlk.py
index fb14d0b6ae..82f0e539d1 100644
--- a/tools/tlk_convert/tlk.py
+++ b/tools/tlk_convert/tlk.py
@@ -4,7 +4,7 @@ from base import Base
from struct import unpack, pack
import os
import cStringIO
-#http://gemrb.org/iesdp/file_formats/ie_formats/tlk_v1.htm
+# based on https://gibberlings3.github.io/iesdp/file_formats/ie_formats/tlk_v1.htm
class Tlk(Base, list):
SIGN = "TLK V1 "
--
GitLab