codeigniter_vender 0.0.1 → 0.0.2

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/active_record.html

@@ -27,7 +27,7 @@
 <div id="masthead">
 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">
 <tr>
-<td><h1>CodeIgniter User Guide Version 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -116,7 +116,7 @@ instead of using the db->where() function:</p>
 <code>$query = $this->db->get_where('mytable', array('id' => $id), $limit, $offset);</code>
 
 <p>Please read the about the where function below for more information.</p>
-<p class="important">Note: get_where() was formerly known as getwhere(), which has been deprecated</p>
+<p class="important">Note: get_where() was formerly known as getwhere(), which has been removed</p>
 
 <h2>$this->db->select();</h2>
 <p>Permits you to write the SELECT portion of your query:</p>
@@ -198,7 +198,7 @@ $query = $this->db->get();<br />
 
 <p>Multiple function calls can be made if you need several joins in one query.</p>
 
-<p>If you need something other than a natural JOIN you can specify it via the third parameter of the function.
+<p>If you need a specific type of JOIN you can specify it via the third parameter of the function.
 Options are: left, right, outer, inner, left outer, and right outer.</p>
 
 <code>
@@ -220,20 +220,20 @@ $this->db->join('comments', 'comments.id = blogs.id', <strong>'left'</strong>);<
 
 	<code>$this->db->where('name', $name);
 	<br /><br />// Produces: WHERE name = 'Joe'	</code>
-	
+
 	<p>Notice that the equal sign is added for you.</p>
-	
+
 	<p>If you use multiple function calls they will be chained together with <var>AND</var> between them:</p>
-	
+
 	<code>$this->db->where('name', $name);<br />
 	$this->db->where('title', $title);<br />
 	$this->db->where('status', $status);
-	<br /><br />// WHERE name 'Joe' AND title = 'boss' AND status = 'active'	</code>	</li>
-	
+	<br /><br />// WHERE name = 'Joe' AND title = 'boss' AND status = 'active'	</code>	</li>
+
 	<li><strong>Custom key/value method:</strong>
-	
+
 	<p>You can include an operator in the first parameter in order to control the comparison:</p>
-	
+
 	<code>$this->db->where('name !=', $name);<br />
 	$this->db->where('id <', $id);
 	<br /><br />// Produces: WHERE name != 'Joe' AND id < 45	</code>	</li>
@@ -242,7 +242,7 @@ $this->db->join('comments', 'comments.id = blogs.id', <strong>'left'</strong>);<
 
 	<code>
 	$array = array('name' => $name, 'title' => $title, 'status' => $status);<br /><br />
-	
+
 	$this->db->where($array);
 	<br /><br />// Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'	</code>
 
@@ -250,10 +250,10 @@ $this->db->join('comments', 'comments.id = blogs.id', <strong>'left'</strong>);<
 
 	<code>
 	$array = array('name !=' => $name, 'id <' => $id, 'date >' => $date);<br /><br />
-	
+
 	$this->db->where($array);</code>	</li>
 		<li><strong>Custom string:</strong>
-		
+
 		<p>You can write your own clauses manually:</p>
 
 		<code>
@@ -263,7 +263,7 @@ $this->db->join('comments', 'comments.id = blogs.id', <strong>'left'</strong>);<
 
 
 <p>$this-&gt;db-&gt;where() accepts an optional third parameter. If you set it to FALSE, CodeIgniter will not try to protect your field or table names with backticks.</p>
-<p><code> 		$this-&gt;db-&gt;where('MATCH (field) AGAINST (&quot;value&quot;)', NULL, FALSE);<br />
+<p><code>		$this-&gt;db-&gt;where('MATCH (field) AGAINST (&quot;value&quot;)', NULL, FALSE);<br />
 </code></p>
 <h2>$this->db->or_where();</h2>
 <p>This function is identical to the one above, except that multiple instances are joined by OR:</p>
@@ -274,7 +274,7 @@ $this->db->or_where('id >', $id);
 <br />
 <br />// Produces: WHERE name != 'Joe' OR id > 50</code>
 
-<p class="important">Note: or_where() was formerly known as orwhere(), which has been deprecated.</p>
+<p class="important">Note: or_where() was formerly known as orwhere(), which has been removed.</p>
 
 
 <h2>$this->db->where_in();</h2>
