8 files changed, 13 insertions, 11 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 10315220e..9ab8248e3 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -62,7 +62,9 @@ $config['uri_protocol']	= 'REQUEST_URI';
 | This option allows you to add a suffix to all URLs generated by CodeIgniter.
 | For more information please see the user guide:
 |
-| https://codeigniter.com/user_guide/general/urls.html
+| https://codeigniter.com/userguide3/general/urls.html
+|
+| Note: This option is ignored for CLI requests.
 */
 $config['url_suffix'] = '';
 
@@ -110,8 +112,8 @@ $config['enable_hooks'] = FALSE;
 | This item allows you to set the filename/classname prefix when extending
 | native libraries.  For more information please see the user guide:
 |
-| https://codeigniter.com/user_guide/general/core_classes.html
-| https://codeigniter.com/user_guide/general/creating_libraries.html
+| https://codeigniter.com/userguide3/general/core_classes.html
+| https://codeigniter.com/userguide3/general/creating_libraries.html
 |
 */
 $config['subclass_prefix'] = 'MY_';
@@ -321,7 +323,7 @@ $config['cache_query_string'] = FALSE;
 | If you use the Encryption class, you must set an encryption key.
 | See the user guide for more info.
 |
-| https://codeigniter.com/user_guide/libraries/encryption.html
+| https://codeigniter.com/userguide3/libraries/encryption.html
 |
 */
 $config['encryption_key'] = '';
diff --git a/application/config/hooks.php b/application/config/hooks.php
index a8f38a5dc..79c5c162f 100644
--- a/application/config/hooks.php
+++ b/application/config/hooks.php
@@ -8,6 +8,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | This file lets you define "hooks" to extend CI without hacking the core
 | files.  Please see the user guide for info:
 |
-|	https://codeigniter.com/user_guide/general/hooks.html
+|	https://codeigniter.com/userguide3/general/hooks.html
 |
 */
diff --git a/application/config/memcached.php b/application/config/memcached.php
index 5c23b39c1..65a149617 100644
--- a/application/config/memcached.php
+++ b/application/config/memcached.php
@@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | -------------------------------------------------------------------------
 | Your Memcached servers can be specified below.
 |
-|	See: https://codeigniter.com/user_guide/libraries/caching.html#memcached
+|	See: https://codeigniter.com/userguide3/libraries/caching.html#memcached
 |
 */
 $config = array(
diff --git a/application/config/profiler.php b/application/config/profiler.php
index 3db22e39c..3436e931e 100644
--- a/application/config/profiler.php
+++ b/application/config/profiler.php
@@ -9,6 +9,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | data are displayed when the Profiler is enabled.
 | Please see the user guide for info:
 |
-|	https://codeigniter.com/user_guide/general/profiling.html
+|	https://codeigniter.com/userguide3/general/profiling.html
 |
 */
diff --git a/application/config/routes.php b/application/config/routes.php
index 1b45740d7..e8e2296f0 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -19,7 +19,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 |
 | Please see the user guide for complete details:
 |
-|	https://codeigniter.com/user_guide/general/routing.html
+|	https://codeigniter.com/userguide3/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
diff --git a/application/config/smileys.php b/application/config/smileys.php
index abf9a898d..a9b9191cc 100644
--- a/application/config/smileys.php
+++ b/application/config/smileys.php
@@ -10,7 +10,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | :-) and :) use the same image replacement.
 |
 | Please see user guide for more info:
-| https://codeigniter.com/user_guide/helpers/smiley_helper.html
+| https://codeigniter.com/userguide3/helpers/smiley_helper.html
 |
 */
 $smileys = array(
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index 9213c0cf5..5f82771b6 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -16,7 +16,7 @@ class Welcome extends CI_Controller {
 	 *
 	 * So any other public methods not prefixed with an underscore will
 	 * map to /index.php/welcome/<method_name>
-	 * @see https://codeigniter.com/user_guide/general/urls.html
+	 * @see https://codeigniter.com/userguide3/general/urls.html
 	 */
 	public function index()
 	{
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index d79c049bf..9db22bc5e 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -90,7 +90,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		<p>The corresponding controller for this page is found at:</p>
 		<code>application/controllers/Welcome.php</code>
 
-		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="user_guide/">User Guide</a>.</p>
+		<p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="userguide3/">User Guide</a>.</p>
 	</div>
 
 	<p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>