Merge branch 'master' into martin-t/example-config

diff --git a/Docs/faq.html b/Docs/faq.html
index 555b137ebe959da3d708f5ce990f84a7f6bb0c52..503fb1aadb7d046bb71eb4f1acd793949e8bc3b5 100644 (file)
--- a/Docs/faq.html
+++ b/Docs/faq.html
@@ -33,7 +33,7 @@
 <div class="body">
 
 <br><center><h1><a name="AFT-top">Xonotic 0.7 FAQ</a></h1></center>
-<center><a class="link" href="http://xonotic.com">http://xonotic.com</a></center>
+<center><a class="link" href="http://xonotic.org">http://xonotic.com</a></center>
 <hr>
 <!--  AFT Table of Contents (auto generated) -->
 <ul>

diff --git a/Docs/htmlfiles/faq.aft b/Docs/htmlfiles/faq.aft
index c40f794fe9adbc8b0e45d7e3b5bf9c43f3915f10..de45a3d5c8aa9b9dcce8c22379293434484b370c 100644 (file)
--- a/Docs/htmlfiles/faq.aft
+++ b/Docs/htmlfiles/faq.aft
@@ -6,7 +6,7 @@
 #---SET zipname=xonotic-<version>.zip
 
 *Title: Xonotic %xversion% FAQ
-                       http://xonotic.com
+                       http://xonotic.org
 
 ------
 

diff --git a/server/server.cfg b/server/server.cfg
index 951e46d3e46d39109a5f5041513ea4a392008460..f9620cc1f65fa8a468c00092525e536bde304ec5 100644 (file)
--- a/server/server.cfg
+++ b/server/server.cfg
@@ -174,7 +174,7 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 //sv_maxrate 1000000   // limits client connections to this rate in bytes/seconds
 
 // see Docs/mapdownload.txt for more info
-//sv_curl_defaulturl http://www.xonotic.com/contentdownload/getmap.php?file=   //fallback download URL
+//sv_curl_defaulturl http://www.xonotic.org/contentdownload/getmap.php?file=   //fallback download URL
 
 //sv_defaultcharacter 0        // 1 will force a specific model for all players
 //sv_defaultplayermodel models/player/erebus.iqm       // this model will be used