From 528591deb8f3a1b9663b43c66d75ba1a4059e8fe Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 9 Jan 2014 10:04:43 -0600 Subject: fix doc warnings --- user_guide_src/source/changelog.rst | 4 ++-- user_guide_src/source/general/common_functions.rst | 6 +++--- user_guide_src/source/libraries/calendar.rst | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b49ce20ba..e83598cb4 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -639,7 +639,7 @@ Bug fixes for 3.0 - Fixed a bug (#2380) - :doc:`URI Routing ` method ``fetch_method()`` returned 'index' if the requested method name matches its controller name. - Fixed a bug (#2388) - :doc:`Email Library ` used to ignore attachment errors, resulting in broken emails being sent. - Fixed a bug (#2498) - :doc:`Form Validation Library ` rule **valid_base64** only checked characters instead of actual validity. -- Fixed a bug (#2425) - OCI8 :doc:`database ` driver's method ``stored_procedure()`` didn't log an error unless **db_debug** was set to TRUE. +- Fixed a bug (#2425) - OCI8 :doc:`database ` driver's method ``stored_procedure()`` didn't log an error unless **db_debug** was set to TRUE. - Fixed a bug (#2490) - :doc:`Database Class ` method ``query()`` returning boolean instead of a result object when the PostgreSQL-specific *RETURNING* clause is used. - Fixed a bug (#249) - :doc:`Cache Library ` didn't properly handle Memcache(d) configurations with missing options. - Fixed a bug (#180) - :php:func:`config_item()` didn't take into account run-time configuration changes. @@ -656,7 +656,7 @@ Bug fixes for 3.0 - Fixed a bug (#2515) - ``_exception_handler()`` used to send the 200 "OK" HTTP status code and didn't stop script exection even on fatal errors. - Fixed a bug - Redis :doc:`Caching ` driver didn't handle connection failures properly. - Fixed a bug (#2756) - :doc:`Database Class ` executed the MySQL-specific `SET SESSION sql_mode` query for all drivers when the 'stricton' option is set. -- Fixed a bug (#2579) - :doc:`Query Builder `s "no escape" functionality didn't work properly with query cache. +- Fixed a bug (#2579) - :doc:`Query Builder ` "no escape" functionality didn't work properly with query cache. - Fixed a bug (#2237) - :doc:`Parser Library ` failed if the same tag pair is used more than once within a template. - Fixed a bug (#2268) - :doc:`Security Library ` didn't properly match JavaScript events. - Fixed a bug (#2143) - :doc:`Form Validation Library ` didn't check for rule groups named in a *controller/method* manner when trying to load from a config file. diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 2dfec9cc0..e9259795f 100644 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -71,7 +71,7 @@ documentation for more information. show_error() ============ -.. php:function:: show_error($message, $status_code, $heading = 'An Error Was Encountered') +.. php:function:: show_error($message, $status_code, $heading = 'An Error Was Encountered') :noindex: :param mixed $message: Error message :param int $status_code: HTTP Response status code @@ -84,7 +84,7 @@ please see the :doc:`Error Handling ` documentation. show_404() ========== -.. php:function:: show_404($page = '', $log_error = TRUE) +.. php:function:: show_404($page = '', $log_error = TRUE) :noindex: :param string $page: URI string :param bool $log_error: Whether to log the error @@ -96,7 +96,7 @@ please see the :doc:`Error Handling ` documentation. log_message() ============= -.. php:function:: log_message($level, $message) +.. php:function:: log_message($level, $message) :noindex: :param string $level: Log level: 'error', 'debug' or 'info' :param string $message: Message to log diff --git a/user_guide_src/source/libraries/calendar.rst b/user_guide_src/source/libraries/calendar.rst index e24ee80b8..ed2a14c8c 100644 --- a/user_guide_src/source/libraries/calendar.rst +++ b/user_guide_src/source/libraries/calendar.rst @@ -90,18 +90,18 @@ preferences below. Preference Default Options Description ====================== ================= =============================================== =================================================================== **template** None None A string containing your calendar template. - See the template section below. + See the template section below. **local_time** time() None A Unix timestamp corresponding to the current time. **start_day** sunday Any week day (sunday, monday, tuesday, etc.) Sets the day of the week the calendar should start on. **month_type** long long, short Determines what version of the month name to use in the header. - long = January, short = Jan. + long = January, short = Jan. **day_type** abr long, short, abr Determines what version of the weekday names to use in - the column headers. long = Sunday, short = Sun, abr = Su. + the column headers. long = Sunday, short = Sun, abr = Su. **show_next_prev** FALSE TRUE/FALSE (boolean) Determines whether to display links allowing you to toggle - to next/previous months. See information on this feature below. + to next/previous months. See information on this feature below. **next_prev_url** controller/method A URL Sets the basepath used in the next/previous calendar links. **show_other_days** FALSE TRUE/FALSE (boolean) Determines whether to display days of other months that share the - first or last week of the calendar month. + first or last week of the calendar month. ====================== ================= =============================================== =================================================================== -- cgit v1.2.3-24-g4f1b From 05be0879777021a73ca55548c6edd61d17012a4d Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 9 Jan 2014 10:10:30 -0600 Subject: d'oh - :noindex: in wrong place Signed-off-by: Connor Tumbleson --- user_guide_src/source/general/common_functions.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index e9259795f..a1007cb4b 100644 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -71,7 +71,7 @@ documentation for more information. show_error() ============ -.. php:function:: show_error($message, $status_code, $heading = 'An Error Was Encountered') :noindex: +.. :noindex: php:function:: show_error($message, $status_code, $heading = 'An Error Was Encountered') :param mixed $message: Error message :param int $status_code: HTTP Response status code @@ -84,7 +84,7 @@ please see the :doc:`Error Handling ` documentation. show_404() ========== -.. php:function:: show_404($page = '', $log_error = TRUE) :noindex: +.. :noindex: php:function:: show_404($page = '', $log_error = TRUE) :param string $page: URI string :param bool $log_error: Whether to log the error @@ -96,7 +96,7 @@ please see the :doc:`Error Handling ` documentation. log_message() ============= -.. php:function:: log_message($level, $message) :noindex: +.. :noindex: php:function:: log_message($level, $message) :param string $level: Log level: 'error', 'debug' or 'info' :param string $message: Message to log -- cgit v1.2.3-24-g4f1b