diff options
Diffstat (limited to 'user_guide')
| -rw-r--r-- | user_guide/changelog.html | 3 | ||||
| -rw-r--r-- | user_guide/helpers/form_helper.html | 8 | ||||
| -rw-r--r-- | user_guide/helpers/string_helper.html | 4 | ||||
| -rw-r--r-- | user_guide/helpers/url_helper.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/ftp.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/sessions.html | 2 | ||||
| -rw-r--r-- | user_guide/libraries/trackback.html | 4 | ||||
| -rw-r--r-- | user_guide/libraries/xmlrpc.html | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f4acb8d6f..26d41ed9b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,7 +74,8 @@ Change Log <li>Fixed a bug in captcha calling an invalid PHP function</li>
<li>Fixed a bug in _html_entity_decode_callback() when 'global_xss_filtering' is enabled.</li>
<li>Fixed a bug in the cookie helper "set_cookie" function. It was not honoring the config settings.</li>
- <li>Fixed a typo in the DocBlock comment for unset_userdata() in Session.php</p>
+ <li>Fixed an example of comma-separated emails in the email library documentation</li>
+ <li>Fixed a typo in the DocBlock comment for unset_userdata() in Session </li>
</ul>
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html index d9eeb21a6..2613358db 100644 --- a/user_guide/helpers/form_helper.html +++ b/user_guide/helpers/form_helper.html @@ -138,16 +138,16 @@ which is necessary if you would like to use the form to upload files with.</p> <code>$data = array(<br />
'name' => 'John Doe',<br />
- 'email' => 'john@some-site.com',<br />
- 'url' => 'http://www.some-site.com'<br />
+ 'email' => 'john@example.com',<br />
+ 'url' => 'http://www.example.com'<br />
);<br />
<br />
echo form_hidden($data);<br />
<br />
// Would produce:<br /><br />
<input type="hidden" name="name" value="John Doe" /><br />
-<input type="hidden" name="email" value="john@some-site.com" /><br />
-<input type="hidden" name="url" value="http://www.some-site.com" /></code>
+<input type="hidden" name="email" value="john@example.com" /><br />
+<input type="hidden" name="url" value="http://www.example.com" /></code>
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index cf6871709..c20c7b840 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -123,8 +123,8 @@ echo repeater($string, 30);</code> <p>The above would generate 30 newlines.</p>
<h2>reduce_double_slashes()</h2>
<p>Converts double slashes in a string to a single slash, except those found in http://. Example: </p>
-<code>$string = "http://www.some-site.com//index.php";<br />
-echo reduce_double_slashes($string); // results in "http://www.some-site.com/index.php"</code>
+<code>$string = "http://www.example.com//index.php";<br />
+echo reduce_double_slashes($string); // results in "http://www.example.com/index.php"</code>
<h2>trim_slashes()</h2>
<p>Removes any leading/trailing slashes from a string. Example:<br />
<br />
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html index 0f6075585..08e6f7d0c 100644 --- a/user_guide/helpers/url_helper.html +++ b/user_guide/helpers/url_helper.html @@ -224,7 +224,7 @@ $url_title = url_title($title, 'underscore');<br /> <h3>prep_url()</h3>
<p>This function will add <kbd>http://</kbd> in the event it is missing from a URL. Pass the URL string to the function like this:</p>
<code>
-$url = "www.some-site.com";<br /><br />
+$url = "www.example.com";<br /><br />
$url = prep_url($url);</code>
diff --git a/user_guide/libraries/ftp.html b/user_guide/libraries/ftp.html index aa61ed3dc..84518f9a2 100644 --- a/user_guide/libraries/ftp.html +++ b/user_guide/libraries/ftp.html @@ -169,7 +169,7 @@ array in that file. Then save the file at <var>config/ftp.php</var> and it will <ul>
-<li><strong>hostname</strong> - the FTP hostname. Usually something like: <dfn>ftp.some-site.com</dfn></li>
+<li><strong>hostname</strong> - the FTP hostname. Usually something like: <dfn>ftp.example.com</dfn></li>
<li><strong>username</strong> - the FTP username.</li>
<li><strong>password</strong> - the FTP password.</li>
<li><strong>port</strong> - The port number. Set to <dfn>21</dfn> by default.</li>
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 66b258b41..0a50b433e 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -163,7 +163,7 @@ having to run a database query when you need it.</p> <p><code>$newdata = array(<br />
'username' => 'johndoe',<br />
- 'email' => 'johndoe@some-site.com',<br />
+ 'email' => 'johndoe@example.com',<br />
'logged_in' => TRUE<br />
);<br />
<br />
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html index c5a50f0cc..02eeaa9cc 100644 --- a/user_guide/libraries/trackback.html +++ b/user_guide/libraries/trackback.html @@ -83,8 +83,8 @@ Trackback Class <code>$this->load->library('trackback');<br />
<br />
$tb_data = array(<br />
- 'ping_url' => 'http://some-site.com/trackback/456',<br />
- 'url' => 'http://www.my-site.com/blog/entry/123',<br />
+ 'ping_url' => 'http://example.com/trackback/456',<br />
+ 'url' => 'http://www.my-example.com/blog/entry/123',<br />
'title' => 'The Title of My Entry',<br />
'excerpt' => 'The entry content.',<br />
'blog_name' => 'My Blog Name',<br />
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html index 243065653..eb1904e16 100644 --- a/user_guide/libraries/xmlrpc.html +++ b/user_guide/libraries/xmlrpc.html @@ -151,7 +151,7 @@ you will have to include the data type in the request array.</p> <p>Here is an example of a simple array with three parameters:</p>
-<code>$request = array('John', 'Doe', 'www.some-site.com');<br />
+<code>$request = array('John', 'Doe', 'www.example.com');<br />
$this->xmlrpc->request($request);</code>
<p>If you use data types other than strings, or if you have several different data types, you will place
|