diff options
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/contributing/index.rst | 6 | ||||
| -rw-r--r-- | user_guide_src/source/general/credits.rst | 25 | ||||
| -rw-r--r-- | user_guide_src/source/general/profiling.rst | 11 | ||||
| -rw-r--r-- | user_guide_src/source/installation/downloads.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/overview/at_a_glance.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/overview/getting_started.rst | 4 | ||||
| -rw-r--r-- | user_guide_src/source/tutorial/conclusion.rst | 6 |
7 files changed, 31 insertions, 27 deletions
diff --git a/user_guide_src/source/contributing/index.rst b/user_guide_src/source/contributing/index.rst index 4d3fe6ede..7359e09aa 100644 --- a/user_guide_src/source/contributing/index.rst +++ b/user_guide_src/source/contributing/index.rst @@ -5,8 +5,8 @@ Contributing to CodeIgniter CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. These contributions are made in the form of Issues or `Pull Requests <http://help.github.com/send-pull-requests/>`_ on -the `EllisLab CodeIgniter repository -<https://github.com/EllisLab/CodeIgniter>`_ on GitHub. +the `CodeIgniter repository +<https://github.com/bcit-ci/CodeIgniter>`_ on GitHub. Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please check a few things first: @@ -33,7 +33,7 @@ PHP Style ========= All code must meet the `Style Guide -<http://ellislab.com/codeigniter/user-guide/general/styleguide.html>`_, which is +<http://codeigniter.com/user_guide/general/styleguide.html>`_, which is essentially the `Allman indent style <http://en.wikipedia.org/wiki/Indent_style#Allman_style>`_, underscores and readable operators. This makes certain that all code is the same format as the 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 diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst index 56537d42d..f6214e9ce 100644 --- a/user_guide_src/source/installation/downloads.rst +++ b/user_guide_src/source/installation/downloads.rst @@ -43,9 +43,9 @@ GitHub `Git <http://git-scm.com/about>`_ is a distributed version control system. -Public Git access is available at `GitHub <https://github.com/EllisLab/CodeIgniter>`_. +Public Git access is available at `GitHub <https://github.com/bcit-ci/CodeIgniter>`_. Please note that while every effort is made to keep this code base functional, we cannot guarantee the functionality of code taken from the develop branch. -Beginning with version 2.0.3, stable versions are also available via `GitHub Releases <https://github.com/EllisLab/CodeIgniter/releases>`_.
\ No newline at end of file +Beginning with version 2.0.3, stable versions are also available via `GitHub Releases <https://github.com/bcit-ci/CodeIgniter/releases>`_.
\ No newline at end of file diff --git a/user_guide_src/source/overview/at_a_glance.rst b/user_guide_src/source/overview/at_a_glance.rst index da323b907..facbedaee 100644 --- a/user_guide_src/source/overview/at_a_glance.rst +++ b/user_guide_src/source/overview/at_a_glance.rst @@ -111,4 +111,4 @@ CodeIgniter has a Friendly Community of Users ============================================= Our growing community of users can be seen actively participating in our -`Community Forums <http://ellislab.com/forums/>`_. +`Community Forums <http://forum.codeigniter.com/>`_. diff --git a/user_guide_src/source/overview/getting_started.rst b/user_guide_src/source/overview/getting_started.rst index feaad5908..04ee50df7 100644 --- a/user_guide_src/source/overview/getting_started.rst +++ b/user_guide_src/source/overview/getting_started.rst @@ -19,6 +19,6 @@ Reference** and **Helper Reference** pages to learn to utilize the native libraries and helper files. Feel free to take advantage of our `Community -Forums <http://ellislab.com/forums/>`_ if you have questions or -problems, and our `Wiki <https://github.com/EllisLab/CodeIgniter/wiki>`_ to see code +Forums <http://forum.codeigniter.com/>`_ if you have questions or +problems, and our `Wiki <https://github.com/bcit-ci/CodeIgniter/wiki>`_ to see code examples posted by other users. diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst index a5f69b4e7..0d90cde6f 100644 --- a/user_guide_src/source/tutorial/conclusion.rst +++ b/user_guide_src/source/tutorial/conclusion.rst @@ -20,7 +20,7 @@ CodeIgniter within a few days. If you still have questions about the framework or your own CodeIgniter code, you can: -- Check out our `forums <http://ellislab.com/forums>`_ -- Visit our `IRC chatroom <https://github.com/EllisLab/CodeIgniter/wiki/IRC>`_ -- Explore the `Wiki <https://github.com/EllisLab/CodeIgniter/wiki/>`_ +- Check out our `forums <http://forum.codeigniter.com/>`_ +- Visit our `IRC chatroom <https://github.com/bcit-ci/CodeIgniter/wiki/IRC>`_ +- Explore the `Wiki <https://github.com/bcit-ci/CodeIgniter/wiki/>`_ |