diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-27 08:47:47 +0200 |
| commit | a6507905578f1cf209776ae3d53099a005a06823 (patch) | |
| tree | 9f23bb557f920034cf65c86059c84e37efd34d79 /user_guide/overview/features.html | |
| parent | 60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff) | |
| parent | 25d495b4a2598f771a858108a2cd2e96f0130412 (diff) | |
merging in changes
Diffstat (limited to 'user_guide/overview/features.html')
| -rw-r--r-- | user_guide/overview/features.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html index e20219e0f..4209463b1 100644 --- a/user_guide/overview/features.html +++ b/user_guide/overview/features.html @@ -59,10 +59,10 @@ Features <h1>CodeIgniter Features</h1> <p>Features in and of themselves are a very poor way to judge an application since they tell you nothing -about the user experience, or how intuitively or intelligently it is designed. Features +about the user experience, or how intuitively or intelligently it is designed. Features don't reveal anything about the quality of the code, or the performance, or the attention to detail, or security practices. The only way to really judge an app is to try it and get to know the code. <a href="../installation/">Installing</a> -CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.</p> +CodeIgniter is child's play so we encourage you to do just that. In the mean time here's a list of CodeIgniter's main features.</p> <ul> <li>Model-View-Controller Based System</li> @@ -73,7 +73,7 @@ CodeIgniter is child's play so we encourage you to do just that. In the mean ti <li>Security and XSS Filtering</li> <li>Session Management</li> <li>Email Sending Class. Supports Attachments, HTML/Text email, multiple protocols (sendmail, SMTP, and Mail) and more.</li> -<li>Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM</li> +<li>Image Manipulation Library (cropping, resizing, rotating, etc.). Supports GD, ImageMagick, and NetPBM</li> <li>File Uploading Class</li> <li>FTP Class</li> <li>Localization</li> |