From de5c9d63981f73a65ac7f1ee9983c0a16f185376 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 24 May 2017 08:05:10 +0200 Subject: [PATCH] REL-0.10 Move doc/ folder to docs/ --- README.md | 42 +++++++++--------- {doc => docs}/Configuration.md | 0 {doc => docs}/Emails.md | 0 {doc => docs}/FAQ.md | 0 {doc => docs}/Info.md | 0 {doc => docs}/Intranet.md | 0 {doc => docs}/Logs.md | 0 {doc => docs}/PHP_Projects.md | 0 {doc => docs}/README.md | 0 {doc => docs}/Updating.md | 0 {doc => docs}/Usage.md | 0 {doc => docs}/img/01_intranet_home.png | Bin {doc => docs}/img/02_intranet_vhosts.png | Bin {doc => docs}/img/03_intranet_databases.png | Bin {doc => docs}/img/04_intranet_emails.png | Bin {doc => docs}/img/devilbox-dash-01.png | Bin {doc => docs}/img/devilbox-dash-02.png | Bin {doc => docs}/img/devilbox-dash-03.png | Bin {doc => docs}/img/devilbox-dash.png | Bin .../img/devilbox_01-setup-and-workflow.png | Bin .../img/devilbox_02-email-catch-all.png | Bin {doc => docs}/img/devilbox_player_480.png | Bin 22 files changed, 21 insertions(+), 21 deletions(-) rename {doc => docs}/Configuration.md (100%) rename {doc => docs}/Emails.md (100%) rename {doc => docs}/FAQ.md (100%) rename {doc => docs}/Info.md (100%) rename {doc => docs}/Intranet.md (100%) rename {doc => docs}/Logs.md (100%) rename {doc => docs}/PHP_Projects.md (100%) rename {doc => docs}/README.md (100%) rename {doc => docs}/Updating.md (100%) rename {doc => docs}/Usage.md (100%) rename {doc => docs}/img/01_intranet_home.png (100%) rename {doc => docs}/img/02_intranet_vhosts.png (100%) rename {doc => docs}/img/03_intranet_databases.png (100%) rename {doc => docs}/img/04_intranet_emails.png (100%) rename {doc => docs}/img/devilbox-dash-01.png (100%) rename {doc => docs}/img/devilbox-dash-02.png (100%) rename {doc => docs}/img/devilbox-dash-03.png (100%) rename {doc => docs}/img/devilbox-dash.png (100%) rename {doc => docs}/img/devilbox_01-setup-and-workflow.png (100%) rename {doc => docs}/img/devilbox_02-email-catch-all.png (100%) rename {doc => docs}/img/devilbox_player_480.png (100%) diff --git a/README.md b/README.md index b861e7dc..29b9aade 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [Contributing](#contributing) | [License](#license) -![Devilbox](doc/img/devilbox-dash.png) +![Devilbox](docs/img/devilbox-dash.png) [![Build Status](https://travis-ci.org/cytopia/devilbox.svg?branch=master)](https://travis-ci.org/cytopia/devilbox) ![Tag](https://img.shields.io/github/tag/cytopia/devilbox.svg) [![type](https://img.shields.io/badge/type-Docker-orange.svg)](https://www.docker.com/) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) @@ -52,18 +52,18 @@ The above will start all containers, you can however also just start the contain ```shell $ docker-compose up httpd php mysql redis ``` -![Devilbox](doc/img/devilbox-dash-01.png) +![Devilbox](docs/img/devilbox-dash-01.png) ```shell $ docker-compose up httpd php mysql pgsql redis memcd ``` -![Devilbox](doc/img/devilbox-dash-02.png) +![Devilbox](docs/img/devilbox-dash-02.png) ```shell $ docker-compose up httpd php pgsql memcd ``` -![Devilbox](doc/img/devilbox-dash-03.png) +![Devilbox](docs/img/devilbox-dash-03.png) ### Run different versions @@ -137,25 +137,25 @@ The devilbox has everything setup for you. The only thing you will have to insta ### Video Tutorials -[![Devilbox setup and workflow](doc/img/devilbox_01-setup-and-workflow.png "devilbox - setup and workflow")](https://www.youtube.com/watch?v=reyZMyt2Zzo) -[![Devilbox email catch-all](doc/img/devilbox_02-email-catch-all.png "devilbox - email catch-all")](https://www.youtube.com/watch?v=e-U-C5WhxGY) +[![Devilbox setup and workflow](docs/img/devilbox_01-setup-and-workflow.png "devilbox - setup and workflow")](https://www.youtube.com/watch?v=reyZMyt2Zzo) +[![Devilbox email catch-all](docs/img/devilbox_02-email-catch-all.png "devilbox - email catch-all")](https://www.youtube.com/watch?v=e-U-C5WhxGY) ### Documentation -For setup, usage and examples see detailed **[Documentation](doc/README.md)**. +For setup, usage and examples see detailed **[Documentation](docs/README.md)**. | Documentaion | Description | |---------------------------------------|-------------| -| [Overview](doc/README.md) | General overview | -| [Configuration](doc/Configuration.md) | How to configure the devilbox | -| [Usage](doc/Usage.md) | How to use the devilbox | -| [Updating](doc/Updating.md) | How to update | -| [Info](doc/Info.md) | Technical information | -| [PHP Projects](doc/PHP_Projects.md) | How to manage projects | -| [Emails](doc/Emails.md) | How email catching works | -| [Logs](doc/Logs.md) | How to view log files | -| [Intranet](doc/Intranet.md) | The built-in intranet | -| [FAQ](doc/FAQ.md) | Frequently asked questions | +| [Overview](docs/README.md) | General overview | +| [Configuration](docs/Configuration.md) | How to configure the devilbox | +| [Usage](docs/Usage.md) | How to use the devilbox | +| [Updating](docs/Updating.md) | How to update | +| [Info](docs/Info.md) | Technical information | +| [PHP Projects](docs/PHP_Projects.md) | How to manage projects | +| [Emails](docs/Emails.md) | How email catching works | +| [Logs](docs/Logs.md) | How to view log files | +| [Intranet](docs/Intranet.md) | The built-in intranet | +| [FAQ](docs/FAQ.md) | Frequently asked questions | ## Run-time Matrix @@ -254,7 +254,7 @@ The homepage shows you the status of your current configured setup. * what other settings have been set * did any errors occur? -![Intranet Home](doc/img/01_intranet_home.png "Intranet Home") +![Intranet Home](docs/img/01_intranet_home.png "Intranet Home") ### Virtual Host overview @@ -266,20 +266,20 @@ Virtual Hosts are considered valid if the following requirements are met (on the * `htdocs` folder/symlink exists in your project folder * `/etc/hosts` has a valid DNS config for your host: `127.0.0.1 .` (alternatively the bundle BIND server can be attached to your host-computer). -![Intranet vHost](doc/img/02_intranet_vhosts.png "Intranet Home") +![Intranet vHost](docs/img/02_intranet_vhosts.png "Intranet Home") ### Database overview Shows you all the databases that are loaded -![Intranet DB](doc/img/03_intranet_databases.png "Intranet Home") +![Intranet DB](docs/img/03_intranet_databases.png "Intranet Home") ### Email overview Shows you all the emails that have been sent. No email will actually be sent outside, but they are all catched by one account and presented here. -![Intranet Email](doc/img/04_intranet_emails.png "Intranet Home") +![Intranet Email](docs/img/04_intranet_emails.png "Intranet Home") ## Contributing diff --git a/doc/Configuration.md b/docs/Configuration.md similarity index 100% rename from doc/Configuration.md rename to docs/Configuration.md diff --git a/doc/Emails.md b/docs/Emails.md similarity index 100% rename from doc/Emails.md rename to docs/Emails.md diff --git a/doc/FAQ.md b/docs/FAQ.md similarity index 100% rename from doc/FAQ.md rename to docs/FAQ.md diff --git a/doc/Info.md b/docs/Info.md similarity index 100% rename from doc/Info.md rename to docs/Info.md diff --git a/doc/Intranet.md b/docs/Intranet.md similarity index 100% rename from doc/Intranet.md rename to docs/Intranet.md diff --git a/doc/Logs.md b/docs/Logs.md similarity index 100% rename from doc/Logs.md rename to docs/Logs.md diff --git a/doc/PHP_Projects.md b/docs/PHP_Projects.md similarity index 100% rename from doc/PHP_Projects.md rename to docs/PHP_Projects.md diff --git a/doc/README.md b/docs/README.md similarity index 100% rename from doc/README.md rename to docs/README.md diff --git a/doc/Updating.md b/docs/Updating.md similarity index 100% rename from doc/Updating.md rename to docs/Updating.md diff --git a/doc/Usage.md b/docs/Usage.md similarity index 100% rename from doc/Usage.md rename to docs/Usage.md diff --git a/doc/img/01_intranet_home.png b/docs/img/01_intranet_home.png similarity index 100% rename from doc/img/01_intranet_home.png rename to docs/img/01_intranet_home.png diff --git a/doc/img/02_intranet_vhosts.png b/docs/img/02_intranet_vhosts.png similarity index 100% rename from doc/img/02_intranet_vhosts.png rename to docs/img/02_intranet_vhosts.png diff --git a/doc/img/03_intranet_databases.png b/docs/img/03_intranet_databases.png similarity index 100% rename from doc/img/03_intranet_databases.png rename to docs/img/03_intranet_databases.png diff --git a/doc/img/04_intranet_emails.png b/docs/img/04_intranet_emails.png similarity index 100% rename from doc/img/04_intranet_emails.png rename to docs/img/04_intranet_emails.png diff --git a/doc/img/devilbox-dash-01.png b/docs/img/devilbox-dash-01.png similarity index 100% rename from doc/img/devilbox-dash-01.png rename to docs/img/devilbox-dash-01.png diff --git a/doc/img/devilbox-dash-02.png b/docs/img/devilbox-dash-02.png similarity index 100% rename from doc/img/devilbox-dash-02.png rename to docs/img/devilbox-dash-02.png diff --git a/doc/img/devilbox-dash-03.png b/docs/img/devilbox-dash-03.png similarity index 100% rename from doc/img/devilbox-dash-03.png rename to docs/img/devilbox-dash-03.png diff --git a/doc/img/devilbox-dash.png b/docs/img/devilbox-dash.png similarity index 100% rename from doc/img/devilbox-dash.png rename to docs/img/devilbox-dash.png diff --git a/doc/img/devilbox_01-setup-and-workflow.png b/docs/img/devilbox_01-setup-and-workflow.png similarity index 100% rename from doc/img/devilbox_01-setup-and-workflow.png rename to docs/img/devilbox_01-setup-and-workflow.png diff --git a/doc/img/devilbox_02-email-catch-all.png b/docs/img/devilbox_02-email-catch-all.png similarity index 100% rename from doc/img/devilbox_02-email-catch-all.png rename to docs/img/devilbox_02-email-catch-all.png diff --git a/doc/img/devilbox_player_480.png b/docs/img/devilbox_player_480.png similarity index 100% rename from doc/img/devilbox_player_480.png rename to docs/img/devilbox_player_480.png