Merge branch 'packer/readme-fix' into 'master'

README must either link to COPYING or the COPYING file must be renamed to LICENSE.

See merge request xonotic/xonotic!31

diff --git a/misc/infrastructure/checkupdate.txt b/misc/infrastructure/checkupdate.txt
index 8383e89f812d833a8a5e8fe5079fb3b9a97b282f..47eba2eb3132a4fa2a0bf7e1867e5c37b9af91ec 100644 (file)
--- a/misc/infrastructure/checkupdate.txt
+++ b/misc/infrastructure/checkupdate.txt
@@ -41,6 +41,8 @@ R J9JepdOZjvCBXYfz8fj3civ4PulKF4/asnK9u5ZojYg=
 R 6QtAVwbWcJFYZDvSeuZHEaaJE4JoTzmNni/LPZUSOKE=
 R Lh+WWOrY7IjXqP7pekmlgy6R+N+tTBm6DBV1gUZvtZ4=
 R ggH3OBVqbVeCCBkLQZtFLvwxuTpfBAz+/scg3OwsPVo=
+R kV3UkVGqke8UhrgIWKhTOU/nDhk3f+OT7TVEfqh9xy0=
+R AaQzHJT+/f6XHfZ4Zabz2KR7dXwQsoKJ1XYICRNo7to=
 
 # Promoted servers. Always show up as recommended, even if "slow".
 # P <key or IP here>

diff --git a/server/help.cfg b/server/help.cfg
index 93def2880833a42bc221c07769ab1622ed58b90a..3cb465aee3719c89822ac900c956f9980d7cd939 100644 (file)
--- a/server/help.cfg
+++ b/server/help.cfg
@@ -79,7 +79,7 @@ set help_tmp_index 0
 alias help_say "set help_tmp_oldnick \"$sv_adminnick\"; set sv_adminnick \"$help_cfg_nick\"; say \"$*\"; help_say2"
 alias help_say2 "set sv_adminnick \"$help_tmp_oldnick\""
 alias help_doit "sv_cmd rpn /help_tmp_msg help_msg_$help_tmp_index def; help_doit2"
-alias help_doit2 "help_say $help_cfg_prefix\"$help_tmp_msg\""
+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"