diff options
| author | Master Yoda <jim_parry@bcit.ca> | 2017-07-20 13:58:16 +0200 |
|---|---|---|
| committer | Master Yoda <jim_parry@bcit.ca> | 2017-07-20 13:58:16 +0200 |
| commit | 30f15f9317b5df49ebe880a423a317b045a495eb (patch) | |
| tree | 50c2c9027a25734eb0b2ab43127a397ae9762fe4 /user_guide_src | |
| parent | f107a186f0ddd5695c142c3202106bea4cd4b226 (diff) | |
Fix some mistakes in the user guide
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/database/query_builder.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/urls.rst | 8 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/input.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/loader.rst | 2 |
4 files changed, 6 insertions, 8 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..b2b90ba39 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -42,13 +42,11 @@ 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:: RewriteEngine On - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} -f [OR] + RewriteCond %{REQUEST_FILENAME} -d [OR] RewriteRule ^(.*)$ index.php/$1 [L] In the above example, any HTTP request other than those for existing 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' ); |