summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-11 11:52:04 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-11 11:52:04 +0100
commit071bb487932168c88fb43c0e2abd17e4fa1e1458 (patch)
tree0d48ea8b8ce53b02cf87e43759e0004e8afc4f4a /application/config
parent9b2c17ed78f0e6e08a96e176ef640fca675dd0a6 (diff)
parent700dbadb23bfa937f519df668a57c9050cd05062 (diff)
Merge branch '3.0-stable' into develop
Diffstat (limited to 'application/config')
-rw-r--r--application/config/config.php8
-rw-r--r--application/config/hooks.php2
-rw-r--r--application/config/memcached.php2
-rw-r--r--application/config/profiler.php2
-rw-r--r--application/config/routes.php2
-rw-r--r--application/config/smileys.php2
6 files changed, 9 insertions, 9 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 4f8f81406..23ef5a528 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -62,7 +62,7 @@ $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:
|
-| http://codeigniter.com/user_guide/general/urls.html
+| https://codeigniter.com/user_guide/general/urls.html
*/
$config['url_suffix'] = '';
@@ -110,8 +110,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:
|
-| http://codeigniter.com/user_guide/general/core_classes.html
-| http://codeigniter.com/user_guide/general/creating_libraries.html
+| https://codeigniter.com/user_guide/general/core_classes.html
+| https://codeigniter.com/user_guide/general/creating_libraries.html
|
*/
$config['subclass_prefix'] = 'MY_';
@@ -311,7 +311,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.
|
-| http://codeigniter.com/user_guide/libraries/encryption.html
+| https://codeigniter.com/user_guide/libraries/encryption.html
|
*/
$config['encryption_key'] = '';
diff --git a/application/config/hooks.php b/application/config/hooks.php
index 2eac5bbc9..a8f38a5dc 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:
|
-| http://codeigniter.com/user_guide/general/hooks.html
+| https://codeigniter.com/user_guide/general/hooks.html
|
*/
diff --git a/application/config/memcached.php b/application/config/memcached.php
index 55949a66c..5c23b39c1 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: http://codeigniter.com/user_guide/libraries/caching.html#memcached
+| See: https://codeigniter.com/user_guide/libraries/caching.html#memcached
|
*/
$config = array(
diff --git a/application/config/profiler.php b/application/config/profiler.php
index b30204e16..3db22e39c 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:
|
-| http://codeigniter.com/user_guide/general/profiling.html
+| https://codeigniter.com/user_guide/general/profiling.html
|
*/
diff --git a/application/config/routes.php b/application/config/routes.php
index 599c79b0e..8ebf62bfa 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:
|
-| http://codeigniter.com/user_guide/general/routing.html
+| https://codeigniter.com/user_guide/general/routing.html
|
| -------------------------------------------------------------------------
| RESERVED ROUTES
diff --git a/application/config/smileys.php b/application/config/smileys.php
index 1eeba4776..abf9a898d 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:
-| http://codeigniter.com/user_guide/helpers/smiley_helper.html
+| https://codeigniter.com/user_guide/helpers/smiley_helper.html
|
*/
$smileys = array(