@@ -290,7 +290,7 @@ $this->db->or_where('id >', $id);
 	$names = array('Frank', 'Todd', 'James');<br />
 	$this->db->or_where_in('username', $names);<br />
 	// Produces: OR username IN ('Frank', 'Todd', 'James')</code></p>
-	
+
 <h2>$this->db->where_not_in();</h2>
 <p>Generates a WHERE field NOT IN ('item', 'item') SQL query joined with AND if appropriate</p>
 <p><code>
@@ -316,14 +316,14 @@ $this->db->or_where('id >', $id);
 
 	<code>$this->db->like('title', 'match');
 	<br /><br />// Produces: WHERE title LIKE '%match%'	</code>
-		
+
 	<p>If you use multiple function calls they will be chained together with <var>AND</var> between them:</p>
-	
+
 	<code>$this->db->like('title', 'match');<br />
 	$this->db->like('body', 'match');
 	<br /><br />
 	// WHERE title LIKE '%match%' AND  body LIKE '%match%</code>
-	If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default). 
+	If you want to control where the wildcard (%) is placed, you can use an optional third argument. Your options are 'before', 'after' and 'both' (which is the default).
 	<code>$this->db->like('title', 'match', 'before');
 	<br />
 		// Produces: WHERE title LIKE '%match'	<br />
@@ -333,17 +333,17 @@ $this->db->or_where('id >', $id);
 <br />
 	$this-&gt;db-&gt;like('title', 'match', 'both'); <br />
 // Produces: WHERE title LIKE '%match%' </code>	</li>
-	
+
 	<li><strong>Associative array method:</strong>
 
 	<code>
 	$array = array('title' => $match, 'page1' => $match, 'page2' => $match);<br /><br />
-	
+
 	$this->db->like($array);
 	<br /><br />// WHERE title LIKE '%match%' AND  page1 LIKE '%match%' AND  page2 LIKE '%match%'</code></li>
 	</ol>
-	
-	
+
+
 <h2>$this->db->or_like();</h2>
 <p>This function is identical to the one above, except that multiple instances are joined by OR:</p>
 
@@ -355,8 +355,8 @@ $this->db->or_like('body', $match);
 
 
 
-	
-<p class="important">Note: or_like() was formerly known as orlike(), which has been deprecated.</p>
+
+<p class="important">Note: or_like() was formerly known as orlike(), which has been removed.</p>
 <h2>$this-&gt;db-&gt;not_like();</h2>
 <p>This function is identical to <strong>like()</strong>, except that it generates NOT LIKE statements:</p>
 <code> $this-&gt;db-&gt;not_like('title', 'match');<br />
@@ -370,18 +370,18 @@ $this-&gt;db-&gt;or_not_like('body', 'match'); <br />
 // WHERE title  LIKE '%match% OR body NOT LIKE '%match%'</code>
 <h2>$this->db->group_by();</h2>
 <p>Permits you to write the GROUP BY portion of your query:</p>
-	
+
 <code>$this->db->group_by("title");
 <br /><br />// Produces: GROUP BY title
 </code>
 
 <p>You can also pass an array of multiple values as well:</p>
-	
+
 <code>$this->db->group_by(array("title", "date"));
 <br />
 <br />// Produces: GROUP BY title, date</code>
-	
-<p class="important">Note: group_by() was formerly known as groupby(), which has been deprecated. </p>
+
+<p class="important">Note: group_by() was formerly known as groupby(), which has been removed. </p>
 
 <h2> $this-&gt;db-&gt;distinct();<br />
 </h2>
@@ -391,8 +391,8 @@ $this-&gt;db-&gt;or_not_like('body', 'match'); <br />
 		<br />
 	// Produces: SELECT DISTINCT * FROM table</code></p>
 <h2>$this->db->having();</h2>
-<p>Permits you to write the HAVING portion of your query. There are 2 possible syntaxe, 1 argument or 2:</p>
-	
+<p>Permits you to write the HAVING portion of your query. There are 2 possible syntaxes, 1 argument or 2:</p>
+
 <code>$this->db->having('user_id = 45');
 <br />
 // Produces: HAVING user_id = 45<br />
