summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-11 13:33:16 +0100
commit8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch)
tree5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /user_guide_src/source/general
parent4f50256a84e8052fc3356683f28286d36f8a322c (diff)
parent81c934729d9fcbb294a8914608c315eed30ff9c4 (diff)
Fix merge conflicts
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/credits.rst25
-rw-r--r--user_guide_src/source/general/environments.rst2
-rw-r--r--user_guide_src/source/general/models.rst2
-rw-r--r--user_guide_src/source/general/profiling.rst11
-rw-r--r--user_guide_src/source/general/reserved_names.rst1
5 files changed, 23 insertions, 18 deletions
diff --git a/user_guide_src/source/general/credits.rst b/user_guide_src/source/general/credits.rst
index 03ee83dd6..371808fe4 100644
--- a/user_guide_src/source/general/credits.rst
+++ b/user_guide_src/source/general/credits.rst
@@ -2,18 +2,21 @@
Credits
#######
-CodeIgniter was originally developed by `Rick
-Ellis <http://www.ellislab.com/>`_ (CEO of `EllisLab,
-Inc. <http://ellislab.com/>`_). The framework was written for
-performance in the real world, with many of the class libraries,
-helpers, and sub-systems borrowed from the code-base of
-`ExpressionEngine <http://www.expressionengine.com/>`_.
+CodeIgniter was originally developed by `Rick Ellis <http://www.ellislab.com/>`_
+(CEO of `EllisLab, Inc. <http://ellislab.com/>`_). The framework was written for
+performance in the real world, with many of the class libraries, helpers, and
+sub-systems borrowed from the code-base of `ExpressionEngine
+<http://www.expressionengine.com/>`_.
+
+It was, for years, developed and maintained by EllisLab, the ExpressionEngine
+Development Team and a group of community members called the Reactor Team.
+
+In 2014, CodeIgniter was acquired by the `British Columbia Institute of Technology
+<http://bcit.ca/>`_ and was then officially announced as a community-maintaned
+project.
-It is currently developed and maintained by the ExpressionEngine
-Development Team.
Bleeding edge development is spearheaded by the handpicked contributors
of the Reactor Team.
-A hat tip goes to Ruby on Rails for inspiring us to create a PHP
-framework, and for bringing frameworks into the general consciousness of
-the web community. \ No newline at end of file
+A hat tip goes to Ruby on Rails for inspiring us to create a PHP framework, and
+for bringing frameworks into the general consciousness of the web community. \ No newline at end of file
diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index d74ebb8d5..1ce4fde3a 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -20,7 +20,7 @@ the value provided in ``$_SERVER['CI_ENV']``, otherwise defaults to
This server variable can be set in your .htaccess file, or Apache
config using `SetEnv <https://httpd.apache.org/docs/2.2/mod/mod_env.html#setenv>`_.
Alternative methods are available for nginx and other servers, or you can
-remove this logic entirely and set the constant based on the HTTP_HOST or IP.
+remove this logic entirely and set the constant based on the server's IP address.
In addition to affecting some basic framework behavior (see the next
section), you may use this constant in your own development to
diff --git a/user_guide_src/source/general/models.rst b/user_guide_src/source/general/models.rst
index c4fd12476..1cfe736de 100644
--- a/user_guide_src/source/general/models.rst
+++ b/user_guide_src/source/general/models.rst
@@ -137,7 +137,7 @@ view::
{
$this->load->model('blog');
- $data['query'] = $this->Blog->get_last_ten_entries();
+ $data['query'] = $this->blog->get_last_ten_entries();
$this->load->view('blog', $data);
}
diff --git a/user_guide_src/source/general/profiling.rst b/user_guide_src/source/general/profiling.rst
index 63a261cc6..2716d1781 100644
--- a/user_guide_src/source/general/profiling.rst
+++ b/user_guide_src/source/general/profiling.rst
@@ -82,8 +82,9 @@ Key Description
hidden.
======================= =================================================================== ========
-.. note:: Disabling the (save_queries)[http://ellislab.com/codeigniter/user-guide/database/configuration.html] setting in your database configuration
- will also effectively disable profiling for database queries and render
- the 'queries' setting above useless. You can optionally override this
- setting with `$this->db->save_queries = TRUE;`. Without this setting you
- won't be able to view the queries or the (last_query)[http://ellislab.com/codeigniter/user-guide/database/helpers.html].
+.. note:: Disabling the :doc:`save_queries </database/configuration>` setting in
+ your database configuration will also effectively disable profiling for
+ database queries and render the 'queries' setting above useless. You can
+ optionally override this setting with ``$this->db->save_queries = TRUE;``.
+ Without this setting you won't be able to view the queries or the
+ `last_query <database/helpers>`. \ 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 81a05ace6..09c4549fd 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -41,6 +41,7 @@ Functions
- :func:`is_https()`
- :func:`function_usable()`
- :func:`get_instance()`
+- ``_error_handler()``
- ``_exception_handler()``
- ``_stringify_attributes()``