summaryrefslogtreecommitdiffstats
path: root/user_guide/general
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide/general')
-rw-r--r--user_guide/general/helpers.html2
-rw-r--r--user_guide/general/managing_apps.html38
-rw-r--r--user_guide/general/profiling.html2
3 files changed, 21 insertions, 21 deletions
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index ef24e8c92..5ba1674ca 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -69,7 +69,7 @@ Each helper function performs one specific task, with no dependence on other fun
<p>CodeIgniter does not load Helper Files by default, so the first step in using
a Helper is to load it. Once loaded, it becomes globally available in your <a href="../general/controllers.html">controller</a> and <a href="../general/views.html">views</a>.</p>
-<p>Helpers are typically stored in your <dfn>system/helpers</dfn>, or <dfn>system/application/helpers </dfn>directory. CodeIgniter will look first in your <dfn>system/application/helpers</dfn>
+<p>Helpers are typically stored in your <dfn>system/helpers</dfn>, or <dfn>application/helpers </dfn>directory. CodeIgniter will look first in your <dfn>application/helpers</dfn>
directory. If the directory does not exist or the specified helper is not located there CI will instead look in your global
<dfn>system/helpers</dfn> folder.</p>
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html
index babed5f64..9f23de4b9 100644
--- a/user_guide/general/managing_apps.html
+++ b/user_guide/general/managing_apps.html
@@ -58,7 +58,7 @@ Managing your Applications
<h1>Managing your Applications</h1>
<p>By default it is assumed that you only intend to use CodeIgniter to manage one application, which you will build in your
-<dfn>system/application/</dfn> directory. It is possible, however, to have multiple sets of applications that share a single
+<dfn>application/</dfn> directory. It is possible, however, to have multiple sets of applications that share a single
CodeIgniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>
<h2>Renaming the Application Folder</h2>
@@ -83,29 +83,29 @@ To do so open your main <kbd>index.php</kbd> and set a <em>full server path</em>
put all of the directories located inside your <kbd>application</kbd> folder into their
own sub-folder.</p>
-<p>For example, let's say you want to create two applications, "foo" and "bar". You will structure your
-application folder like this:</p>
-
-<code>system/application/<var>foo</var>/<br />
-system/application/<var>foo</var>/config/<br />
-system/application/<var>foo</var>/controllers/<br />
-system/application/<var>foo</var>/errors/<br />
-system/application/<var>foo</var>/libraries/<br />
-system/application/<var>foo</var>/models/<br />
-system/application/<var>foo</var>/views/<br />
-system/application/<samp>bar</samp>/<br />
-system/application/<samp>bar</samp>/config/<br />
-system/application/<samp>bar</samp>/controllers/<br />
-system/application/<samp>bar</samp>/errors/<br />
-system/application/<samp>bar</samp>/libraries/<br />
-system/application/<samp>bar</samp>/models/<br />
-system/application/<samp>bar</samp>/views/</code>
+<p>For example, let's say you want to create two applications, "foo" and "bar". You could structure your
+application folders like this:</p>
+
+<code>applications/<var>foo</var>/<br />
+applications/<var>foo</var>/config/<br />
+applications/<var>foo</var>/controllers/<br />
+applications/<var>foo</var>/errors/<br />
+applications/<var>foo</var>/libraries/<br />
+applications/<var>foo</var>/models/<br />
+applications/<var>foo</var>/views/<br />
+applications/<samp>bar</samp>/<br />
+applications/<samp>bar</samp>/config/<br />
+applications/<samp>bar</samp>/controllers/<br />
+applications/<samp>bar</samp>/errors/<br />
+applications/<samp>bar</samp>/libraries/<br />
+applications/<samp>bar</samp>/models/<br />
+applications/<samp>bar</samp>/views/</code>
<p>To select a particular application for use requires that you open your main <kbd>index.php</kbd> file and set the <dfn>$application_folder</dfn>
variable. For example, to select the "foo" application for use you would do this:</p>
-<code>$application_folder = "application/foo";</code>
+<code>$application_folder = "applications/foo";</code>
<p class="important"><strong>Note:</strong>&nbsp; Each of your applications will need its own <dfn>index.php</dfn> file which
calls the desired application. The index.php file can be named anything you want.</p>
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 8622edeb9..f8650314d 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -87,7 +87,7 @@ This information can be useful during development in order to help with debuggin
<h2>Enabling and Disabling Profiler Sections</h2>
- <p>Each section of Profiler data can be enabled or disabled by setting a corresponding config variable to <var>TRUE</var> or <var>FALSE</var>. This can be done one of two ways. First, you can set application wide defaults with the <dfn>system/application/config/profiler.php</dfn> config file.</p>
+ <p>Each section of Profiler data can be enabled or disabled by setting a corresponding config variable to <var>TRUE</var> or <var>FALSE</var>. This can be done one of two ways. First, you can set application wide defaults with the <dfn>application/config/profiler.php</dfn> config file.</p>
<code>$config['config']&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;= FALSE;<br />
$config['queries']&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;= FALSE;<br /></code>