summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-05-12 11:04:52 +0200
committerAndrey Andreev <narf@devilix.net>2015-05-12 11:04:52 +0200
commitabbd31f466ad5b921e37498f7c6d7069bf3255b3 (patch)
treea1706f669e1897b71453cd72c428bbb843eee829 /user_guide_src
parent5bd7e0188d5a61f3be9a8531531d3103cbb44e66 (diff)
parentc836f2af72536733fa1cc990b46522b9ef16153e (diff)
Merge pull request #3842 from ftwbzhao/feature/lasttime
[ci skip] Minor userguide corrections
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/database/utilities.rst4
-rw-r--r--user_guide_src/source/general/reserved_names.rst1
-rw-r--r--user_guide_src/source/libraries/caching.rst2
-rw-r--r--user_guide_src/source/libraries/config.rst4
-rw-r--r--user_guide_src/source/tutorial/create_news_items.rst4
-rw-r--r--user_guide_src/source/tutorial/news_section.rst10
-rw-r--r--user_guide_src/source/tutorial/static_pages.rst2
7 files changed, 14 insertions, 13 deletions
diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index cc4aeb018..81b949dd7 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -18,7 +18,7 @@ Initializing the Utility Class
Load the Utility Class as follows::
- $this->load->dbutil()
+ $this->load->dbutil();
You can also pass another database object to the DB Utility loader, in case
the database you want to manage isn't the default one::
@@ -35,7 +35,7 @@ assigning it directly to ``$this->dbutil``.
Once initialized you will access the methods using the ``$this->dbutil``
object::
- $this->dbutil->some_method()
+ $this->dbutil->some_method();
****************************
Using the Database Utilities
diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst
index a7b0c3465..5d745cba6 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -75,6 +75,7 @@ Constants
- FOPEN_READ_WRITE_CREATE
- FOPEN_WRITE_CREATE_STRICT
- FOPEN_READ_WRITE_CREATE_STRICT
+- SHOW_DEBUG_BACKTRACE
- EXIT_SUCCESS
- EXIT_ERROR
- EXIT_CONFIG
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 1fc1b5bfb..a7081ec6b 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -66,7 +66,7 @@ Class Reference
hosting environment.
::
- if ($this->cache->apc->is_supported()
+ if ($this->cache->apc->is_supported())
{
if ($data = $this->cache->apc->get('my_cache'))
{
diff --git a/user_guide_src/source/libraries/config.rst b/user_guide_src/source/libraries/config.rst
index 3138e3403..a45cacdf5 100644
--- a/user_guide_src/source/libraries/config.rst
+++ b/user_guide_src/source/libraries/config.rst
@@ -92,9 +92,9 @@ Fetching Config Items
To retrieve an item from your config file, use the following function::
- $this->config->item('item name');
+ $this->config->item('item_name');
-Where item name is the $config array index you want to retrieve. For
+Where item_name is the $config array index you want to retrieve. For
example, to fetch your language choice you'll do this::
$lang = $this->config->item('language');
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 71d2080af..5c5270472 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -18,11 +18,11 @@ application/views/news/create.php.
::
- <h2><?php echo $title ?></h2>
+ <h2><?php echo $title; ?></h2>
<?php echo validation_errors(); ?>
- <?php echo form_open('news/create') ?>
+ <?php echo form_open('news/create'); ?>
<label for="title">Title</label>
<input type="input" name="title" /><br />
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index d8ebac4a3..688f2cb19 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -143,17 +143,17 @@ and add the next piece of code.
::
- <h2><?php echo $title ?></h2>
+ <h2><?php echo $title; ?></h2>
<?php foreach ($news as $news_item): ?>
- <h3><?php echo $news_item['title'] ?></h3>
+ <h3><?php echo $news_item['title']; ?></h3>
<div class="main">
- <?php echo $news_item['text'] ?>
+ <?php echo $news_item['text']; ?>
</div>
- <p><a href="<?php echo $news_item['slug'] ?>">View article</a></p>
+ <p><a href="<?php echo $news_item['slug']; ?>">View article</a></p>
- <?php endforeach ?>
+ <?php endforeach; ?>
Here, each news item is looped and displayed to the user. You can see we
wrote our template in PHP mixed with HTML. If you prefer to use a
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 62b3469ad..e948d3011 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -64,7 +64,7 @@ following code.
</head>
<body>
- <h1><?php echo $title ?></h1>
+ <h1><?php echo $title; ?></h1>
The header contains the basic HTML code that you'll want to display
before loading the main view, together with a heading. It will also