diff options
Diffstat (limited to 'user_guide_src/source/general')
| -rw-r--r-- | user_guide_src/source/general/credits.rst | 25 | ||||
| -rw-r--r-- | user_guide_src/source/general/profiling.rst | 11 |
2 files changed, 20 insertions, 16 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/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 |