Follow up to 712812b

- More link changes
- Added proper link to Roulette topic

41 files changed, 65 insertions, 66 deletions

diff --git a/conf/battlegrounds.conf b/conf/battlegrounds.conf
index 0aa81d35d..ea54d3f2e 100644
--- a/conf/battlegrounds.conf
+++ b/conf/battlegrounds.conf
@@ -6,10 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //====================================================
-//= Link~u! <description> <link to wiki/topic>
-//= http://hercules.ws/board/topic/928-memory-slasher-may-30-patch/
+//= http://herc.ws/board/topic/928-memory-slasher-may-30-patch/
 //====================================================
 //= Fields (TODO/INCOMPLETE)
 //= arenas: ({
diff --git a/conf/channels.conf b/conf/channels.conf
index a3eee122d..19021a64d 100644
--- a/conf/channels.conf
+++ b/conf/channels.conf
@@ -6,10 +6,10 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //====================================================
 //================= More Information =================
-// http://hercules.ws/board/topic/316-introducing-hercules-channel-system/
+// http://herc.ws/board/topic/316-introducing-hercules-channel-system/
 //====================================================
 chsys: (
 {
diff --git a/conf/plugins.conf b/conf/plugins.conf
index 8f171f034..367fc81f2 100644
--- a/conf/plugins.conf
+++ b/conf/plugins.conf
@@ -6,10 +6,10 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //====================================================
 //== Topic Discussion ================================
-//== http://hercules.ws/board/topic/549-introducing-hercules-plugin-manager/
+//== http://herc.ws/board/topic/549-introducing-hercules-plugin-manager/
 //====================================================
 //== Description =====================================
 //The plugin system allows you to create customized scripts 
diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
index 7f1d4f5d6..ecd17daf8 100644
--- a/db/cashshop_db.conf
+++ b/db/cashshop_db.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-//= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+//= http://herc.ws/board/topic/367-introducing-cash-shop-support/
 //====================================================
 // This file handles the entire Cashshop. You can simply
 // add in any amount of items you like within each category.
diff --git a/db/pre-re/item_chain.conf b/db/pre-re/item_chain.conf
index bedb33d73..744b1cbcf 100644
--- a/db/pre-re/item_chain.conf
+++ b/db/pre-re/item_chain.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index 25f9302e0..f03762790 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf
index dc9346e32..a25453f3f 100644
--- a/db/pre-re/item_packages.conf
+++ b/db/pre-re/item_packages.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/pre-re/job_db.conf b/db/pre-re/job_db.conf
index 1deaa826b..ff83db27a 100644
--- a/db/pre-re/job_db.conf
+++ b/db/pre-re/job_db.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/9082-job-db1txt-redesign/
+// http://hercs.ws/board/topic/9082-job-db1txt-redesign/
 //============== pRE Structure Example ===============
 /*
 Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 558a168ce..2d0ffee49 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -6,11 +6,11 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //====================================================
 //= Hercules Map Zone Database [Ind/Hercules]
 //================ More Information ==================
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= http://herc.ws/board/topic/302-introducing-hercules-map-zone-database/
 //= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
 //====================================================
 //================ Description =======================
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index c9d229d8d..1b9ad25a5 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
+// http://herc.ws/board/topic/1188-skill-tree-db-redesign/
 //================ Structure Example =================
 /*
 Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf
index bedb33d73..744b1cbcf 100644
--- a/db/re/item_chain.conf
+++ b/db/re/item_chain.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 69cedfdd1..b965f0c0d 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index e900ca23e..8fc9a2e17 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1244-official-item-grouppackagechain
+// http://herc.ws/board/topic/1244-official-item-grouppackagechain
 //====================================================
 // Structure of file:
 /*
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
index 47f543793..38d79597b 100644
--- a/db/re/job_db.conf
+++ b/db/re/job_db.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/9082-job-db1txt-redesign/
+// http://herc.ws/board/topic/9082-job-db1txt-redesign/
 //============== RE Structure Example ================
 /*
 Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index eade47a40..78cca13fe 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -6,11 +6,11 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //====================================================
 //= Hercules Map Zone Database [Ind/Hercules]
 //================ More Information ==================
-//= http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/
+//= http://herc.ws/board/topic/302-introducing-hercules-map-zone-database/
 //= (TODO: replace with wiki link and detail the wiki page in a decent format ^)
 //====================================================
 //================ Description =======================
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index f3655db3f..0da4479d4 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-// http://hercules.ws/board/topic/1188-skill-tree-db-redesign/
+// http://herc.ws/board/topic/1188-skill-tree-db-redesign/
 //================ Structure Example =================
 /*
 Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
diff --git a/db/roulette_db.conf b/db/roulette_db.conf
index 831ee9023..c82bb0830 100644
--- a/db/roulette_db.conf
+++ b/db/roulette_db.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-//= http://hercules.ws/board/ ???
+//= http://herc.ws/board/topic/7618-2014-10-22-roulette-and-per-char-gender/
 //====================================================
 // This file handles the Roulette, the format is <item>:<amount>
 // The first entry is the one that loses the game.
diff --git a/db/translations.conf b/db/translations.conf
index 3b16a8c23..fc8144636 100644
--- a/db/translations.conf
+++ b/db/translations.conf
@@ -6,9 +6,9 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
 //=                                                  
-//=            http://hercules.ws/board/                        
+//=            http://herc.ws/board/                        
 //================= More Information =================
-//= http://hercules.ws/board/topic/8687-hercules-ultimate-localization-design/
+//= http://herc.ws/board/topic/8687-hercules-ultimate-localization-design/
 //====================================================
 // Translations generated with —-generate-translations
 // should be pointed to here
diff --git a/db2sql.bat b/db2sql.bat
index b23f76bce..c3f22b5e5 100644
--- a/db2sql.bat
+++ b/db2sql.bat
@@ -2,7 +2,7 @@
 
 REM Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 REM See the LICENSE file
-REM Base Author: Mumbles @ http://hercules.ws
+REM Base Author: Mumbles @ http://herc.ws
 
 COLOR 0F
 
@@ -16,7 +16,7 @@ ECHO                ^| ^| ^| ^|  __/ ^| ^| (__^| ^|_^| ^| ^|  __/\__ \
 ECHO                \_^| ^|_/\___^|_^|  \___^|\__,_^|_^|\___^|^|___/
 ECHO.
 ECHO                     Database to SQL Converter
-ECHO                     http://hercules.ws/board/
+ECHO                     http://herc.ws/board/
 ECHO.
 ECHO.
 
diff --git a/npc/MOTD.txt b/npc/MOTD.txt
index ceb3f4cda..99bd8c773 100644
--- a/npc/MOTD.txt
+++ b/npc/MOTD.txt
@@ -1,4 +1,4 @@
-//======= Hercules Script ===========================
+//================== Hercules Script =================
 //=       _   _                     _                =
 //=      | | | |                   | |               =
 //=      | |_| | ___ _ __ ___ _   _| | ___  ___      =
@@ -6,7 +6,7 @@
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \     =
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/     =
 //=                                                  =
-//=            http://hercules.ws/board/             =
+//=            http://herc.ws/board/             =
 //====================================================
 // run when any character logs in, attached to them.
 -	script	HerculesMOTD	-1,{
diff --git a/script-checker.bat b/script-checker.bat
index d81277971..3d5a3aee9 100644
--- a/script-checker.bat
+++ b/script-checker.bat
@@ -2,7 +2,7 @@
 
 REM Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 REM See the LICENSE file
-REM Base Author: Mumbles @ http://hercules.ws
+REM Base Author: Mumbles @ http://herc.ws
 
 COLOR 0F
 
diff --git a/sql-files/upgrades/2013-04-16--01-24.sql b/sql-files/upgrades/2013-04-16--01-24.sql
index d011e27e3..951ca8cd2 100644
--- a/sql-files/upgrades/2013-04-16--01-24.sql
+++ b/sql-files/upgrades/2013-04-16--01-24.sql
@@ -1,3 +1,3 @@
 #1366075474
--- Info http://hercules.ws/board/topic/410-skill-script-command-updatefix/
+-- Info http://herc.ws/board/topic/410-skill-script-command-updatefix/
 UPDATE `skill` SET `flag` = 0 WHERE `flag` = 4 AND `id` != 2535 AND `id` != 681;
diff --git a/src/char/char.c b/src/char/char.c
index 910c3fcf6..2b8f70969 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3830,7 +3830,7 @@ void char_parse_frommap_request_stats_report(int fd)
 	opt.silent = 1;
 	opt.setTimeo = 1;
 
-	if( (sfd = make_connection(host2ip("stats.hercules.ws"),(uint16)25427,&opt) ) == -1 ) {
+	if( (sfd = make_connection(host2ip("stats.herc.ws"),(uint16)25427,&opt) ) == -1 ) {
 		RFIFOSKIP(fd, RFIFOW(fd,2) );/* skip this packet */
 		RFIFOFLUSH(fd);
 		return;/* connection not possible, we drop the report */
diff --git a/src/common/console.c b/src/common/console.c
index 97ca0650e..1eba48fa2 100644
--- a/src/common/console.c
+++ b/src/common/console.c
@@ -63,7 +63,7 @@ void display_title(void) {
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"               | | | |  __/ | | (__| |_| | |  __/\\__ \\                "CL_CLL""CL_NORMAL"\n");
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"               \\_| |_/\\___|_|  \\___|\\__,_|_|\\___||___/                "CL_CLL""CL_NORMAL"\n");
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                                                                      "CL_CLL""CL_NORMAL"\n");
-	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                    http://hercules.ws/board/                         "CL_CLL""CL_NORMAL"\n");
+	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                    http://herc.ws/board/                         "CL_CLL""CL_NORMAL"\n");
 	ShowMessage(""CL_BG_RED""CL_BT_WHITE"                                                                      "CL_CLL""CL_NORMAL"\n");
 
 	ShowInfo("Hercules %d-bit for %s\n", sysinfo->is64bit() ? 64 : 32, sysinfo->platform());
diff --git a/src/common/core.c b/src/common/core.c
index 8bf381589..ea028002a 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -250,7 +250,7 @@ static CMDLINEARG(help)
  */
 static CMDLINEARG(version)
 {
-	ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://hercules.ws/\n");
+	ShowInfo(CL_GREEN"Website/Forum:"CL_RESET"\thttp://herc.ws/\n");
 	ShowInfo(CL_GREEN"IRC Channel:"CL_RESET"\tirc://irc.rizon.net/#Hercules\n");
 	ShowInfo("Open "CL_WHITE"readme.txt"CL_RESET" for more information.\n");
 	return false;
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index a1dbed4d1..7edc5c72e 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -1,6 +1,6 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
-// Base Author: Haru @ http://hercules.ws
+// Base Author: Haru @ http://herc.ws
 
 /// See sysinfo.h for a description of this file
 
diff --git a/src/common/sysinfo.h b/src/common/sysinfo.h
index 70f665071..8c8f6dbe6 100644
--- a/src/common/sysinfo.h
+++ b/src/common/sysinfo.h
@@ -1,6 +1,6 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
-// Base Author: Haru @ http://hercules.ws
+// Base Author: Haru @ http://herc.ws
 
 #ifndef COMMON_SYSINFO_H
 #define COMMON_SYSINFO_H
diff --git a/src/config/classes/general.h b/src/config/classes/general.h
index b75c907e3..bf9c05bf5 100644
--- a/src/config/classes/general.h
+++ b/src/config/classes/general.h
@@ -5,7 +5,7 @@
 #define CONFIG_GENERAL_H
 
 /**
- * Hercules configuration file (http://hercules.ws)
+ * Hercules configuration file (http://herc.ws)
  **/
 
 /**
diff --git a/src/config/const.h b/src/config/const.h
index e10d2ad2a..b6eb5db77 100644
--- a/src/config/const.h
+++ b/src/config/const.h
@@ -6,8 +6,8 @@
 #define CONFIG_CONSTANTS_H
 
 /**
- * Hercules configuration file (http://hercules.ws)
- * For detailed guidance on these check http://hercules.ws/wiki/SRC/config/
+ * Hercules configuration file (http://herc.ws)
+ * For detailed guidance on these check http://herc.ws/wiki/SRC/config/
  **/
 
 /**
diff --git a/src/config/renewal.h b/src/config/renewal.h
index 6a3cdf86d..e4b8e699b 100644
--- a/src/config/renewal.h
+++ b/src/config/renewal.h
@@ -5,8 +5,8 @@
 #define CONFIG_RENEWAL_H
 
 /**
- * Hercules configuration file (http://hercules.ws)
- * For detailed guidance on these check http://hercules.ws/wiki/SRC/config/
+ * Hercules configuration file (http://herc.ws)
+ * For detailed guidance on these check http://herc.ws/wiki/SRC/config/
  **/
 
 /**
diff --git a/src/config/secure.h b/src/config/secure.h
index 418d24751..67f7a972b 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -5,8 +5,8 @@
 #define CONFIG_SECURE_H
 
 /**
- * Hercules configuration file (http://hercules.ws)
- * For detailed guidance on these check http://hercules.ws/wiki/SRC/config/
+ * Hercules configuration file (http://herc.ws)
+ * For detailed guidance on these check http://herc.ws/wiki/SRC/config/
  **/
 
 /**
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index d492ad9ca..f7e693191 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -1,6 +1,6 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
-// Base Author: shennetsind @ http://hercules.ws
+// Base Author: shennetsind @ http://herc.ws
 
 #define HERCULES_CORE
 
diff --git a/src/map/irc-bot.h b/src/map/irc-bot.h
index 8dcfea5bd..acd014e71 100644
--- a/src/map/irc-bot.h
+++ b/src/map/irc-bot.h
@@ -1,6 +1,6 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
-// Base Author: shennetsind @ http://hercules.ws
+// Base Author: shennetsind @ http://herc.ws
 
 
 #ifndef MAP_IRC_BOT_H
diff --git a/src/map/packets.h b/src/map/packets.h
index db332c033..53278f66e 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2885,7 +2885,7 @@ packet(0x020d,-1);
 	packet(0x0a2e,6,clif->pDull);	//TITLE
 #endif         
 
-/* PacketKeys: http://hercules.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */
+/* PacketKeys: http://herc.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */
 #if PACKETVER >= 20110817
 	packetKeys(0x053D5CED,0x3DED6DED,0x6DED6DED); /* Thanks to Shakto */
 #endif
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 71471e5c6..47e566662 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -1,7 +1,7 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-/* Hercules Renewal: Phase Two http://hercules.ws/board/topic/383-hercules-renewal-phase-two/ */
+/* Hercules Renewal: Phase Two http://herc.ws/board/topic/383-hercules-renewal-phase-two/ */
 
 #ifndef MAP_PACKETS_STRUCT_H
 #define MAP_PACKETS_STRUCT_H
diff --git a/src/map/skill.c b/src/map/skill.c
index 0562bcd96..b39ea380f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -99,7 +99,7 @@ int skill_get_index( uint16 skill_id ) {
 		skill_id = MC_SKILLRANGEMIN + skill_id - MC_SKILLBASE;
 	else if( skill_id >= HM_SKILLBASE )
 		skill_id = HM_SKILLRANGEMIN + skill_id - HM_SKILLBASE;
-	//[Ind/Hercules] GO GO GO LESS! - http://hercules.ws/board/topic/512-skill-id-processing-overhaul/
+	//[Ind/Hercules] GO GO GO LESS! - http://herc.ws/board/topic/512-skill-id-processing-overhaul/
 	else if( skill_id > 1019 && skill_id < 8001 ) {
 		if( skill_id < 2058 ) // 1020 - 2000 are empty
 			skill_id = 1020 + skill_id - 2001;
diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c
index bf43c0b23..ac72b8eb2 100644
--- a/src/plugins/dbghelpplug.c
+++ b/src/plugins/dbghelpplug.c
@@ -217,8 +217,8 @@ typedef struct _InternalData {
 
 // Extended information printed in the console
 #define DBG_EXTENDED_INFORMATION \
-		"Please report the crash in the bug tracker:\n" \
-		"http://hercules.ws/board/tracker/\n"
+		"Please report the crash in our Issues tracker:\n" \
+		"https://github.com/HerculesWS/Hercules/issues\n"
 
 // Print object children?
 // WARNING: This will generate huge dump files!
diff --git a/sysinfogen.sh b/sysinfogen.sh
index 89857249f..7fb1da1ac 100755
--- a/sysinfogen.sh
+++ b/sysinfogen.sh
@@ -2,7 +2,7 @@
 
 # Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 # See the LICENSE file
-# Base Author: Haru @ http://hercules.ws
+# Base Author: Haru @ http://herc.ws
 
 do_fail() {
 	echo 'Error writing output file'
diff --git a/tools/Script-Checker.applescript b/tools/Script-Checker.applescript
index db1983f4b..eb4e7629a 100644
--- a/tools/Script-Checker.applescript
+++ b/tools/Script-Checker.applescript
@@ -1,7 +1,7 @@
 (*
   Copyright (c) Hercules Dev Team, licensed under GNU GPL.
   See the LICENSE file
-  Base Author: Haru @ http://hercules.ws
+  Base Author: Haru @ http://herc.ws
 *)
 
 (*
diff --git a/tools/itemdbconverter.pl b/tools/itemdbconverter.pl
index 13805c09e..9486308a6 100755
--- a/tools/itemdbconverter.pl
+++ b/tools/itemdbconverter.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 # See the LICENSE file
-# Base Author: Haru @ http://hercules.ws
+# Base Author: Haru @ http://herc.ws
 #
 # This script converts an item_db(2).txt to the new item_db(2).conf format.
 # usage example: perl tools/itemdbconverter.pl < db/item_db2.txt > db/item_db2.conf
diff --git a/tools/questdbconverter.pl b/tools/questdbconverter.pl
index 00431fb79..49e7b76bf 100755
--- a/tools/questdbconverter.pl
+++ b/tools/questdbconverter.pl
@@ -2,7 +2,7 @@
 #
 # Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 # See the LICENSE file
-# Base Author: Dastgir @ http://hercules.ws
+# Base Author: Dastgir @ http://herc.ws
 #
 # This Script converts quest_db.txt to quest_db.conf format.
 # usage example: perl tools/questdbconverter.pl < db/quest_db.txt > db/quest_db.conf