summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-07-21 10:51:37 +0200
committerGitHub <noreply@github.com>2017-07-21 10:51:37 +0200
commitb7ae9d4cd171e1674022c95100798cc7ada7572a (patch)
tree6fe5c2bc7f1dfb6390afd4283a3ddd57233acffe /user_guide_src/source
parent4aaa9072fc40c9c10bb1501a86505666939deb7d (diff)
parent3b490ef66741ff6e822ac641df52f44c17936d97 (diff)
[ci skip] Merge pull request #5191 from jim-parry/patch/docs
Fix some mistakes in the user guide
Diffstat (limited to 'user_guide_src/source')
-rw-r--r--user_guide_src/source/database/query_builder.rst2
-rw-r--r--user_guide_src/source/general/urls.rst6
-rw-r--r--user_guide_src/source/libraries/input.rst2
-rw-r--r--user_guide_src/source/libraries/loader.rst2
4 files changed, 6 insertions, 6 deletions
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 2d954c7a8..7c1bd4cc0 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -119,7 +119,7 @@ escaping of fields may break them.
::
- $this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
+ $this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid', FALSE);
$query = $this->db->get('mytable');
**$this->db->select_max()**
diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index ca44e2f4c..e23554907 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -42,10 +42,10 @@ By default, the **index.php** file will be included in your URLs::
If your Apache server has *mod_rewrite* enabled, you can easily remove this
file by using a .htaccess file with some simple rules. Here is an example
of such a file, using the "negative" method in which everything is redirected
-except the specified items:
-
-::
+except the specified items::
+.. code-block:: console
+
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/user_guide_src/source/libraries/input.rst b/user_guide_src/source/libraries/input.rst
index 7f762e9f0..b568dae6f 100644
--- a/user_guide_src/source/libraries/input.rst
+++ b/user_guide_src/source/libraries/input.rst
@@ -202,7 +202,7 @@ Class Reference
data::
$this->input->cookie('some_cookie');
- $this->input->cookie('some_cookie, TRUE); // with XSS filter
+ $this->input->cookie('some_cookie', TRUE); // with XSS filter
To return an array of multiple cookie values, pass all the required keys
as an array.
diff --git a/user_guide_src/source/libraries/loader.rst b/user_guide_src/source/libraries/loader.rst
index 228d5e478..22abb4586 100644
--- a/user_guide_src/source/libraries/loader.rst
+++ b/user_guide_src/source/libraries/loader.rst
@@ -125,7 +125,7 @@ Class Reference
$config = array (
'mailtype' => 'html',
- 'charset' => 'utf-8,
+ 'charset' => 'utf-8',
'priority' => '1'
);