summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2019-09-18 13:21:18 +0200
committerAndrey Andreev <narf@devilix.net>2019-09-18 13:21:18 +0200
commitfdb85f52096460b2488a036cb6145861cc577da1 (patch)
tree67c23f114ac3de73b5ce6624f1bf355334d40c3d
parentdd4c143ef12ccab9dd57991677ced85a4756ce1e (diff)
parentb70ec7bdc280b39fda2ce45a3071b31cf1b81926 (diff)
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
-rw-r--r--user_guide_src/source/libraries/typography.rst2
-rw-r--r--user_guide_src/source/tutorial/create_news_items.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 9e1386835..321b064ba 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -47,7 +47,7 @@ Class Reference
.. php:method:: auto_typography($str[, $reduce_linebreaks = FALSE])
:param string $str: Input string
- :param bool $reduce_linebreaks: Whether to reduce consequitive linebreaks
+ :param bool $reduce_linebreaks: Whether to reduce consecutive linebreaks
:returns: HTML typography-safe string
:rtype: string
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index cde52fde8..b53ef2d68 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -25,7 +25,7 @@ the slug from our title in the model. Create the new view at
<?php echo form_open('news/create'); ?>
<label for="title">Title</label>
- <input type="input" name="title" /><br />
+ <input type="text" name="title" /><br />
<label for="text">Text</label>
<textarea name="text"></textarea><br />