@@ -401,7 +401,7 @@ $this-&gt;db-&gt;having('user_id',  45); <br />
 // Produces: HAVING user_id = 45<br />
 <br />
 </code>
-	
+
 <p>You can also pass an array of multiple values as well:</p>
 
 
@@ -419,14 +419,14 @@ $this-&gt;db-&gt;having('user_id',  45); <br />
 <h2>$this->db->order_by();</h2>
 <p>Lets you set an ORDER BY clause. The first parameter contains the name of the column you would like to order by.
 The second parameter lets you set the direction of the result.  Options are <kbd>asc</kbd> or <kbd>desc</kbd>, or <kbd>random</kbd>. </p>
-	
+
 <code>$this->db->order_by("title", "desc");
 <br />
 <br />// Produces: ORDER BY title DESC
 </code>
 
 <p>You can also pass your own string in the first parameter:</p>
-	
+
 <code>$this->db->order_by('title desc, name asc');
 <br />
 <br />// Produces: ORDER BY title DESC, name ASC
@@ -439,7 +439,7 @@ The second parameter lets you set the direction of the result.  Options are <kbd
 	<br />
 	// Produces: ORDER BY title DESC, name ASC
 	</code></p>
-<p class="important">Note: order_by() was formerly known as orderby(), which has been deprecated.</p>
+<p class="important">Note: order_by() was formerly known as orderby(), which has been removed.</p>
 <p class="important">Note: random ordering is not currently supported in Oracle or MSSQL drivers. These will default to 'ASC'.</p>
 <h2>$this->db->limit();</h2>
 <p>Lets you limit the number of rows you would like returned by the query:</p>
@@ -479,10 +479,10 @@ echo $this-&gt;db-&gt;count_all_results();<br />
 // Produces an integer, like 25</code>
 
 
-	
+
 <a name="insert">&nbsp;</a>
 <h1>Inserting Data</h1>
-	
+
 <h2>$this->db->insert();</h2>
 <p>Generates an insert string based on the data you supply, and runs the query. You can either pass an
 <strong>array</strong> or an <strong>object</strong> to the function.  Here is an example using an array:</p>
@@ -520,9 +520,9 @@ $this->db->insert('mytable', $object);
 <p>The first parameter will contain the table name, the second is an associative array of values.</p>
 
 <p class="important"><strong>Note:</strong> All values are escaped automatically producing safer queries.</p>
-	
-	
-	
+
+
+
 
 <h2>$this->db->set();</h2>
 <p>This function enables you to set values for <dfn>inserts</dfn> or <dfn>updates</dfn>.</p>
@@ -576,10 +576,10 @@ $this->db->insert('mytable');
 </code>
 
 
-	
+
 <a name="update">&nbsp;</a>
 <h1>Updating Data</h1>
-	
+
 <h2>$this->db->update();</h2>
 <p>Generates an update string and runs the query based on the data you supply.  You can pass an
 <strong>array</strong> or an <strong>object</strong> to the function. Here is an example using
@@ -625,7 +625,7 @@ $this->db->update('mytable', $object);
 
 
 <p class="important"><strong>Note:</strong> All values are escaped automatically producing safer queries.</p>
-	
+
 <p>You'll notice the use of the <dfn>$this->db->where()</dfn> function, enabling you to set the WHERE clause.
 You can optionally pass this information directly into the update function as a string:</p>
 
@@ -634,15 +634,15 @@ You can optionally pass this information directly into the update function as a
 <p>Or as an array:</p>
 
 <code>$this->db->update('mytable', $data, array('id' => $id));</code>
-	
+
 <p>You may also use the <dfn>$this->db->set()</dfn> function described above when performing updates.</p>
 
-	
+
 <a name="delete">&nbsp;</a>
 <h1>Deleting Data</h1>
 
 
-	
+
 <h2>$this->db->delete();</h2>
 <p>Generates a delete SQL string and runs the query.</p>
 
@@ -736,7 +736,7 @@ $this-&gt;db-&gt;get('tablename');<br />
 <br />
 //Generates:  SELECT `field2` FROM (`tablename`)</code></p>
 
