diff options
| author | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
|---|---|---|
| committer | Pascal Kriete <pascal@pascalkriete.com> | 2011-11-14 21:15:15 +0100 |
| commit | f525f10c850399700a4cce183aef55656ff44d31 (patch) | |
| tree | d0250655551d773c9347573e594997e07d7280a5 /user_guide/index.html | |
| parent | 44cdece942c310f5520497dbde4febc26e96c27e (diff) | |
| parent | 917c3455cc70d5117daa7359f345a820154ada3e (diff) | |
Merge branch 'release/2.1.0'
Conflicts:
user_guide/helpers/url_helper.html
Diffstat (limited to 'user_guide/index.html')
| -rw-r--r-- | user_guide/index.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/user_guide/index.html b/user_guide/index.html index bb1d21621..fa90983e1 100644 --- a/user_guide/index.html +++ b/user_guide/index.html @@ -28,7 +28,7 @@ <div id="masthead"> <table cellpadding="0" cellspacing="0" border="0" style="width:100%"> <tr> -<td><h1>CodeIgniter User Guide Version 2.0.3</h1></td> +<td><h1>CodeIgniter User Guide Version 2.1.0</h1></td> <td id="breadcrumb_right"><a href="toc.html">Table of Contents Page</a></td> </tr> </table> @@ -77,7 +77,6 @@ minimizing the amount of code needed for a given task.</p> <li>You want a framework that requires nearly zero configuration.</li> <li>You want a framework that does not require you to use the command line.</li> <li>You want a framework that does not require you to adhere to restrictive coding rules.</li> -<li>You are not interested in large-scale monolithic libraries like PEAR.</li> <li>You do not want to be forced to learn a templating language (although a template parser is optionally available if you desire one).</li> <li>You eschew complexity, favoring simple solutions.</li> <li>You need clear, thorough documentation.</li> |