diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
index 2ba62e15ec0..ae4f0cc5212 100644
--- a/application/controllers/AdminController.php
+++ b/application/controllers/AdminController.php
@@ -92,7 +92,7 @@ public function error($message, $url = array())
         $output .= '</div>'."\n";
         echo $output;
 
-        $this->_getAdminFooter('http://docs.limesurvey.org', $clang->gT('LimeSurvey online manual'));
+        $this->_getAdminFooter('http://manual.limesurvey.org', $clang->gT('LimeSurvey online manual'));
 
         die;
     }
diff --git a/application/controllers/Statistics_userController.php b/application/controllers/Statistics_userController.php
index 471832fd3e7..0fa56179353 100644
--- a/application/controllers/Statistics_userController.php
+++ b/application/controllers/Statistics_userController.php
@@ -23,7 +23,6 @@
  * to determine whether the results of a certain question should be shown to the user
  * after he/she has submitted the survey.
  *
- * See http://docs.limesurvey.org/tiki-index.php?page=Question+attributes#public_statistics
  */
 
 class Statistics_userController extends LSYii_Controller {
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
index 1c9adcf59d5..44449a3165b 100644
--- a/application/controllers/admin/conditionsaction.php
+++ b/application/controllers/admin/conditionsaction.php
@@ -1911,7 +1911,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
             // Regexp Tab
             $aViewUrls['output'] .= "\t<div id='REGEXP' style='display:block;'>\n"
             ."\t\t<textarea name='ConditionRegexp' id='ConditionRegexp' rows='5' cols='113'>$EDITConditionRegexp</textarea>\n"
-            ."\t\t<br /><div id='ConditionRegexpLabel'><a href=\"http://docs.limesurvey.org/tiki-index.php?page=Using+Regular+Expressions\" target=\"_blank\">".$clang->gT("Regular expression")."</a></div>\n"
+            ."\t\t<br /><div id='ConditionRegexpLabel'><a href=\"http://manual.limesurvey.org/wiki/Using_regular_expressions\" target=\"_blank\">".$clang->gT("Regular expression")."</a></div>\n"
             ."\t</div>\n";
 
             $aViewUrls['output'] .= "</div>\n"; // end conditiontarget div
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
index dbdbb21842b..4b5829cffa6 100644
--- a/application/controllers/survey/index.php
+++ b/application/controllers/survey/index.php
@@ -174,7 +174,7 @@ function action()
             AND ((expires >= '".date("Y-m-d H:i")."') OR (expires is null))
             AND ((startdate <= '".date("Y-m-d H:i")."') OR (startdate is null))
             ORDER BY surveyls_title";
-            $result = dbExecuteAssoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the <a href='http://docs.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
+            $result = dbExecuteAssoc($query,false,true) or safeDie("Could not connect to database. If you try to install LimeSurvey please refer to the <a href='http://manual.limesurvey.org'>installation docs</a> and/or contact the system administrator of this webpage."); //Checked
             $list=array();
 
             foreach($result->readAll() as $rows)
diff --git a/application/core/LSYii_Controller.php b/application/core/LSYii_Controller.php
index e80b63c4622..2a417ae1e03 100644
--- a/application/core/LSYii_Controller.php
+++ b/application/core/LSYii_Controller.php
@@ -88,7 +88,7 @@ protected function _init()
 			$dieoutput .= 'This script can only be run on PHP version 5.1.6 or later! Your version: '.PHP_VERSION.'<br />';
 
 		if (!function_exists('mb_convert_encoding'))
-			$dieoutput .= "This script needs the PHP Multibyte String Functions library installed: See <a href='http://docs.limesurvey.org/tiki-index.php?page=Installation+FAQ'>FAQ</a> and <a href='http://de.php.net/manual/en/ref.mbstring.php'>PHP documentation</a><br />";
+			$dieoutput .= "This script needs the PHP Multibyte String Functions library installed: See <a href='http://manual.limesurvey.org/wiki/Installation_FAQ'>FAQ</a> and <a href='http://de.php.net/manual/en/ref.mbstring.php'>PHP documentation</a><br />";
 
 		if ($dieoutput != '')
 			throw new CException($dieoutput);
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index fd0dd9bd5e3..362bc9faa24 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -323,7 +323,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
             Yii::app()->getController()->_loadEndScripts();
 
         if(!isset($aData['display']['footer']) || $aData['display']['footer'] !== false)
-            Yii::app()->getController()->_getAdminFooter('http://docs.limesurvey.org', $clang->gT('LimeSurvey online manual'));
+            Yii::app()->getController()->_getAdminFooter('http://manual.limesurvey.org', $clang->gT('LimeSurvey online manual'));
     }
 
     /**
diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php
index 8a893159c7b..db932b0958d 100644
--- a/application/views/admin/conditions/conditionshead_view.php
+++ b/application/views/admin/conditions/conditionshead_view.php
@@ -21,7 +21,7 @@
             <label for='questionNav'><?php $clang->eT("Questions");?>:</label>
             <select id='questionNav' onchange="window.open(this.options[this.selectedIndex].value,'_top')"><?php echo $quesitonNavOptions;?></select>
             <img alt="" src="<?php echo $sImageURL;?>separator.gif"/>
-            <a href="http://docs.limesurvey.org" target='_blank'>
+            <a href="http://manual.limesurvey.org" target='_blank'>
                 <img src='<?php echo $sImageURL;?>showhelp.png' title='' alt='<?php $clang->eT("LimeSurvey online manual");?>' /></a>
         </div></div></div>
 <p>
diff --git a/application/views/admin/index.php b/application/views/admin/index.php
index b188723b818..2becfa7d94a 100644
--- a/application/views/admin/index.php
+++ b/application/views/admin/index.php
@@ -1,5 +1,5 @@
 <?php
 $this->_getAdminHeader(Yii::app()->session['metaHeader']);
 $this->_showadminmenu();
-$this->_getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual"));
+$this->_getAdminFooter("http://manual.limesurvey.org", $clang->gT("LimeSurvey online manual"));
 ?>
\ No newline at end of file
diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
index 1a41f4b0552..d93baf5a576 100644
--- a/application/views/admin/super/adminmenu.php
+++ b/application/views/admin/super/adminmenu.php
@@ -109,7 +109,7 @@
             <a href="<?php echo $this->createUrl("admin/authentication/sa/logout"); ?>" >
                 <img src='<?php echo $sImageURL;?>logout.png' alt='<?php $clang->eT("Logout");?>' /></a>
 
-            <a href="http://docs.limesurvey.org" target="_blank">
+            <a href="http://manual.limesurvey.org" target="_blank">
                 <img src='<?php echo $sImageURL;?>showhelp.png' alt='<?php $clang->eT("LimeSurvey online manual");?>' /></a>
         </div>
     </div>
diff --git a/application/views/admin/super/footer.php b/application/views/admin/super/footer.php
index 612d5cc8f88..f5e3fb4dbc6 100644
--- a/application/views/admin/super/footer.php
+++ b/application/views/admin/super/footer.php
@@ -2,7 +2,7 @@
 </div>
 <div class='footer'>
     <div style='float:left;width:110px;text-align:left;'>
-    <a href='http://docs.limesurvey.org'><img alt='LimeSurvey - <?php $clang->eT("Online Manual");?>' title='LimeSurvey - <?php $clang->eT("Online manual");?>' src='<?php echo Yii::app()->getConfig('adminimageurl');?>docs.png' /></a>
+    <a href='http://manual.limesurvey.org'><img alt='LimeSurvey - <?php $clang->eT("Online Manual");?>' title='LimeSurvey - <?php $clang->eT("Online manual");?>' src='<?php echo Yii::app()->getConfig('adminimageurl');?>docs.png' /></a>
     </div>
     <div style='float:right;'>
     <a href='http://donate.limesurvey.org'><img alt='<?php $clang->eT("Support this project - Donate to "); ?>LimeSurvey' title='<?php $clang->eT("Support this project - Donate to "); ?>LimeSurvey!' src='<?php echo Yii::app()->getConfig('adminimageurl');;?>donate.png'/></a>