diff options
Diffstat (limited to 'user_guide/database')
| -rw-r--r-- | user_guide/database/active_record.html | 6 | ||||
| -rw-r--r-- | user_guide/database/caching.html | 2 | ||||
| -rw-r--r-- | user_guide/database/call_function.html | 2 | ||||
| -rw-r--r-- | user_guide/database/configuration.html | 4 | ||||
| -rw-r--r-- | user_guide/database/connecting.html | 8 | ||||
| -rw-r--r-- | user_guide/database/examples.html | 2 | ||||
| -rw-r--r-- | user_guide/database/fields.html | 2 | ||||
| -rw-r--r-- | user_guide/database/helpers.html | 2 | ||||
| -rw-r--r-- | user_guide/database/index.html | 2 | ||||
| -rw-r--r-- | user_guide/database/queries.html | 8 | ||||
| -rw-r--r-- | user_guide/database/results.html | 8 | ||||
| -rw-r--r-- | user_guide/database/table_data.html | 2 | ||||
| -rw-r--r-- | user_guide/database/transactions.html | 6 | ||||
| -rw-r--r-- | user_guide/database/utilities.html | 4 |
14 files changed, 27 insertions, 31 deletions
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 5d58f6bd4..573c67408 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -369,7 +369,7 @@ The second parameter lets you set the direction of the result. Options are <kbd <h2>$this->db->limit();</h2>
-<p>Lets you limit the number of rows you would like returned by the query:
+<p>Lets you limit the number of rows you would like returned by the query:</p>
<code>
$this->db->limit(10);<br />
@@ -565,7 +565,7 @@ $this->db->delete('mytable', array('id' => $id)); // WHERE id = $id</code>
<p>The first parameter is the table name, the second is the where clause. You can also use the <dfn>where()</dfn> or <dfn>orwhere()</dfn> functions instead of passing
-the data to the second parameter of the function:
+the data to the second parameter of the function:</p>
<code>
$this->db->where('id', $id);<br />
@@ -603,7 +603,7 @@ Previous Topic: <a href="helpers.html">Query Helper Functions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="transactions.html">Transactions</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html index da1e08edd..2e4d16e47 100644 --- a/user_guide/database/caching.html +++ b/user_guide/database/caching.html @@ -217,7 +217,7 @@ Previous Topic: <a href="call_function.html">Custom Function Calls</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="utilities.html">Database Utilities Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html index 1e80ea54f..b439d4460 100644 --- a/user_guide/database/call_function.html +++ b/user_guide/database/call_function.html @@ -115,7 +115,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="caching.html">Query Caching</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html index b33f2b702..774790c60 100644 --- a/user_guide/database/configuration.html +++ b/user_guide/database/configuration.html @@ -66,7 +66,7 @@ Configuration <h1>Database Configuration</h1>
<p>CodeIgniter has a config file that lets you store your database connection values (username, password, database name, etc.).
-The config file is located at:
+The config file is located at:</p>
<p><kbd>application/config/database.php</kbd></p>
@@ -137,7 +137,7 @@ Previous Topic: <a href="examples.html">Quck Start: Usage Examples</a <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="connecting.html">Connecting to your Database</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html index aebca25be..e44c145e2 100644 --- a/user_guide/database/connecting.html +++ b/user_guide/database/connecting.html @@ -111,9 +111,9 @@ $config['active_r'] = TRUE;<br /> <br />
$this->load->database(<samp>$config</samp>);</code>
-<p>For information on each of these values please see the <a href="configuration.html">configuration page</a>.
+<p>For information on each of these values please see the <a href="configuration.html">configuration page</a>.</p>
-<p>Or you can submit your database values as a Data Source Name. DSNs must have this prototype:
+<p>Or you can submit your database values as a Data Source Name. DSNs must have this prototype:</p>
<code>$dsn = 'dbdriver://username:password@hostname/database';<br />
<br />
@@ -122,8 +122,6 @@ $this->load->database('<samp>$dsn</samp>');</code> <p>Note that if you use a DSN you will not be able to specify some of the default values like you can if you use a connection array.</p>
-
-
<h2>Connecting to Multiple Databases</h2>
<p>If you need to connect to more than one database simultaneously you can do so as follows:</p>
@@ -164,7 +162,7 @@ Previous Topic: <a href="configuration.html">Database Configuration</ <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="queries.html">Queries</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html index 7a8ec92d1..0d8faf3c2 100644 --- a/user_guide/database/examples.html +++ b/user_guide/database/examples.html @@ -214,7 +214,7 @@ Previous Topic: <a href="index.html">Database Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="configuration.html">Database Configuration</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index 8d9d7b5d7..c01caae9b 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -165,7 +165,7 @@ Previous Topic: <a href="table_data.html"> Table Data</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="call_function.html">Custom Function Calls</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html index 4742569d5..e6d0e461c 100644 --- a/user_guide/database/helpers.html +++ b/user_guide/database/helpers.html @@ -148,7 +148,7 @@ Previous Topic: <a href="results.html">Query Results</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="active_record.html">Active Record Pattern</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/index.html b/user_guide/database/index.html index 2a57ebc12..c25233294 100644 --- a/user_guide/database/index.html +++ b/user_guide/database/index.html @@ -95,7 +95,7 @@ Previous Topic: <a href="../libraries/config.html">Config Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="examples.html">Quick Start: Usage Examples</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index e55a5328a..013d64f33 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -95,15 +95,13 @@ CodeIgniter has two functions that help you do this:</p> <li><strong>$this->db->escape()</strong> This function determines the data type so that it
can escape only string data. It also automatically adds single quotes around the data so you don't have to:
-<code>$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";</code>
+<code>$sql = "INSERT INTO table (title) VALUES(".$this->db->escape($title).")";</code></li>
<li><strong>$this->db->escape_str()</strong> This function escapes the data passed to it, regardless of type.
Most of the time you'll use the above function rather then this one. Use the function like this:
-<code>$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";</code>
-
-</li>
+<code>$sql = "INSERT INTO table (title) VALUES('".$this->db->escape_str($title)."')";</code></li>
</ol>
@@ -134,7 +132,7 @@ Previous Topic: <a href="connecting.html">Connecting to your Database <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="results.html">Query Results</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/results.html b/user_guide/database/results.html index 5b25015bf..f6c1be124 100644 --- a/user_guide/database/results.html +++ b/user_guide/database/results.html @@ -134,7 +134,7 @@ Query Results }
</code>
- <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:
+ <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:</p>
<code>$row = $query->row(<dfn>5</dfn>);</code>
@@ -157,7 +157,7 @@ Query Results </code>
- <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:
+ <p>If you want a specific row returned you can submit the row number as a digit in the first parameter:</p>
<code>$row = $query->row_array(<dfn>5</dfn>);</code>
@@ -181,7 +181,7 @@ Query Results </p>
-<br />
+
<h1>Result Helper Functions</h1>
@@ -235,7 +235,7 @@ Previous Topic: <a href="queries.html">Queries</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="helpers.html">Query Helper Functions</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html index 6792e356f..13b96681a 100644 --- a/user_guide/database/table_data.html +++ b/user_guide/database/table_data.html @@ -110,7 +110,7 @@ Previous Topic: <a href="transactions.html"> Transactions</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="fields.html"> Field Metadata</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html index ecc5164d3..75aa4e887 100644 --- a/user_guide/database/transactions.html +++ b/user_guide/database/transactions.html @@ -122,7 +122,7 @@ if (<kbd>$this->db->trans_status()</kbd> === FALSE)<br /> <h2>Enabling Transactions</h2>
<p>Transactions are enabled automatically the moment you use <dfn>$this->db->trans_start()</dfn>. If you would like to disable transactions you
-can do so using <dfn>$this->db->trans_off()</dfn>:
+can do so using <dfn>$this->db->trans_off()</dfn>:</p>
<code>
<kbd>$this->db->trans_off()</kbd><br /><br />
@@ -138,7 +138,7 @@ $this->db->trans_complete(); <h2>Test Mode</h2>
<p>You can optionally put the transaction system into "test mode", which will cause your queries to be rolled back -- even if the queries produce a valid result.
-To use test mode simply set the first parameter in the <dfn>$this->db->trans_start()</dfn> function to <samp>TRUE</samp>:
+To use test mode simply set the first parameter in the <dfn>$this->db->trans_start()</dfn> function to <samp>TRUE</samp>:</p>
<code>
$this->db->trans_start(<samp>TRUE</samp>); // Query will be rolled back<br />
@@ -190,7 +190,7 @@ Previous Topic: <a href="fields.html">Field MetaData</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="table_data.html">Table Metadata</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html index a7601e85f..7de0ea3ed 100644 --- a/user_guide/database/utilities.html +++ b/user_guide/database/utilities.html @@ -205,7 +205,7 @@ echo $this->dbutil->csv_from_result($query); </code>
<p>The second and third parameters allows you to
-set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:
+set the delimiter and newline character. By default tabs are used as the delimiter and "\n" is used as a new line. Example:</p>
<code>
$delimiter = ",";<br />
@@ -330,7 +330,7 @@ Previous Topic: <a href="caching.html">DB Caching Class</a> <a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
Next Topic: <a href="../libraries/email.html"> Email Class</a>
-<p>
+</p>
<p><a href="http://www.codeigniter.com">CodeIgniter</a> · Copyright © 2007 · <a href="http://ellislab.com/">Ellislab, Inc.</a></p>
</div>
|