From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Jul 2017 22:48:16 +0000 (+0000)
Subject: Merge branch 'martin-t/tutlink' into 'master'
X-Git-Tag: xonotic-v0.8.5~196
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a9564d6edd6a095fa12661dafc9929ee1737bce3;hp=74d091b81b40c011eb51241ecb2b398ea133dec8

Merge branch 'martin-t/tutlink' into 'master'

Use shortlink for Halogene's tutorial in tips

See merge request !27
---

diff --git a/server/help.cfg b/server/help.cfg
index b5f555ae..fe2089b6 100644
--- a/server/help.cfg
+++ b/server/help.cfg
@@ -16,7 +16,7 @@ set help_cfg_prefix "^2"
 // help messages
 set help_msg_count 58
 set help_msg_0 "Big Admin is watching you, so please be friendly or feel their almighty ban-hammer!"
-set help_msg_1 "If you want to learn more about Xonotic read ^1'Halogene's Newbie Corner' (http://xonotic.org and click 'Guide') ${help_cfg_prefix}as it contains lots of useful tips and tricks, explains all the weapons and helps to improve your gameplay."
+set help_msg_1 "If you want to learn more about Xonotic read ^1'Halogene's Newbie Corner' (http://xonotic.org/tut) ${help_cfg_prefix}as it contains lots of useful tips and tricks, explains all the weapons and helps to improve your gameplay."
 set help_msg_2 "Please watch out for balanced teams and change by pressing F5 (teammenu) or F6 (auto join 'best' team)."
 set help_msg_3 "When trying to bunny-hop you can ^1hold the jump button ${help_cfg_prefix}while you are still in the air, this will make those jumps VERY easy to time and work more reliable."
 set help_msg_4 "When a vote is called you can accept it via F1 or reject it via F2 (default keys)."
@@ -82,4 +82,4 @@ alias help_doit "sv_cmd rpn /help_tmp_msg help_msg_$help_tmp_index def; help_doi
 alias help_doit2 "help_say $help_cfg_prefix\"$help_tmp_msg\""
 alias help_inc "sv_cmd rpn /help_tmp_index help_tmp_index 1 add $help_msg_count mod def"
 alias help_next "help_inc; help_doit"
-alias help_loop "help_next; defer $help_cfg_time help_loop"
\ No newline at end of file
+alias help_loop "help_next; defer $help_cfg_time help_loop"