summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-03-25 16:08:20 +0100
committerDerek Jones <derek.jones@ellislab.com>2010-03-25 16:08:20 +0100
commitf0b3994f51937c643200a0547f70b1fa7d94f88a (patch)
treed30a6636bc413f9dacbccca13a3f1dd8beffa65a /user_guide/libraries
parent022be04a8262857e1bab9bf65e45817d398c31e6 (diff)
moved application folder outside of the system folder
Diffstat (limited to 'user_guide/libraries')
-rw-r--r--user_guide/libraries/javascript.html2
-rw-r--r--user_guide/libraries/jquery.html2
-rw-r--r--user_guide/libraries/language.html2
-rw-r--r--user_guide/libraries/loader.html4
4 files changed, 5 insertions, 5 deletions
diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html
index 08982fd08..ac0af840d 100644
--- a/user_guide/libraries/javascript.html
+++ b/user_guide/libraries/javascript.html
@@ -79,7 +79,7 @@ Input and Security Class
</code></p>
<p>$library_src, is where the actual library file will be loaded, as well as any subsequent plugin script calls; $script_head is where specific events, functions and other commands will be rendered.</p>
<h3>Set the path to the librarys with config items</h3>
-<p>There are some configuration items in javascript library. These can either be set in system/application/config.php, within its own confg/javascript.php file, or within any controller usings the set_item() function. </p>
+<p>There are some configuration items in javascript library. These can either be set in application/config.php, within its own confg/javascript.php file, or within any controller usings the set_item() function. </p>
<p>An image to be used as an &quot;ajax loader&quot;, or progress indicator. Without one, the simple text message of &quot;loading&quot; will appear when Ajax calls need to be made.</p>
<p><code>$config['javascript_location'] = 'http://localhost/codeigniter/themes/js/jquery/');<br />
$config['javascript_ajax_img'] = 'images/ajax-loader.gif';</code></p>
diff --git a/user_guide/libraries/jquery.html b/user_guide/libraries/jquery.html
index 98c9a9cb3..69b8389a0 100644
--- a/user_guide/libraries/jquery.html
+++ b/user_guide/libraries/jquery.html
@@ -81,7 +81,7 @@ Input and Security Class
<p><code>&lt;?php echo $jquery_script;?&gt;<br />
&lt;?php echo $script_head;?&gt;</code></p>
-<p>There are 2 configuration items in jQuery library. These can either be set in system/application/config.php, or within any controller. The first is the path from the root of your site to the jquery library ('js' is the default) and the second is an image to be used as an &quot;ajax loader&quot;, or progress indicator. Without one, the simple text message of &quot;loading&quot; will appear when Ajax calls need to be made.</p>
+<p>There are 2 configuration items in jQuery library. These can either be set in application/config.php, or within any controller. The first is the path from the root of your site to the jquery library ('js' is the default) and the second is an image to be used as an &quot;ajax loader&quot;, or progress indicator. Without one, the simple text message of &quot;loading&quot; will appear when Ajax calls need to be made.</p>
<p><code>$config['javascript_folder'] = 'js';<br />
$config['javascript_ajax_img'] = 'images/ajax-loader.gif';</code></p>
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index 9e50901a0..ee78c765a 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -64,7 +64,7 @@ Language Class
your own language files as needed in order to display error and other messages in other languages.</p>
<p>Language files are typically stored in your <dfn>system/language</dfn> directory. Alternately you can create a folder called <kbd>language</kbd> inside
-your <kbd>application</kbd> folder and store them there. CodeIgniter will look first in your <dfn>system/application/language</dfn>
+your <kbd>application</kbd> folder and store them there. CodeIgniter will look first in your <dfn>application/language</dfn>
directory. If the directory does not exist or the specified language is not located there CI will instead look in your global
<dfn>system/language</dfn> folder.</p>
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index ce693e0b8..98520e77c 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -187,14 +187,14 @@ it will instead return the data as a string.</p>
<h2>Application "Packages"</h2>
-<p>An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the <dfn>system/application/third_party</dfn> folder. Below is a sample map of an package directory</p>
+<p>An application package allows for the easy distribution of complete sets of resources in a single directory, complete with its own libraries, models, helpers, config, and language files. It is recommended that these packages be placed in the <dfn>application/third_party</dfn> folder. Below is a sample map of an package directory</p>
<h2>Sample Package "Foo Bar" Directory Map</h2>
<p>The following is an example of a directory for an application package named "Foo Bar".</p>
-<code>/system/application/third_party/foo_bar<br />
+<code>/application/third_party/foo_bar<br />
<br />
config/<br />
helpers/<br />