-<p class="important"> <strong>Note:</strong> The following statements can be cached: select, from, join, where, like, groupby, having, orderby, set</p>
+<p class="important"> <strong>Note:</strong> The following statements can be cached: select, from, join, where, like, group_by, having, order_by, set</p>
 <p>&nbsp;</p>
 </div>
 <!-- END CONTENT -->
@@ -750,7 +750,7 @@ Previous Topic:&nbsp;&nbsp;<a href="helpers.html">Query Helper Functions</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="transactions.html">Transactions</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/caching.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -213,7 +213,7 @@ Previous Topic:&nbsp;&nbsp;<a href="call_function.html">Custom Function Calls</a
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="forge.html">Database manipulation with Database Forge</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/call_function.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -97,7 +97,7 @@ Obviously not all function calls are identical between platforms, so there are l
 
 
 
-	
+
 
 </div>
 <!-- END CONTENT -->
@@ -111,7 +111,7 @@ Previous Topic:&nbsp;&nbsp;<a href="fields.html">Field MetaData</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="caching.html">Query Caching</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/configuration.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -78,7 +78,10 @@ $db['default']['db_debug'] = FALSE;<br />
 $db['default']['cache_on'] = FALSE;<br />
 $db['default']['cachedir'] =  &quot;&quot;;<br />
 $db['default']['char_set'] = "utf8";<br />
-$db['default']['dbcollat'] = "utf8_general_ci";</code>
+$db['default']['dbcollat'] = "utf8_general_ci";<br />
+$db['default']['swap_pre'] = "";<br />
+$db['default']['autoinit'] = TRUE;<br />
+$db['default']['stricton'] = FALSE;</code>
 
 <p>The reason we use a multi-dimensional array rather than a more simple one is to permit you to optionally store
 multiple sets of connection values.  If, for example,  you run multiple environments (development, production, test, etc.)
@@ -96,7 +99,10 @@ $db['test']['db_debug'] = FALSE;<br />
 $db['test']['cache_on'] = FALSE;<br />
 $db['test']['cachedir'] =  &quot;&quot;;<br />
 $db['test']['char_set'] = "utf8";<br />
-$db['test']['dbcollat'] = "utf8_general_ci";</code>
+$db['test']['dbcollat'] = "utf8_general_ci";<br />
+$db['test']['swap_pre'] = "";<br />
+$db['test']['autoinit'] = TRUE;<br />
+$db['test']['stricton'] = FALSE;</code>
 
 
 <p>Then, to globally tell the system to use that group you would set this variable located in the config file:</p>
@@ -129,7 +135,10 @@ for the primary connection, but it too can be renamed to something more relevant
 <li><strong>cachedir</strong> - The absolute server path to your database query cache directory.</li>
 <li><strong>char_set</strong> - The character set used in communicating with the database.</li>
 <li><strong>dbcollat</strong> - The character collation used in communicating with the database.</li>
-<li><strong>port</strong> - The database port number.  Currently only used with the Postgres driver. To use this value you have to add a line to the database config array.<code>$db['default']['port'] =  5432;</code></li>
+<li><strong>swap_pre</strong> - A default table prefix that should be swapped with <var>dbprefix</var>.  This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user.</li>
+<li><strong>autoinit</strong> - Whether or not to automatically initialize the database.</li>
+<li><strong>stricton</strong> - TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application.</li>
+<li><strong>port</strong> - The database port number.  To use this value you have to add a line to the database config array.<code>$db['default']['port'] =  5432;</code>
 </ul>
 
 <p class="important"><strong>Note:</strong> Depending on what database platform you are using (MySQL, Postgres, etc.)
@@ -150,7 +159,7 @@ Previous Topic:&nbsp;&nbsp;<a href="examples.html">Quick Start: Usage Examples</
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="connecting.html">Connecting to your Database</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/connecting.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -164,9 +164,11 @@ you can pass the connection values as indicated above).</p>
 
 <code>$this->db->reconnect();</code>
 
+<h2>Manually closing the Connection</h2>
 
-	
+<p>While CodeIgniter intelligently takes care of closing your database connections, you can explicitly close the connection.</p>
 
+<code>$this->db->close();</code>
 </div>
 <!-- END CONTENT -->
 
