diff options
author | Greg Aker <greg.aker@ellislab.com> | 2010-11-10 22:26:47 +0100 |
---|---|---|
committer | Greg Aker <greg.aker@ellislab.com> | 2010-11-10 22:26:47 +0100 |
commit | 4703ec8538f562dfdfaf1224d17f7d482217ff69 (patch) | |
tree | b79b9fe8a40fe1df66a6dbfe5b9d4df9e3235168 | |
parent | a926328583e7ffdaaac7daf2f87810d842423f21 (diff) | |
parent | 2814cd15b61fcc6f18b9bd204e1bd22e8db73b12 (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
-rw-r--r-- | user_guide/overview/at_a_glance.html | 10 | ||||
-rw-r--r-- | user_guide/overview/features.html | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html index 984eb0867..f54a4e90b 100644 --- a/user_guide/overview/at_a_glance.html +++ b/user_guide/overview/at_a_glance.html @@ -69,16 +69,6 @@ minimizing the amount of code needed for a given task.</p> <p>CodeIgniter is licensed under an Apache/BSD-style open source license so you can use it however you please. For more information please read the <a href="../license.html">license agreement</a>.</p> - -<h2>CodeIgniter Runs on PHP 4</h2> -<p>CodeIgniter is written to be compatible with PHP 4. Although we would have loved to take advantage of the better object handling -in PHP 5 since it would have simplified some things we had to find creative solutions for (looking your way, multiple inheritance), -at the time of this writing PHP 5 is not in widespread use, which means we would be alienating most of our -potential audience. Major OS vendors like RedHat are moving slowly to support PHP 5, and they are unlikely to do so in the short term, so -we felt that it did not serve the best interests of the PHP community to write CodeIgniter in PHP 5.</p> - -<p>Note: CodeIgniter will run on PHP 5. It simply does not take advantage of any native features that are only available in that version.</p> - <h2>CodeIgniter is Light Weight</h2> <p>Truly light weight. The core system requires only a few very small libraries. This is in stark contrast to many frameworks that require significantly more resources. Additional libraries are loaded dynamically upon request, based on your needs for a given process, so the base system diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index 375403a6e..3ce6391f9 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -66,7 +66,6 @@ CodeIgniter is child's play so we encourage you to do just that. In the mean ti <ul> <li>Model-View-Controller Based System</li> -<li>PHP 4 Compatible</li> <li>Extremely Light Weight</li> <li>Full Featured database classes with support for several platforms.</li> <li>Active Record Database Support</li> |