diff options
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/controllers.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/hooks.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/helpers/text_helper.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/helpers/xml_helper.rst | 34 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/cart.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/image_lib.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/typography.rst | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index cd1998b9a..825e0f845 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2252,7 +2252,7 @@ Bug fixes for Version 1.6.0 - Fixed a bug (#3003) in the Encryption Library to support modes other than MCRYPT_MODE_ECB - Fixed a bug (#3015) in the :doc:`User Agent - library <./libraries/user_agent>` where more then 2 languages + library <./libraries/user_agent>` where more than 2 languages where not reported with languages(). - Fixed a bug (#3017) in the :doc:`Email <./libraries/email>` library where some timezones were calculated incorrectly. diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst index d8ef824fb..bc8319dd8 100644 --- a/user_guide_src/source/general/controllers.rst +++ b/user_guide_src/source/general/controllers.rst @@ -107,7 +107,7 @@ You should see your new message. Passing URI Segments to your methods ==================================== -If your URI contains more then two segments they will be passed to your +If your URI contains more than two segments they will be passed to your method as parameters. For example, let's say you have a URI like this:: diff --git a/user_guide_src/source/general/hooks.rst b/user_guide_src/source/general/hooks.rst index fc5da5b80..1046c48ae 100644 --- a/user_guide_src/source/general/hooks.rst +++ b/user_guide_src/source/general/hooks.rst @@ -59,7 +59,7 @@ defined in your associative hook array: Multiple Calls to the Same Hook =============================== -If want to use the same hook point with more then one script, simply +If want to use the same hook point with more than one script, simply make your array declaration multi-dimensional, like this:: $hook['pre_controller'][] = array( diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst index 3c6430f3f..788fe8b0c 100644 --- a/user_guide_src/source/helpers/text_helper.rst +++ b/user_guide_src/source/helpers/text_helper.rst @@ -50,7 +50,7 @@ The following functions are available: Truncates a string to the number of *characters* specified. It maintains the integrity of words so the character count may be slightly - more or less then what you specify. + more or less than what you specify. Example:: diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst index 6d26c581e..7d155e192 100644 --- a/user_guide_src/source/helpers/xml_helper.rst +++ b/user_guide_src/source/helpers/xml_helper.rst @@ -28,27 +28,27 @@ The following functions are available: .. function:: xml_convert($str[, $protect_all = FALSE]) - :param string $str: the text string to convert - :param bool $protect_all: Whether to protect all content that looks like a potential entity instead of just numbered entities, e.g. &foo; - :returns: string + :param string $str: the text string to convert + :param bool $protect_all: Whether to protect all content that looks like a potential entity instead of just numbered entities, e.g. &foo; + :returns: string - Takes a string as input and converts the following reserved XML - characters to entities: + Takes a string as input and converts the following reserved XML + characters to entities: - - Ampersands: & - - Less then and greater than characters: < > - - Single and double quotes: ' " - - Dashes: - + - Ampersands: & + - Less than and greater than characters: < > + - Single and double quotes: ' " + - Dashes: - - This function ignores ampersands if they are part of existing numbered - character entities, e.g. {. Example:: + This function ignores ampersands if they are part of existing numbered + character entities, e.g. {. Example:: - $string = '<p>Here is a paragraph & an entity ({).</p>'; - $string = xml_convert($string); - echo $string; + $string = '<p>Here is a paragraph & an entity ({).</p>'; + $string = xml_convert($string); + echo $string; - outputs: + outputs: - .. code-block:: html + .. code-block:: html - <p>Here is a paragraph & an entity ({).</p> + <p>Here is a paragraph & an entity ({).</p> diff --git a/user_guide_src/source/libraries/cart.rst b/user_guide_src/source/libraries/cart.rst index ad1955d27..0c8c0a601 100644 --- a/user_guide_src/source/libraries/cart.rst +++ b/user_guide_src/source/libraries/cart.rst @@ -245,7 +245,7 @@ the product ID and any options associated with it. In nearly all cases, updating the cart will be something the user does via the "view cart" page, so as a developer, it is unlikely that you -will ever have to concern yourself with the "row ID", other then making +will ever have to concern yourself with the "row ID", other than making sure your "view cart" page contains this information in a hidden form field, and making sure it gets passed to the update function when the update form is submitted. Please examine the construction of the "view diff --git a/user_guide_src/source/libraries/image_lib.rst b/user_guide_src/source/libraries/image_lib.rst index ebdeaa782..cde4e44dc 100644 --- a/user_guide_src/source/libraries/image_lib.rst +++ b/user_guide_src/source/libraries/image_lib.rst @@ -147,7 +147,7 @@ Preference Default Value Options pixels. If the source image size does not allow perfect resizing to those dimensions, this setting determines which axis should be used as the hard value. "auto" sets the axis automatically based on whether the - image is taller then wider, or vice versa. + image is taller than wider, or vice versa. **rotation_angle** None 90, 180, 270, vrt, hor Specifies the angle of rotation when rotating images. Note that PHP X rotates counter-clockwise, so a 90 degree rotation to the right must be specified as 270. diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst index f1a825d3d..c1a864a3e 100644 --- a/user_guide_src/source/libraries/typography.rst +++ b/user_guide_src/source/libraries/typography.rst @@ -66,7 +66,7 @@ Class Reference $string = $this->typography->auto_typography($string); - There is one optional parameter that determines whether the parser should reduce more then two consecutive line breaks down to two. + There is one optional parameter that determines whether the parser should reduce more than two consecutive line breaks down to two. Pass boolean TRUE to enable reducing line breaks:: $string = $this->typography->auto_typography($string, TRUE); |