summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.icobin0 -> 1150 bytes
-rw-r--r--user_guide_src/source/helpers/inflector_helper.rst2
-rw-r--r--user_guide_src/source/helpers/typography_helper.rst4
-rw-r--r--user_guide_src/source/helpers/url_helper.rst10
-rw-r--r--user_guide_src/source/tutorial/create_news_items.rst2
5 files changed, 9 insertions, 9 deletions
diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico b/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico
new file mode 100644
index 000000000..c4246f8bf
--- /dev/null
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/images/ci-icon.ico
Binary files differ
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index ed1e2b30f..17dab57bf 100644
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -38,7 +38,7 @@ The following functions are available:
.. php:function:: plural($str)
:param string $str: Input string
- :returns: A plular word
+ :returns: A plural word
:rtype: string
Changes a singular word to plural. Example::
diff --git a/user_guide_src/source/helpers/typography_helper.rst b/user_guide_src/source/helpers/typography_helper.rst
index 7eb4fceec..89730b03d 100644
--- a/user_guide_src/source/helpers/typography_helper.rst
+++ b/user_guide_src/source/helpers/typography_helper.rst
@@ -35,7 +35,7 @@ The following functions are available:
Formats text so that it is semantically and typographically correct
HTML.
- This function is an alias for ``CI_Typography::auto_typography``.
+ This function is an alias for ``CI_Typography::auto_typography()``.
For more info, please see the :doc:`Typography Library
<../libraries/typography>` documentation.
@@ -45,7 +45,7 @@ The following functions are available:
.. note:: Typographic formatting can be processor intensive, particularly if
you have a lot of content being formatted. If you choose to use this
- function you may want to consider `caching <../general/caching>` your
+ function you may want to consider :doc:`caching <../general/caching>` your
pages.
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 64deae240..435a21df4 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -18,11 +18,11 @@ This helper is loaded using the following code::
$this->load->helper('url');
-The following functions are available:
-
Available Functions
===================
+The following functions are available:
+
.. php:function:: site_url([$uri = ''[, $protocol = NULL]])
:param string $uri: URI string
@@ -277,7 +277,7 @@ Available Functions
:param string $str: Input string
:param string $separator: Word separator
- :param string $lowercase: Whether to transform the output string to lower-case
+ :param bool $lowercase: Whether to transform the output string to lower-case
:returns: URL-formatted string
:rtype: string
@@ -360,7 +360,7 @@ Available Functions
is outputted to the browser since it utilizes server headers.
.. note:: For very fine grained control over headers, you should use the
- `Output Library </libraries/output>` ``set_header()`` method.
+ :doc:`Output Library </libraries/output>` ``set_header()`` method.
.. note:: To IIS users: if you hide the `Server` HTTP header, the *auto*
method won't detect IIS, in that case it is advised you explicitly
@@ -370,4 +370,4 @@ Available Functions
will *automatically* be selected when the page is currently accessed
via POST and HTTP/1.1 is used.
- .. important:: This function will terminate script execution. \ No newline at end of file
+ .. important:: This function will terminate script execution.
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index e10eebd3b..cde52fde8 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -76,7 +76,7 @@ validation <../libraries/form_validation>` library to do this.
The code above adds a lot of functionality. The first few lines load the
form helper and the form validation library. After that, rules for the
-form validation are set. The ``set\_rules()`` method takes three arguments;
+form validation are set. The ``set_rules()`` method takes three arguments;
the name of the input field, the name to be used in error messages, and
the rule. In this case the title and text fields are required.