@@ -179,7 +181,7 @@ Previous Topic:&nbsp;&nbsp;<a href="configuration.html">Database Configuration</
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="queries.html">Queries</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/examples.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -210,7 +210,7 @@ Previous Topic:&nbsp;&nbsp;<a href="index.html">Database Class</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="configuration.html">Database Configuration</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/fields.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -142,7 +142,7 @@ $fields = $query->field_data();
 <li>primary_key - 1 if the column is a primary key</li>
 <li>type - the type of the column</li>
 </ul>
-	
+
 
 </div>
 <!-- END CONTENT -->
@@ -156,7 +156,7 @@ Previous Topic:&nbsp;&nbsp;<a href="table_data.html"> Table Data</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="call_function.html">Custom Function Calls</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/forge.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -205,7 +205,7 @@ $this-&gt;dbforge-&gt;add_column('table_name', $fields);<br />
 <p>Used to remove a column from a table. </p>
 <p><code>$this-&gt;dbforge-&gt;drop_column('table_name', 'column_to_drop');</code></p>
 <h2>$this-&gt;dbforge-&gt;modify_column()</h2>
-<p>The usage of this function is identical to add_column(), except it alters an existing column rather than adding a new one. In order to use it you must add a &quot;name&quot; key into the field defining array.</p>
+<p>The usage of this function is identical to add_column(), except it alters an existing column rather than adding a new one. In order to change the name you can add a &quot;name&quot; key into the field defining array.</p>
 <p><code>$fields = array(<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'old_name' =&gt; array(<br />
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name' =&gt; 'new_name',<br />
@@ -227,7 +227,7 @@ Previous Topic:&nbsp;&nbsp;<a href="caching.html">DB Caching Class</a>
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="utilities.html">Database Utilities Class</a><a href="../libraries/email.html"></a></p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/helpers.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -144,7 +144,7 @@ Previous Topic:&nbsp;&nbsp;<a href="results.html">Query Results</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="active_record.html">Active Record Pattern</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -78,7 +78,7 @@ structures and Active Record patterns. The database functions offer clear, simpl
 		<li><a href="forge.html">Database manipulation with Database Forge</a></li>
 		<li><a href="utilities.html">Database Utilities Class</a></li>
 	</ul>
-	
+
 
 </div>
 <!-- END CONTENT -->
@@ -92,7 +92,7 @@ Previous Topic:&nbsp;&nbsp;<a href="../libraries/config.html">Config Class</a>
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="examples.html">Quick Start: Usage Examples</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>

data/{generators/ci_app/templates/CodeIgniter_1.7.2 → lib/generators/ci/ci_app/templates/CodeIgniterLibs/CodeIgniter_2.0.0}/user_guide/database/queries.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 1.7.2</h1></td>
+<td><h1>CodeIgniter User Guide Version 2.0.0</h1></td>
 <td id="breadcrumb_right"><a href="../toc.html">Table of Contents Page</a></td>
 </tr>
 </table>
@@ -113,7 +113,7 @@ Most of the time you'll use the above function rather than this one. Use the fun
 conditions so that LIKE wildcards ('%', '_') in the string are also properly escaped.
 
 <code>$search = '20% raise';<br />
-$sql = "SELECT id FROM table WHERE column LIKE '%".$this->db->escape_like_str($search)."%'";</code>
+$sql = "SELECT id FROM table WHERE column LIKE '%".$this->db->escape_like_str($search)."%'";</code></li>
 
 </ol>
 
@@ -132,7 +132,7 @@ $this->db->query($sql, array(3, 'live', 'Rick'));
 <p>The question marks in the query are automatically replaced with the values in the array in the second parameter of the query function.</p>
 <p class="important">The secondary benefit of using binds is that the values are automatically escaped, producing safer queries.  You don't have to remember to manually escape data; the engine does it automatically for you.</p>
 
-	
+
 
 </div>
 <!-- END CONTENT -->
@@ -146,7 +146,7 @@ Previous Topic:&nbsp;&nbsp;<a href="connecting.html">Connecting to your Database
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 Next Topic:&nbsp;&nbsp;<a href="results.html">Query Results</a>
 </p>
-<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006-2010 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
+<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
 </div>
 
 </body>