From 61bb5012ba51ebbe5af11ef9d21741474f9f970d Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 11 Sep 2011 14:35:52 +0800 Subject: update user guide for replacing 'br/' with 'br /' --- user_guide/database/active_record.html | 6 +++--- user_guide/general/cli.html | 4 ++-- user_guide/helpers/string_helper.html | 8 ++++---- user_guide/installation/upgrade_201.html | 4 ++-- user_guide/libraries/output.html | 14 +++++++------- user_guide/libraries/user_agent.html | 4 ++-- 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); array or an object to the function. Here is an example using an array:

-$data = array(
+$data = array(
   array(
      'title' => 'My title' ,
      'name' => 'My Name' ,
@@ -540,7 +540,7 @@ $data = array(
      'title' => 'Another title' ,
      'name' => 'Another Name' ,
      'date' => 'Another date'
-   )
+   )
);

$this->db->update_batch('mytable', $data); @@ -783,4 +783,4 @@ Next Topic:  Transactions - \ No newline at end of file + 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 {

Instead, we are going to open Terminal in Mac/Lunix or go to Run > "cmd" in Windows and navigate to our CodeIgniter project.

- $ cd /path/to/project;
+ $ cd /path/to/project;
$ php index.php tools message
@@ -147,4 +147,4 @@ Next Topic:  Reserved Names

- \ No newline at end of file + 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

Usage example:

-echo increment_string('file', '_'); // "file_1"
-echo increment_string('file', '-', 2); // "file-2"
-echo increment_string('file-4'); // "file-5"
 +echo increment_string('file', '_'); // "file_1"
+echo increment_string('file', '-', 2); // "file-2"
+echo increment_string('file-4'); // "file-5"

alternator()

@@ -186,4 +186,4 @@ Next Topic:  Text Helper - \ No newline at end of file + 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

to use either a / or base_url():

-echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8">
+echo form_open('/'); //<form action="http://example.com/index.php/" method="post" accept-charset="utf-8">
echo form_open(base_url()); //<form action="http://example.com/" method="post" accept-charset="utf-8"> @@ -102,4 +102,4 @@ Next Topic:  Troubleshooting - \ No newline at end of file + 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

Permits you to set the mime-type of your page so you can serve JSON data, JPEG's, XML, etc easily.

-$this->output
-    ->set_content_type('application/json')
-    ->set_output(json_encode(array('foo' => 'bar')));
-
-$this->output
-    ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php
+$this->output
+    ->set_content_type('application/json')
+    ->set_output(json_encode(array('foo' => 'bar')));
+
+$this->output
+    ->set_content_type('jpeg') // You could also use ".jpeg" which will have the full stop removed before looking in config/mimes.php
    ->set_output(file_get_contents('files/something.jpg'));

Important: Make sure any non-mime string you pass to this method exists in config/mimes.php or it will have no effect.

@@ -174,4 +174,4 @@ Next Topic:  Pagination Class - \ No newline at end of file + 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 application/config/user_agents.php if you w else if ($this->agent->is_mobile())
{
    $this->load->view('mobile/home');
-}
+}
else
{
    $this->load->view('web/home');
@@ -223,4 +223,4 @@ Next Topic:  XML-RPC Class - \ No newline at end of file + -- cgit v1.2.3-24-g4f1b