Reorganized application template docs structure

minkbear · Aug 13, 2013 · dd90898 · dd90898
1 parent d4c8f47
commit dd90898
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 79 deletions.
diff --git a/docs/guide/apps-advanced.md b/docs/guide/apps-advanced.md
@@ -0,0 +1,3 @@
+Advanced application template
+=============================
+
diff --git a/docs/guide/apps-basic.md b/docs/guide/apps-basic.md
@@ -0,0 +1,6 @@
+Basic application template
+==========================
+
+The application has four pages: the homepage, the about page, the contact page and the login page.
+The contact page displays a contact form that users can fill in to submit their inquiries to the webmaster,
+and the login page allows users to be authenticated before accessing privileged contents.
diff --git a/docs/guide/bootstrap.md b/docs/guide/bootstrap.md
diff --git a/docs/guide/index.md b/docs/guide/index.md
@@ -7,9 +7,15 @@ Getting started
 ===============
 
 - [Installation](installation.md)
-- [Bootstrap with Yii](bootstrap.md)
 - [Configuration](configuration.md)
 
+Application templates
+=====================
+
+- [Basic](apps-basic.md)
+- [Advanced](apps-advanced.md)
+- [Creating your own application template](apps-own.md)
+
 Base concepts
 =============
 
@@ -57,13 +63,6 @@ Toolbox
 - [Error Handling](error.md)
 - [Logging](logging.md)
 
-Application templates
-=====================
-
-- [Basic](application-basic.md)
-- [Advanced](application-advanced.md)
-- [Creating your own application template](application-own.md)
-
 More
 ====
 

diff --git a/docs/guide/installation.md b/docs/guide/installation.md
@@ -4,15 +4,24 @@ Installation
 Installing via Composer
 -----------------------
 
-The recommended way of installing Yii is by using Composer package manager.
+The recommended way of installing Yii is by using [Composer](http://getcomposer.org/) package manager. If you do not
+have it, you may download it from [http://getcomposer.org/](http://getcomposer.org/) or run the following command:
+
+```
+curl -s http://getcomposer.org/installer | php
+```
+
+Yii provides a few ready-to-use application templates. Based on your needs, you may choose one of them to bootstrap
+your project.
 
 There are two application templates available:
 
 - [basic](https://github.com/yiisoft/yii2-app-basic) that is just a basic frontend application template.
 - [advanced](https://github.com/yiisoft/yii2-app-advanced) that is a set of frontend, backend, console, common
  (shared code) and environments support.
 
-Please refer to installation instructions on these pages.
+Please refer to installation instructions on these pages. To read more about ideas behing these application templates and
+proposed usage refer to [basic application template](apps-basic.md) and [advanced application template](apps-advanced.md).
 
 Installing from zip
 -------------------
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Advanced application template
		=============================