summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-09-11 12:55:17 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-09-11 12:55:17 +0200
commitca731d1db0df869c0a8629fd1518eeadac45fd5d (patch)
tree25efe81af14fb2f0fd5709c3e9833dad22d52199
parentdd3b41544b2ac5dbac7f8240fa1ebb957fd43534 (diff)
parent61bb5012ba51ebbe5af11ef9d21741474f9f970d (diff)
Merge pull request #426 from appleboy/guide
Update user guide
-rw-r--r--user_guide/database/active_record.html6
-rw-r--r--user_guide/general/cli.html4
-rw-r--r--user_guide/helpers/string_helper.html8
-rw-r--r--user_guide/installation/upgrade_201.html4
-rw-r--r--user_guide/libraries/output.html14
-rw-r--r--user_guide/libraries/user_agent.html4
6 files changed, 20 insertions, 20 deletions
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index 0f09e78c3..10259a4af 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -530,7 +530,7 @@ $this->db->insert('mytable', $object);
<strong>array</strong> or an <strong>object</strong> to the function. Here is an example using an array:</p>
<code>
-$data = array(<br/>
+$data = array(<br />
&nbsp;&nbsp;&nbsp;array(<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title' => 'My title' ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name' => 'My Name' ,<br />
@@ -540,7 +540,7 @@ $data = array(<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title' => 'Another title' ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name' => 'Another Name' ,<br />
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'date' => 'Another date'<br />
-&nbsp;&nbsp;&nbsp;)<br/>
+&nbsp;&nbsp;&nbsp;)<br />
);<br />
<br />
$this->db->update_batch('mytable', $data);
@@ -783,4 +783,4 @@ Next Topic:&nbsp;&nbsp;<a href="transactions.html">Transactions</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/user_guide/general/cli.html b/user_guide/general/cli.html
index 222a77c9d..4e9bf8709 100644
--- a/user_guide/general/cli.html
+++ b/user_guide/general/cli.html
@@ -114,7 +114,7 @@ class Tools extends CI_Controller {
<p>Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.</p>
<blockquote>
- $ cd /path/to/project;<br/>
+ $ cd /path/to/project;<br />
$ php index.php tools message
</blockquote>
@@ -147,4 +147,4 @@ Next Topic:&nbsp;&nbsp;<a href="reserved_names.html">Reserved Names</a></p>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 314124037..ebdbd3ab2 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -96,9 +96,9 @@ String Helper
<p>Usage example:</p>
-<code>echo increment_string('file', '_'); // "file_1"<br/>
-echo increment_string('file', '-', 2); // "file-2"<br/>
-echo increment_string('file-4'); // "file-5"<br/></code>
+<code>echo increment_string('file', '_'); // "file_1"<br />
+echo increment_string('file', '-', 2); // "file-2"<br />
+echo increment_string('file-4'); // "file-5"<br /></code>
<h2>alternator()</h2>
@@ -186,4 +186,4 @@ Next Topic:&nbsp;&nbsp;<a href="text_helper.html">Text Helper</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/user_guide/installation/upgrade_201.html b/user_guide/installation/upgrade_201.html
index 036ef7c05..7ae29b824 100644
--- a/user_guide/installation/upgrade_201.html
+++ b/user_guide/installation/upgrade_201.html
@@ -83,7 +83,7 @@ Upgrading from 2.0.0 to 2.0.1
<p>to use either a / or <kbd>base_url()</kbd>:</p>
-<code>echo form_open('/'); //&lt;form action="http://example.com/index.php/" method="post" accept-charset="utf-8"><br/>
+<code>echo form_open('/'); //&lt;form action="http://example.com/index.php/" method="post" accept-charset="utf-8"><br />
echo form_open(base_url()); //&lt;form action="http://example.com/" method="post" accept-charset="utf-8"></code>
</div>
@@ -102,4 +102,4 @@ Next Topic:&nbsp;&nbsp;<a href="troubleshooting.html">Troubleshooting</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 7361d7961..64ba482ce 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -82,12 +82,12 @@ For example, if you build a page in one of your controller functions, don't set
<p>Permits you to set the mime-type of your page so you can serve JSON data, JPEG's, XML, etc easily.</p>
-<code>$this->output<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('application/json')<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_output(json_encode(array('foo' => 'bar')));<br/>
-<br/>
-$this->output<br/>
-&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br/>
+<code>$this->output<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('application/json')<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_output(json_encode(array('foo' => 'bar')));<br />
+<br />
+$this->output<br />
+&nbsp;&nbsp;&nbsp;&nbsp;->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php<br />
&nbsp;&nbsp;&nbsp;&nbsp;->set_output(file_get_contents('files/something.jpg'));</code>
<p><strong>Important:</strong> Make sure any non-mime string you pass to this method exists in config/mimes.php or it will have no effect.</p>
@@ -174,4 +174,4 @@ Next Topic:&nbsp;&nbsp;<a href="pagination.html">Pagination Class</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/user_guide/libraries/user_agent.html b/user_guide/libraries/user_agent.html
index e1d3640d3..d6641c883 100644
--- a/user_guide/libraries/user_agent.html
+++ b/user_guide/libraries/user_agent.html
@@ -133,7 +133,7 @@ You can find this list in <dfn>application/config/user_agents.php</dfn> if you w
else if ($this->agent->is_mobile())<br />
{<br />
&nbsp;&nbsp;&nbsp;&nbsp;$this->load->view('mobile/home');<br />
-}<br/>
+}<br />
else<br />
{<br />
&nbsp;&nbsp;&nbsp;&nbsp;$this->load->view('web/home');<br />
@@ -223,4 +223,4 @@ Next Topic:&nbsp;&nbsp;<a href="xmlrpc.html">XML-RPC Class</a>
</div>
</body>
-</html> \ No newline at end of file
+</html>