summaryrefslogtreecommitdiffstats
path: root/user_guide
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-04-22 00:02:37 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-04-22 00:02:37 +0200
commit866b8138c5f51b0ca544dd8a91c265d9200acab8 (patch)
tree066404f0978996c59d9cc43ce5fa7f54c57b3703 /user_guide
parent6b397a8bf28d2bf01b43ae393f853a853410cd57 (diff)
doc clarifications, example fixes, grammar.
Diffstat (limited to 'user_guide')
-rw-r--r--user_guide/libraries/parser.html10
-rw-r--r--user_guide/libraries/sessions.html2
-rw-r--r--user_guide/libraries/trackback.html2
-rw-r--r--user_guide/libraries/validation.html4
4 files changed, 8 insertions, 10 deletions
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 48af7ecd9..d72891af9 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -86,10 +86,8 @@ PHP from your templates (view files).</p>
since using pure PHP in your view pages lets them run a little faster. However, some developers prefer to use a template engine if
they work with designers who they feel would find some confusion working with PHP.</p>
-<p><strong>Also Note:</strong> The Template Parser Class is <strong>not</strong> not a
-full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.
-
-</p>
+<p><strong>Also Note:</strong> The Template Parser Class is <strong>not</strong> a
+full-blown template parsing solution. We've kept it very lean on purpose in order to maintain maximum performance.</p>
<h2>Initializing the Class</h2>
@@ -104,7 +102,7 @@ full-blown template parsing solution. We've kept it very lean on purpose in orde
<h2>$this->parser->parse()</h2>
-<p>This variable accepts a template name and data array as input, and it generates a parsed version. Example:</p>
+<p>This method accepts a template name and data array as input, and it generates a parsed version. Example:</p>
<code>$this->load->library('parser');<br />
<br />
@@ -173,7 +171,7 @@ $data = array(<br />
$this->parser->parse('blog_template', $data);</code>
<p>If your "pair" data is coming from a database result, which is already a multi-dimensional array, you can simply
-use the database result function:</p>
+use the database result_array() function:</p>
<code>
$query = $this->db->query("SELECT * FROM blog");<br />
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index a3ca58808..69cc6ba59 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -123,7 +123,7 @@ and encrypting the data automatically.</p>
<p>Note: Session cookies are only updated every five minutes by default to reduce processor load. If you repeatedly reload a page
you'll notice that the "last activity" time only updates if five minutes or more has passed since the last time
-the cookie was written. This time is configurable my changing the $config['time_to_update'] line in your system/config/config.php file.</p>
+the cookie was written. This time is configurable by changing the $config['time_to_update'] line in your system/config/config.php file.</p>
<h2>Retrieving Session Data</h2>
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index ecc9c21ee..513cbf2c9 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -200,7 +200,7 @@ $this->trackback->send_success();</code>
<code>http://www.your-site.com/index.php/trackback/receive/<samp>entry_id</samp></code>
-<p>Notice the entry_id is in the third URI, which you can retrieve using:</p>
+<p>Notice the entry_id is in the third URI segment, which you can retrieve using:</p>
<code>$this->uri->segment(3);</code>
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index bf9796feb..06ab665ca 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -319,7 +319,7 @@ $rules['password'] = "<kbd>trim</kbd>|required|matches[passconf]|<kbd>md5</kbd>"
$rules['passconf'] = "<kbd>trim</kbd>|required";<br />
$rules['email'] = "<kbd>trim</kbd>|required|valid_email";</code>
-<p>In the above, we are "trimming" the fields, converting the password to MD5, and running the username through
+<p>In the above example, we are "trimming" the fields, converting the password to MD5, and running the username through
the "xss_clean" function, which removes malicious data.</p>
<p class="important"><strong>Any native PHP function that accepts one parameter can be used as a rule, like <dfn>htmlspecialchars</dfn>,
@@ -446,7 +446,7 @@ error message.</p>
}</textarea>
-<p>Now open your <dfn>myform.php</dfn> view file and update the value in each field so that it has an object corresponding to its name:</p>
+<p>Now open your <dfn>myform.php</dfn> view file and update the value in each field so that it has an attribute corresponding to its name:</p>
<textarea class="textarea" style="width:100%" cols="50" rows="30">