diff options
| author | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 18:25:34 +0200 |
|---|---|---|
| committer | Tim Nolte <noltet@sekisui-spi.com> | 2015-06-08 18:25:34 +0200 |
| commit | 89ed9fafd75e3b65a7691f1b13440bdedadf5eda (patch) | |
| tree | 5dfa69c55ff48502527fcb6f4f532fb5ad6651ca /user_guide_src/source/general | |
| parent | 2ac4177b4b6afc63d594523416c3991d23dddf20 (diff) | |
| parent | b76394834a3e36e8c376913cd9666a8d7a4cea45 (diff) | |
Merge branch 'develop' into feature/mysqli-ssl
Diffstat (limited to 'user_guide_src/source/general')
| -rw-r--r-- | user_guide_src/source/general/controllers.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/environments.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/general/reserved_names.rst | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst index bc8319dd8..7ab5a7f6a 100644 --- a/user_guide_src/source/general/controllers.rst +++ b/user_guide_src/source/general/controllers.rst @@ -138,7 +138,7 @@ present, as will be the case when only your site root URL is requested. To specify a default controller, open your **application/config/routes.php** file and set this variable:: - $route['default_controller'] = 'Blog'; + $route['default_controller'] = 'blog'; Where Blog is the name of the controller class you want used. If you now load your main index.php file without specifying any URI segments you'll diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index f5a4f617e..7f030b6ef 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -48,5 +48,5 @@ Configuration Files Optionally, you can have CodeIgniter load environment-specific configuration files. This may be useful for managing things like differing API keys across multiple environments. This is described in -more detail in the environment section of the :doc:`Config -Class <../libraries/config#environments>`_ documentation.
\ No newline at end of file +more detail in the environment section of the :doc:`Config Class +<../libraries/config>`_ documentation.
\ No newline at end of file diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst index a7b0c3465..5d745cba6 100644 --- a/user_guide_src/source/general/reserved_names.rst +++ b/user_guide_src/source/general/reserved_names.rst @@ -75,6 +75,7 @@ Constants - FOPEN_READ_WRITE_CREATE - FOPEN_WRITE_CREATE_STRICT - FOPEN_READ_WRITE_CREATE_STRICT +- SHOW_DEBUG_BACKTRACE - EXIT_SUCCESS - EXIT_ERROR - EXIT_CONFIG |