diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index 7e8de7c..564dc32 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -67,6 +67,12 @@
syntax for control structures and echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
and eliminate "echo" statements.</p>
+<p class="important"><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might
+be that "short tags" are disabled in your PHP ini file. Code Igniter will optionally rewrite short tags on-the-fly,
+allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your
+<dfn>config/config.php</dfn> file.</p>
+
+
<h2>Alternative Echos</h2>
<p>Normally to echo, or print out a variable you would do this:</p>
@@ -77,8 +83,6 @@
<code><?=$variable?></code>
-<p class="important"><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might
-be that "short tags" are disabled in your PHP ini file.</p>
<h2>Alternative Control Structures</h2>
@@ -129,7 +133,7 @@
<div id="footer">
<p>
-Previous Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Previous Topic: <a href="managing_apps.html">Managing Applications</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index 9a8afd5..88f6c8c 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -110,7 +110,7 @@
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Next Topic: <a href="managing_apps.html">Managing Applications</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 81235ca..9058f03 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -304,7 +304,7 @@
<ul>
<li>Added a <a href="../libraries/calendar.html">Calendaring class</a>.</li>
-<li>Added support for running <a href="multiple_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
+<li>Added support for running <a href="managing_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
<li>Moved the "uri protocol" variable from the index.php file into the config.php file</li>
<li>Fixed a problem that was preventing certain function calls from working within constructors.</li>
<li>Fixed a problem that was preventing the $this->load->library function from working in constructors.</li>
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html
deleted file mode 100644
index 9b5c68d..0000000
--- a/user_guide/general/managing_apps.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-
-<title>Code Igniter User Guide</title>
-
-<style type='text/css' media='all'>@import url('../userguide.css');</style>
-<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
-
-<script type="text/javascript" src="../nav/nav.js"></script>
-<script type="text/javascript" src="../nav/prototype.lite.js"></script>
-<script type="text/javascript" src="../nav/moo.fx.js"></script>
-<script type="text/javascript">
-window.onload = function() {
- myHeight = new fx.Height('nav', {duration: 400});
- myHeight.hide();
-}
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv='expires' content='-1' />
-<meta http-equiv= 'pragma' content='no-cache' />
-<meta name='robots' content='all' />
-<meta name='author' content='Rick Ellis' />
-<meta name='description' content='Code Igniter User Guide' />
-
-</head>
-<body>
-
-<!-- START NAVIGATION -->
-<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div>
-<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle.jpg" width="153" height="44" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div>
-<div id="masthead">
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
-<td id="breadcrumb_right"><a href="../toc.html">Linear Table of Contents</a></td>
-</tr>
-</table>
-</div>
-<!-- END NAVIGATION -->
-
-
-<!-- START BREADCRUMB -->
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td id="breadcrumb">
-<a href="http://www.codeigniter.com/">Code Igniter Home</a> ›
-<a href="../index.html">User Guide Home</a> ›
-Managing your Applications
-</td>
-<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
-</tr>
-</table>
-<!-- END BREADCRUMB -->
-
-<br clear="all" />
-
-
-<!-- START CONTENT -->
-<div id="content">
-
-<h1>Managing your Applications</h1>
-
-<p>By default it is assumed that you only intend to use Code Igniter 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
-Code Igniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>
-
-<h2>Renaming the Application Folder</h2>
-
-<p>If you would like to rename your <dfn>applicaiton</dfn> folder you may do so as long as you open your main <kbd>index.php</kbd>
-file and set its name using the <samp>$application_folder</samp> variable:</p>
-
-<code>$application_folder = "application";</code>
-
-<h2>Relocating your Application Folder</h2>
-
-<p>It is possible to move your <dfn>application</dfn> folder to a different location on your server than your <kbd>system</kbd> folder.
-To do so open your main <kbd>index.php</kbd> and set a <em>full server path</em> in the <samp>$application_folder</samp> variable.</p>
-
-
-<code>$application_folder = "/Path/to/your/application";</code>
-
-
-<h2>Running Multiple Applications with one Code Igniter Installation</h2>
-
-<p>If you would like to share a common Code Igniter installation to manage several different applications simply
-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:
-
-<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>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>
-
-<p class="important"><strong>Note:</strong> 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>
-
-
-
-
-
-</div>
-<!-- END CONTENT -->
-
-
-<div id="footer">
-<p>
-Previous Topic: <a href="caching.html">Web Page Caching</a>
- ·
-<a href="#top">Top of Page</a> ·
-<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a>
-<p>
-
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html
index 029dbf0..0f74f1e 100644
--- a/user_guide/general/profiling.html
+++ b/user_guide/general/profiling.html
@@ -110,7 +110,7 @@
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Next Topic: <a href="managing_apps.html">Managing Applications</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>