diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:52:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-01-11 11:52:04 +0100 |
| commit | 071bb487932168c88fb43c0e2abd17e4fa1e1458 (patch) | |
| tree | 0d48ea8b8ce53b02cf87e43759e0004e8afc4f4a /user_guide_src | |
| parent | 9b2c17ed78f0e6e08a96e176ef640fca675dd0a6 (diff) | |
| parent | 700dbadb23bfa937f519df668a57c9050cd05062 (diff) | |
Merge branch '3.0-stable' into develop
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/cilexer/cilexer/cilexer.py | 2 | ||||
| -rw-r--r-- | user_guide_src/source/contributing/index.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/installation/upgrade_150.rst | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/cilexer/cilexer/cilexer.py b/user_guide_src/cilexer/cilexer/cilexer.py index 1abdcbbae..d6bebe28d 100644 --- a/user_guide_src/cilexer/cilexer/cilexer.py +++ b/user_guide_src/cilexer/cilexer/cilexer.py @@ -1,5 +1,5 @@ # CodeIgniter -# http://codeigniter.com +# https://codeigniter.com # # An open source application development framework for PHP # diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index ef6f4aab4..da5bb527b 100644 --- a/user_guide_src/source/contributing/index.rst +++ b/user_guide_src/source/contributing/index.rst @@ -86,9 +86,9 @@ PHP Style ========= All code must meet the `Style Guide -<http://www.codeigniter.com/userguide3/general/styleguide.html>`_, which is +<https://codeigniter.com/userguide3/general/styleguide.html>`_, which is essentially the `Allman indent style -<http://en.wikipedia.org/wiki/Indent_style#Allman_style>`_, underscores and +<https://en.wikipedia.org/wiki/Indent_style#Allman_style>`_, underscores and readable operators. This makes certain that all code is the same format as the existing code and means it will be as readable as possible. diff --git a/user_guide_src/source/installation/upgrade_150.rst b/user_guide_src/source/installation/upgrade_150.rst index bfe01ebba..50eb5eae5 100644 --- a/user_guide_src/source/installation/upgrade_150.rst +++ b/user_guide_src/source/installation/upgrade_150.rst @@ -49,8 +49,8 @@ Open your application/config/config.php file and ADD these new items:: | 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_'; |