Merge branch 'master' of https://github.com/phundament/app

docs/21-configuration.md

+Configuration
+=============
+
+The config structure is straight forward, there are three config files for an application:
+
+ - `.env` - environment depended configuration
+ - `frontend/config/main.php` - application configuration
+ - `common/config/main.php` -  shared application configuration
+
+> This also applies to `backend` and `console`.
+ 
+See also [Dev/prod parity](http://12factor.net/dev-prod-parity).

docs/51-vagrant.md

@@ -25,7 +25,7 @@ Click **Create** and download VM configuration package and extract its contents
 
 Initialize application for puPHPet:
 
-    cp ./environments/_puphpet/puphpet/files/exec-once/init.sh \
+    cp ./platforms/puphpet/puphpet/files/exec-once/init.sh \
        ./puphpet/files/exec-once/init.sh
 
 To access the virtual host in the VM later, update your `/etc/hosts` file:
@@ -63,15 +63,15 @@ Docker container with vagrant
 
 First time setup:
 
-    cp ./environments/_docker-vagrant/dockerhost-vm/Vagrantfile \
+    cp ./platforms/vagrant-docker/dockerhost-vm/Vagrantfile \
        ~/dockerhost-vm/Vagrantfile
 
-And set environment variable `DOCKER_HOST_VAGRANTFILE`.
+And set your environment variable `DOCKER_HOST_VAGRANTFILE` to `~/dockerhost-vm/Vagrantfile`.
 
 Setup the app:
 
-    cp ./environments/_docker/Dockerfile .
-    cp ./environments/_docker-vagrant/Vagrantfile .
+    cp ./platforms/docker/Dockerfile .
+    cp ./platforms/vagrant-docker/Vagrantfile .
 
 #### Run
 

docs/README.md

@@ -8,6 +8,7 @@ Getting Started
 
 - [About](10-about.md)
 - [Installation](20-installation.md)
+- [Configuration](21-configuration.md)
 
 Customize 
 ---------