From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Fri, 1 Jul 2011 17:56:50 -0500 Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke the Typography class's string replacements, for instance --- user_guide/installation/index.html | 16 ++++++++-------- user_guide/installation/troubleshooting.html | 4 ++-- user_guide/installation/upgrade_130.html | 8 ++++---- user_guide/installation/upgrade_131.html | 2 +- user_guide/installation/upgrade_132.html | 2 +- user_guide/installation/upgrade_133.html | 8 ++++---- user_guide/installation/upgrade_140.html | 6 +++--- user_guide/installation/upgrade_141.html | 10 +++++----- user_guide/installation/upgrade_150.html | 8 ++++---- user_guide/installation/upgrade_152.html | 2 +- user_guide/installation/upgrade_160.html | 6 +++--- user_guide/installation/upgrade_170.html | 8 ++++---- user_guide/installation/upgrade_200.html | 10 +++++----- user_guide/installation/upgrade_202.html | 2 +- user_guide/installation/upgrade_203.html | 12 ++++++------ user_guide/installation/upgrade_b11.html | 6 +++--- 16 files changed, 55 insertions(+), 55 deletions(-) (limited to 'user_guide/installation') diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html index f62aadb5e..87da5189f 100644 --- a/user_guide/installation/index.html +++ b/user_guide/installation/index.html @@ -61,24 +61,24 @@ Installation Instructions
  1. Unzip the package.
    2. -
  2. Upload the CodeIgniter folders and files to your server. Normally the index.php file will be at your root.
    3. -
  3. Open the application/config/config.php file with a text editor and set your base URL. If you intend to use encryption or sessions, set your encryption key.
    4. +
  4. Upload the CodeIgniter folders and files to your server. Normally the index.php file will be at your root.
    5. +
  5. Open the application/config/config.php file with a text editor and set your base URL. If you intend to use encryption or sessions, set your encryption key.
  6. If you intend to use a database, open the application/config/database.php file with a text editor and set your database settings.

If you wish to increase security by hiding the location of your CodeIgniter files you can rename the system and application folders -to something more private. If you do rename them, you must open your main index.php file and set the $system_folder and $application_folder +to something more private. If you do rename them, you must open your main index.php file and set the $system_folder and $application_folder variables at the top of the file with the new name you've chosen.

-

For the best security, both the system and any application folders should be placed above web root so that they are not directly accessible via a browser. By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.

+

For the best security, both the system and any application folders should be placed above web root so that they are not directly accessible via a browser. By default, .htaccess files are included in each folder to help prevent direct access, but it is best to remove them from public access entirely in case the web server configuration changes or doesn't abide by the .htaccess.

After moving them, open your main index.php file and set the $system_folder and $application_folder variables, preferably with a full path, e.g. '/www/MyUser/system'.

- One additional measure to take in production environments is to disable - PHP error reporting and any other development-only functionality. In CodeIgniter, - this can be done by setting the ENVIRONMENT constant, which is - more fully described on the security page. + One additional measure to take in production environments is to disable + PHP error reporting and any other development-only functionality. In CodeIgniter, + this can be done by setting the ENVIRONMENT constant, which is + more fully described on the security page.

That's it!

diff --git a/user_guide/installation/troubleshooting.html b/user_guide/installation/troubleshooting.html index f99fc0a32..2a50b8dbf 100644 --- a/user_guide/installation/troubleshooting.html +++ b/user_guide/installation/troubleshooting.html @@ -61,8 +61,8 @@ Trouble Shooting does not support the PATH_INFO variable needed to serve search-engine friendly URLs. As a first step, open your application/config/config.php file and look for the URI Protocol -information. It will recommend that you try a couple alternate settings. If it still doesn't work after you've tried this you'll need -to force CodeIgniter to add a question mark to your URLs. To do this open your application/config/config.php file and change this:

+information. It will recommend that you try a couple alternate settings. If it still doesn't work after you've tried this you'll need +to force CodeIgniter to add a question mark to your URLs. To do this open your application/config/config.php file and change this:

$config['index_page'] = "index.php"; diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html index e6bb9480e..f7ffac74e 100644 --- a/user_guide/installation/upgrade_130.html +++ b/user_guide/installation/upgrade_130.html @@ -57,7 +57,7 @@ Upgrading from 1.2 to 1.3

Upgrading from 1.2 to 1.3

-

Note: The instructions on this page assume you are running version 1.2. If you +

Note: The instructions on this page assume you are running version 1.2. If you have not upgraded to that version please do so first.

@@ -72,8 +72,8 @@ with a static one.

Note: If you have any custom developed files in these folders please make copies of them first.