20 files changed, 48 insertions, 27 deletions

diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
index 8c1dc2c44..825b9dedf 100644
--- a/user_guide/libraries/benchmark.html
+++ b/user_guide/libraries/benchmark.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index c1db8d8af..cd3e66441 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index a6bab65ba..79921e8cc 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index 43b19992b..20597c9e9 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index a8c047535..9be32cf4f 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

@@ -47,7 +47,7 @@ window.onload = function() {
 <td id="breadcrumb">

 <a href="http://www.codeigniter.com/">Code Igniter Home</a> &nbsp;&#8250;&nbsp;

 <a href="../index.html">User Guide Home</a> &nbsp;&#8250;&nbsp;

-Encrypt Class

+Encryption Class

 </td>

 <td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide&nbsp; <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" />&nbsp;<input type="submit" class="submit" name="sa" value="Go" /></form></td>

 </tr>

@@ -61,9 +61,9 @@ Encrypt Class
 <div id="content">

 

 

-<h1>Encrypt Class</h1>

+<h1>Encryption Class</h1>

 

-<p>The Encrypt Class provides two-way data encryption.  It uses a scheme that pre-compiles

+<p>The Encryption Class provides two-way data encryption.  It uses a scheme that pre-compiles

 the message using a randomly hashed bitwise XOR encoding scheme, which is then encrypted using

 the Mcrypt library.  If Mcrypt is not available on your server the encoded message will

 still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. 

@@ -105,7 +105,7 @@ for example, can only hold 4K of information.</p>
 

 <h2>Initializing the Class</h2>

 

-<p>Like most other classes in Code Igniter, the Encrypt class is initialized in your controller using the <dfn>$this->load->library</dfn> function:</p>

+<p>Like most other classes in Code Igniter, the Encryption class is initialized in your controller using the <dfn>$this->load->library</dfn> function:</p>

 

 <code>$this->load->library('encrypt');</code>

 <p>Once loaded, the Encrypt library object will be available using: <dfn>$this->encrypt</dfn></p>

diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 4ff79c94e..9e7795796 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
index 01cf04b23..c33ec20ec 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index 883c691a3..4e5ac3b7f 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

@@ -117,9 +117,9 @@ Note: This function should only be used to deal with data upon submission. It's
 

 

 

-<h2>Using POST or COOKIE Data</h2>

+<h2>Using POST, COOKIE, or SERVER Data</h2>

 

-<p>Code Igniter comes with two helper functions that let you fetch POST or COOKIE items.  The main advantage of using the provided

+<p>Code Igniter comes with three helper functions that let you fetch POST, COOKIE or SERVER items.  The main advantage of using the provided

 functions rather then fetching an item directly ($_POST['something']) is that the functions will check to see if the item is set and

 return false (boolean) if not.  This lets you conveniently use data without having to test whether an item exists first. 

 In other words, normally you might do something like this:

@@ -138,7 +138,13 @@ else<br />
 

 <code>$something = $this->input->post('something');</code>

 

-<p>The two functions are:</p>

+<p>The three functions are:</p>

+

+<ul>

+<li>$this->input->post()</li>

+<li>$this->input->cookie()</li>

+<li>$this->input->server()</li>

+</ul>

 

 <h2>$this->input->post()</h2>

 

@@ -158,6 +164,12 @@ else<br />
 

 <code>$this->input->cookie('some_data', TRUE);</code>

 

+<h2>$this->input->server()</h2>

+

+<p>This function is identical to the above functions, only it fetches server data:</p>

+

+<code>$this->input->server('some_data');</code>

+

 

 

 

diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index ba16d4de1..d26a998b0 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index 3c1df7fc9..b8da7aaf2 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index ad6a53d8f..015e7ea8f 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index 5efe95ba7..d8ac8cd92 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 6c9fc9efd..bf7b13518 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 5aa05c7ff..5a1216f6e 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index f01b3a57b..c2c9e815e 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 5e9cdd233..11a8fc26c 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 3b6b40f93..8d2f2ee31 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index 8c033ee50..383567081 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

@@ -590,6 +590,15 @@ For example, your "username" error will be available at:<br /><dfn>$this->valida
 <td class="td">&nbsp;</td>

 </tr>

 

+<td class="td"><strong>valid_ip</strong></td>

+<td class="td">No</td>

+<td class="td">Returns FALSE if the supplied IP is not valid.</td>

+<td class="td">&nbsp;</td>

+</tr>

+

+

+

+

 </table>

 

 <p><strong>Note:</strong> These rules can also be called as discreet functions. For example:</p>

diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
index 4cad12661..f25e69795 100644
--- a/user_guide/libraries/xmlrpc.html
+++ b/user_guide/libraries/xmlrpc.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>

diff --git a/user_guide/libraries/zip.html b/user_guide/libraries/zip.html
index da3715e84..6171ed1c8 100644
--- a/user_guide/libraries/zip.html
+++ b/user_guide/libraries/zip.html
@@ -33,7 +33,7 @@ window.onload = function() {
 <div id="masthead">

 <table cellpadding="0" cellspacing="0" border="0" style="width:100%">

 <tr>

-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>

+<td><h1>Code Igniter User Guide Version 1.5.0b1</h1></td>

 <td id="breadcrumb_right"><a href="../toc.html">Full Table of Contents</a></td>

 </tr>

 </table>