diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-11-11 13:33:16 +0100 |
| commit | 8f7d3d2fccc097c85cc403b58df6c5fc35418579 (patch) | |
| tree | 5bc1ef2a75abb0d85a3ab2cece365eed9e516470 /readme.rst | |
| parent | 4f50256a84e8052fc3356683f28286d36f8a322c (diff) | |
| parent | 81c934729d9fcbb294a8914608c315eed30ff9c4 (diff) | |
Fix merge conflicts
Diffstat (limited to 'readme.rst')
| -rw-r--r-- | readme.rst | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/readme.rst b/readme.rst index aa07d6e12..c32961448 100644 --- a/readme.rst +++ b/readme.rst @@ -16,14 +16,14 @@ Release Information This repo contains in-development code for future releases. To download the latest stable release please visit the `CodeIgniter Downloads -<http://codeigniter.com/downloads/>`_ page. +<http://www.codeigniter.com/download>`_ page. ************************** Changelog and New Features ************************** You can find a list of all changes for each release in the `user -guide change log <https://github.com/EllisLab/CodeIgniter/blob/develop/user_guide_src/source/changelog.rst>`_. +guide change log <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide_src/source/changelog.rst>`_. ******************* Server Requirements @@ -35,7 +35,7 @@ Server Requirements Installation ************ -Please see the `installation section <http://ellislab.com/codeigniter/user-guide/installation/index.html>`_ +Please see the `installation section <http://www.codeigniter.com/user_guide/installation/index.html>`_ of the CodeIgniter User Guide. ******* @@ -43,20 +43,20 @@ License ******* Please see the `license -agreement <http://ellislab.com/codeigniter/user-guide/license.html>`_ +agreement <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide_src/source/license.rst>`_. ********* Resources ********* -- `User Guide <http://ellislab.com/codeigniter/user_guide/>`_ -- `Community Forums <http://ellislab.com/forums/>`_ -- `Community Wiki <https://github.com/EllisLab/CodeIgniter/wiki/>`_ -- `Community IRC <http://ellislab.com/codeigniter/irc>`_ +- `User Guide <http://www.codeigniter.com/docs>`_ +- `Community Forums <http://forum.codeigniter.com/>`_ +- `Community Wiki <https://github.com/bcit-ci/CodeIgniter/wiki>`_ +- `Community IRC <http://www.codeigniter.com/irc>`_ *************** Acknowledgement *************** The EllisLab team and The Reactor Engineers would like to thank all the -contributors to the CodeIgniter project and you, the CodeIgniter user. +contributors to the CodeIgniter project and you, the CodeIgniter user.
\ No newline at end of file |