changed some-site.com to example.com in example code per http://www.rfc-editor.org/rfc/rfc2606.txt

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 />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'name'&nbsp;&nbsp;=> 'John Doe',<br />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'email' => 'john@some-site.com',<br />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'url'&nbsp;&nbsp;&nbsp;=> 'http://www.some-site.com'<br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'email' => 'john@example.com',<br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'url'&nbsp;&nbsp;&nbsp;=> 'http://www.example.com'<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;);<br />

 <br />

 echo form_hidden($data);<br />

 <br />

 // Would produce:<br /><br />

 &lt;input type="hidden" name="name" value="John Doe" /><br />

-&lt;input type="hidden" name="email" value="john@some-site.com" /><br />

-&lt;input type="hidden" name="url" value="http://www.some-site.com" /></code>

+&lt;input type="hidden" name="email" value="john@example.com" /><br />

+&lt;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 = &quot;http://www.some-site.com//index.php&quot;;<br />

-echo reduce_double_slashes($string); // results in &quot;http://www.some-site.com/index.php&quot;</code>

+<code>$string = &quot;http://www.example.com//index.php&quot;;<br />

+echo reduce_double_slashes($string); // results in &quot;http://www.example.com/index.php&quot;</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:&nbsp; <dfn>ftp.some-site.com</dfn></li>

+<li><strong>hostname</strong> - the FTP hostname.  Usually something like:&nbsp; <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 />

     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'username'&nbsp; => 'johndoe',<br />

-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'email'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=> 'johndoe@some-site.com',<br />

+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'email'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=> 'johndoe@example.com',<br />

     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'logged_in' => TRUE<br />

     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;);<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 />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'ping_url'&nbsp;&nbsp;=> 'http://some-site.com/trackback/456',<br />

-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'url'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=> 'http://www.my-site.com/blog/entry/123',<br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'ping_url'&nbsp;&nbsp;=> 'http://example.com/trackback/456',<br />

+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'url'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=> 'http://www.my-example.com/blog/entry/123',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'title'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=> 'The Title of My Entry',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'excerpt'&nbsp;&nbsp;&nbsp;=> 'The entry content.',<br />

 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'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