From a5e52c4fa1c67cf5db965d9a82e28262e0882858 Mon Sep 17 00:00:00 2001 From: Larry Ullman Date: Fri, 25 Apr 2014 12:48:11 -0400 Subject: [PATCH] Cleaning Up --- docs/guide/installation.md | 41 ++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/docs/guide/installation.md b/docs/guide/installation.md index a6bf07d146..cd6abb187e 100644 --- a/docs/guide/installation.md +++ b/docs/guide/installation.md @@ -4,41 +4,38 @@ Installation There are two ways you can install the Yii framework: * Via [Composer](http://getcomposer.org/) (recommended) -* Download an application template containing all site requirements, including the Yii framework itself +* By downloading an application template containing all of the site requirements, including the Yii framework itself Installing via Composer ----------------------- The recommended way to install Yii is to use the [Composer](http://getcomposer.org/) package manager. If you do not already -have Composer installed, you may download it from [http://getcomposer.org/](http://getcomposer.org/) or run the following command: +have Composer installed, you may download it from [http://getcomposer.org/](http://getcomposer.org/), or run the following command to download and install it: ``` curl -s http://getcomposer.org/installer | php ``` -We strongly recommend a global composer installation. +(It is strongly recommended to perform a [global Composer installation](https://getcomposer.org/doc/00-intro.md#globally)). -For problems or more information, see the official Composer guide: +For problems with, or more information on, installing Composer, see the official Composer guide: * [Linux](http://getcomposer.org/doc/00-intro.md#installation-nix) * [Windows](http://getcomposer.org/doc/00-intro.md#installation-windows) -With Composer installed, you can create a new Yii site using one of Yii's ready-to-use application templates. -Based on your needs, choosing the right template can help bootstrap your project. +With Composer installed, you can create a new Yii site using one of Yii's ready-to-use application templates. Based on your needs, choosing the right template can help bootstrap your project. -Currently, there are two application templates available: +Currently, there are two Yii application templates available: -- The [Basic Application Template](https://github.com/yiisoft/yii2-app-basic) - just a basic frontend application template. -- The [Advanced Application Template](https://github.com/yiisoft/yii2-app-advanced) - consisting of a frontend, a backend, - console resources, common (shared code), and support for environments. +- [Basic Application Template](https://github.com/yiisoft/yii2-app-basic), a basic frontend application template +- [Advanced Application Template](https://github.com/yiisoft/yii2-app-advanced), consisting of a frontend, a backend, console resources, common (shared code), and support for environments -For installation instructions for these templates, see the above linked pages. -To read more about the ideas behind these application templates and proposed usage, +For template installation instructions, see the above linked pages. +To read more about the ideas behind these application templates and the proposed usage, refer to the [basic application template](apps-basic.md) and [advanced application template](apps-advanced.md) documents. -If you do not want to use a template and want to start from scratch you'll find information in the document about -[creating your own application structure](apps-own.md). This is only recommended for advanced users. +If you do not want to use a template, rather starting from scratch, you'll find information in the [creating your own application structure](apps-own.md) document. This approach is only recommended for advanced users. Installing from zip @@ -49,14 +46,14 @@ Installation from a zip file involves two steps: 1. Downloading an application template from [yiiframework.com](http://www.yiiframework.com/download/). 2. Unpacking the downloaded file. -If you only want the Yii Framework files you can download a ZIP file directly from [github](https://github.com/yiisoft/yii2-framework/releases). +If you only want the Yii Framework files you can download a zip file directly from [github](https://github.com/yiisoft/yii2-framework/releases). To create your application you might want to follow the steps described in [creating your own application structure](apps-own.md). This is only recommended for advanced users. -> Tip: The Yii framework itself does not need to be installed under a web-accessible directory. -A Yii application has one entry script which is usually the only file that absolutely must be +> Tip: The Yii framework itself does not need to be installed under a web-accessible directory (in fact, it should not be). +A Yii application has one entry script, which is usually the only file that absolutely must be exposed to web users (i.e., placed within the web directory). Other PHP scripts, including those -part of the Yii Framework, should be protected from web access to prevent possible exploitation by hackers. +in the Yii Framework, should be protected from web access to prevent possible exploitation by hackers. Requirements @@ -66,18 +63,18 @@ After installing Yii, you may want to verify that your server satisfies Yii's requirements. You can do so by running the requirement checker script in a web browser or from the command line. -If you have installed a Yii application template via zip or composer you'll find a `requirements.php` file in the +If you have installed a Yii application template via the downloaded zip file or Composer, you'll find a `requirements.php` file in the base directory of your application. -In order to run this script on the command line use the following command: +In order to run this script on the command line use the following command (after navigating to the directory where `requirements.php` can be found): ``` php requirements.php ``` -In order to run this script in your browser, you should ensure it is accessable by the webserver and +In order to run this script in your browser, you must make sure it's within a web directory, and then access `http://hostname/path/to/yii-app/requirements.php` in your browser. -If you are using Linux you can create a soft link to make it accessable, using the following command: +If you are using Linux, you can create a soft link to make it accessable, using the following command: ``` ln -s requirements.php ../requirements.php