From e7e1dcd452a15abaaa01c03cd1ade564e3a59453 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 21 Oct 2006 18:04:01 +0000 Subject: --- user_guide/database/active_record.html | 2 +- user_guide/database/fields.html | 6 +++--- user_guide/database/queries.html | 2 +- user_guide/general/autoloader.html | 2 +- user_guide/general/errors.html | 2 +- user_guide/general/helpers.html | 2 +- user_guide/general/plugins.html | 4 ++-- user_guide/general/profiling.html | 2 +- user_guide/general/urls.html | 2 +- user_guide/general/views.html | 2 +- user_guide/helpers/array_helper.html | 2 +- user_guide/helpers/date_helper.html | 4 ++-- user_guide/helpers/security_helper.html | 2 +- user_guide/helpers/string_helper.html | 2 +- user_guide/helpers/text_helper.html | 2 +- user_guide/helpers/typography_helper.html | 2 +- user_guide/libraries/config.html | 2 +- user_guide/libraries/email.html | 2 +- user_guide/libraries/encryption.html | 2 +- user_guide/libraries/language.html | 2 +- user_guide/libraries/loader.html | 4 ++-- user_guide/libraries/output.html | 2 +- user_guide/libraries/pagination.html | 2 +- user_guide/libraries/validation.html | 4 ++-- user_guide/libraries/xmlrpc.html | 6 +++--- 25 files changed, 33 insertions(+), 33 deletions(-) (limited to 'user_guide') diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html index 10b018b4d..f30b3d8b6 100644 --- a/user_guide/database/active_record.html +++ b/user_guide/database/active_record.html @@ -221,7 +221,7 @@ $this->db->join('comments', 'comments.id = blogs.id', 'left');<
  • Custom key/value method: -

    You can include an operator in the first parameter in order to to control the comparison:

    +

    You can include an operator in the first parameter in order to control the comparison:

    $this->db->where('name !=', $name);
    $this->db->where('id <', $id); diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html index d70314b5a..1ae1a392b 100644 --- a/user_guide/database/fields.html +++ b/user_guide/database/fields.html @@ -80,7 +80,7 @@ foreach ($fields as $field)
    }     -

    2. You can gather the feild names associated with any query you run by calling the function +

    2. You can gather the field names associated with any query you run by calling the function from your query result object:

    @@ -96,7 +96,7 @@ foreach ($query->list_fields() as $field)

    $this->db->field_exists()

    -

    Sometimes it's helpful to know whether a particular field exists befor performing an action. +

    Sometimes it's helpful to know whether a particular field exists before performing an action. Returns a boolean TRUE/FALSE. Usage example:

    @@ -133,7 +133,7 @@ foreach ($fields as $field)
    }     -

    If you have run a query already you can use the result oject instead of supplying the table name:

    +

    If you have run a query already you can use the result object instead of supplying the table name:

    $query = $this->db->query("YOUR QUERY")
    diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html index 39ad00f12..a13e2d6a5 100644 --- a/user_guide/database/queries.html +++ b/user_guide/database/queries.html @@ -87,7 +87,7 @@ It simply lets you submit a query. Most users will rarely use this function.

    Escaping Queries

    -

    It's a very good security practice to escape your data before sumbiting it into your database. +

    It's a very good security practice to escape your data before submitting it into your database. Code Igniter has two functions that help you do this:

      diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html index a7e907e79..36893e916 100644 --- a/user_guide/general/autoloader.html +++ b/user_guide/general/autoloader.html @@ -92,7 +92,7 @@ type of item.

    diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html index a0042b5cf..089d6d08e 100644 --- a/user_guide/general/helpers.html +++ b/user_guide/general/helpers.html @@ -76,7 +76,7 @@ a Helper is to load it. Once loaded, it becomes globally available in your Helpers are typically stored in your system/helpers directory. Alternately you can create a folder called helpers inside your application folder and store them there. Code Igniter will look first in your system/application/helpers -directory. If the direcotry does not exist or the specified helper is not located there CI will instead look in your global +directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global system/helpers folder.

    diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html index 2e603dd62..78b82318d 100644 --- a/user_guide/general/plugins.html +++ b/user_guide/general/plugins.html @@ -64,12 +64,12 @@ Plugins

    Plugins

    Plugins work almost identically to Helpers. The main difference is that a plugin usually -provides a single function, whereas a Helper is usually a collection of functions. Helpers are also considerd a part of +provides a single function, whereas a Helper is usually a collection of functions. Helpers are also considered a part of the core system; plugins are intended to be created and shared by our community.

    Plugins should be saved to your system/plugins directory or you can create a folder called plugins inside your application folder and store them there. Code Igniter will look first in your system/application/plugins -directory. If the direcotry does not exist or the specified plugin is not located there CI will instead look in your global +directory. If the directory does not exist or the specified plugin is not located there CI will instead look in your global system/plugins folder.

    diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 42cba043e..880aa0c50 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -74,7 +74,7 @@ This information can be useful during development in order to help with debuggin

    Enabling the Profiler

    -

    To enable the profiler place the the following function anywhere within your Controller functions:

    +

    To enable the profiler place the following function anywhere within your Controller functions:

    $this->output->enable_profiler(TRUE);

    When enabled a report will be generated and inserted at the bottom of your pages.

    diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html index e62ac2f2a..b3b842d46 100644 --- a/user_guide/general/urls.html +++ b/user_guide/general/urls.html @@ -112,7 +112,7 @@ by Code Igniter. For example, if a URL is this: www.your-site.com/index.php/products/view/shoes -

    You can optionaally add a suffix, like .html, making the page appear to be of a certain type:

    +

    You can optionally add a suffix, like .html, making the page appear to be of a certain type:

    www.your-site.com/index.php/products/view/shoes.html diff --git a/user_guide/general/views.html b/user_guide/general/views.html index daba7594c..d4ccb5148 100644 --- a/user_guide/general/views.html +++ b/user_guide/general/views.html @@ -173,7 +173,7 @@ class Blog extends Controller {

    Then load the page at the URL you've been using and you should see the variables replaced.

    -

    Note: Youl'll notice that in the example above we are using PHP's alternative syntax. If you +

    Note: You'll notice that in the example above we are using PHP's alternative syntax. If you are not familiar with it you can read about it here.

    Creating Loops

    diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html index 2bd4dc21c..a6044be8f 100644 --- a/user_guide/helpers/array_helper.html +++ b/user_guide/helpers/array_helper.html @@ -76,7 +76,7 @@ Array Helper

    element()

    Lets you fetch an item from an array. The function tests whether the array index is set and whether it has a value. If -a value exists it is returned. If a value does not exist it returns FALSE, or whater you've specified as the default value via the third parameter. Example:

    +a value exists it is returned. If a value does not exist it returns FALSE, or whatever you've specified as the default value via the third parameter. Example:

    $array = array('color' => 'red', 'shape' => 'round', 'size' => '');
    diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html index 6c21ee006..f787176a7 100644 --- a/user_guide/helpers/date_helper.html +++ b/user_guide/helpers/date_helper.html @@ -206,7 +206,7 @@ $unix = human_to_unix($human);     1 Year, 10 Months, 2 Weeks, 5 Days, 10 Hours, 16 Minutes

    The first parameter must contain a Unix timestamp. The second parameter must contain a -timestamp that is greater that the first timesamp. If the second parameter empty, the current time will be used. The most common purpose +timestamp that is greater that the first timestamp. If the second parameter empty, the current time will be used. The most common purpose for this function is to show how much time has elapsed from some point in time in the past to now. Example:

    $post_date = '1079621429';
    @@ -267,7 +267,7 @@ echo timespan($post_date, $now);

    This menu is useful if you run a membership site in which your users are allowed to set their local timezone value.

    -

    The first paramater lets you set the "selected" state of the menu. For example, to set Pacific time as the default you will do this:

    +

    The first parameter lets you set the "selected" state of the menu. For example, to set Pacific time as the default you will do this:

    echo timezone_menu('UM8'); diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html index 516e3c0c2..d45d7c4e1 100644 --- a/user_guide/helpers/security_helper.html +++ b/user_guide/helpers/security_helper.html @@ -76,7 +76,7 @@ Security Helper

    xss_clean()

    -

    Provides Cross Site Script Hack filtering. This function is an alias to the the one in the +

    Provides Cross Site Script Hack filtering. This function is an alias to the one in the Input class. More info can be found there.

    diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html index 55cb1ae42..ca28dc668 100644 --- a/user_guide/helpers/string_helper.html +++ b/user_guide/helpers/string_helper.html @@ -103,7 +103,7 @@ Returns a fixed length 33 character string.
    • }
     -

    You can add as many parameters as you want, and with each each iteration of your loop the next item will be returned.

    +

    You can add as many parameters as you want, and with each iteration of your loop the next item will be returned.

    for ($i = 0; $i < 10; $i++)
    {
    diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html index 27f6c63d8..75190da3c 100644 --- a/user_guide/helpers/text_helper.html +++ b/user_guide/helpers/text_helper.html @@ -110,7 +110,7 @@ $string = char_limiter($string, 20);

    Converts ASCII values to character entities, including high ASCII and MS Word characters that can cause problems when used in a web page, so that they can be shown consistently regardless of browser settings or stored reliably in a database. -There is some dependance on your server's supported character sets, so it may not be 100% reliable in all cases, but for the most +There is some dependence on your server's supported character sets, so it may not be 100% reliable in all cases, but for the most part it should correctly identify characters outside the normal range (like accented characters). Example:

    $string = ascii_to_entities($string); diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html index a95eecc6d..7213b9d8a 100644 --- a/user_guide/helpers/typography_helper.html +++ b/user_guide/helpers/typography_helper.html @@ -82,7 +82,7 @@ the following formatting: