Skip to content

Commit

Permalink
Merge pull request #85 from cytopia/release-0.11
Browse files Browse the repository at this point in the history
REL-0.11 Fix ToC indentation
  • Loading branch information
cytopia authored Jun 25, 2017
2 parents fbb169c + fc9038c commit 8fbc86f
Show file tree
Hide file tree
Showing 11 changed files with 196 additions and 196 deletions.
142 changes: 71 additions & 71 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,88 +237,88 @@ The devilbox documentation consists of the following main sections.
#### Documentation

1. **[Overview](docs/README.md)**
1. [Main idea](docs/README.md#1-main-idea)
2. [Features](docs/README.md#2-features)
3. [Supported Host OS](docs/README.md#3-supported-host-os)
4. [Requirements](docs/README.md#4-requirements)
5. [Docker documentation](docs/README.md#5-docker-documentation)
6. [Devilbox documentation](docs/README.md#6-devilbox-documentation)
7. [Video Tutorials](docs/README.md#7-video-tutorials)
8. [Available PHP Modules](docs/README.md#8-available-php-modules)
9. [Supported Frameworks and CMS](docs/README.md#9-supported-frameworks-and-cms)
1. [Main idea](docs/README.md#1-main-idea)
2. [Features](docs/README.md#2-features)
3. [Supported Host OS](docs/README.md#3-supported-host-os)
4. [Requirements](docs/README.md#4-requirements)
5. [Docker documentation](docs/README.md#5-docker-documentation)
6. [Devilbox documentation](docs/README.md#6-devilbox-documentation)
7. [Video Tutorials](docs/README.md#7-video-tutorials)
8. [Available PHP Modules](docs/README.md#8-available-php-modules)
9. [Supported Frameworks and CMS](docs/README.md#9-supported-frameworks-and-cms)
2. **[Quickstart](docs/Quickstart.md)**
1. [Installation](docs/Quickstart.md#1-installation)
2. [Update](docs/Quickstart.md#2-update)
3. [Configuration](docs/Quickstart.md#3-configuration)
4. [Run](docs/Quickstart.md#4-run)
5. [Project setup](docs/Quickstart.md#5-project-setup)
6. [Enter the PHP Docker container](docs/Quickstart.md#6-enter-the-php-docker-container)
1. [Installation](docs/Quickstart.md#1-installation)
2. [Update](docs/Quickstart.md#2-update)
3. [Configuration](docs/Quickstart.md#3-configuration)
4. [Run](docs/Quickstart.md#4-run)
5. [Project setup](docs/Quickstart.md#5-project-setup)
6. [Enter the PHP Docker container](docs/Quickstart.md#6-enter-the-php-docker-container)
3. **[Install](docs/Install.md)**
1. [Install Docker](docs/Install.md#1-install-docker)
1. [Linux](docs/Install.md#1-1-linux)
2. [Windows](docs/Install.md#1-2-windows)
3. [OSX](docs/Install.md#1-3-osx)
2. [Install Devilbox](#2-install-devilbox)
1. [Install Docker](docs/Install.md#1-install-docker)
1. [Linux](docs/Install.md#1-1-linux)
2. [Windows](docs/Install.md#1-2-windows)
3. [OSX](docs/Install.md#1-3-osx)
2. [Install Devilbox](#2-install-devilbox)
4. **[Update](docs/Update.md)**
1. [TL;DR](docs/Update.md#1-tl-dr)
2. [Git tag vs master branch](docs/Update.md#2-git-tag-vs-master-branch)
3. [Compare .env file](docs/Update.md#3-compare-env-file)
4. [Pull new Docker container (Important!)](docs/Update.md#4-pull-new-docker-container-important-)
5. [Remove anonymous volumes](docs/Update.md#5-remove-anonymous-volumes)
1. [TL;DR](docs/Update.md#1-tl-dr)
2. [Git tag vs master branch](docs/Update.md#2-git-tag-vs-master-branch)
3. [Compare .env file](docs/Update.md#3-compare-env-file)
4. [Pull new Docker container (Important!)](docs/Update.md#4-pull-new-docker-container-important-)
5. [Remove anonymous volumes](docs/Update.md#5-remove-anonymous-volumes)
5. **[Configure](docs/Configure.md)**
1. [Overview](docs/Configure.md#1-overview)
2. [Devilbox general settings](docs/Configure.md#2-devilbox-general-settings)
3. [Project settings](docs/Configure.md#3-project-settings)
4. [Container settings](docs/Configure.md#4-container-settings)
5. [Intranet settings](docs/Configure.md#5-intranet-settings)
6. [Host computer](docs/Configure.md#6-host-computer)
1. [Overview](docs/Configure.md#1-overview)
2. [Devilbox general settings](docs/Configure.md#2-devilbox-general-settings)
3. [Project settings](docs/Configure.md#3-project-settings)
4. [Container settings](docs/Configure.md#4-container-settings)
5. [Intranet settings](docs/Configure.md#5-intranet-settings)
6. [Host computer](docs/Configure.md#6-host-computer)
6. **[Run](docs/Run.md)**
1. [Start the devilbox](docs/Run.md#1-start-the-devilbox)
2. [Stop the devilbox](docs/Run.md#2-stop-the-devilbox)
3. [Attach/Detach during run-time](docs/Run.md#3-attach-detach-during-run-time)
4. [Docker logs](docs/Run.md#4-docker-logs)
1. [Start the devilbox](docs/Run.md#1-start-the-devilbox)
2. [Stop the devilbox](docs/Run.md#2-stop-the-devilbox)
3. [Attach/Detach during run-time](docs/Run.md#3-attach-detach-during-run-time)
4. [Docker logs](docs/Run.md#4-docker-logs)
7. **[Usage](docs/Usage.md)**
1. [Mounted directories](docs/Usage.md#1-mounted-directories)
2. [Work on the Docker host](docs/Usage.md#2-work-on-the-docker-host)
3. [Work inside the PHP container](docs/Usage.md#3-work-inside-the-php-container)
4. [Managing Projects explained](docs/Usage.md#4-managing-projects-explained)
5. [Creating new Projects](docs/Usage.md#5-creating-new-projetcs)
6. [Switching container versions](docs/Usage.md#6-switching-container-versions)
7. [Emails](docs/Usage.md#7-emails)
8. [Log files](docs/Usage.md#8-log-files)
9. [Intranet](docs/Usage.md#9-intranet)
1. [Mounted directories](docs/Usage.md#1-mounted-directories)
2. [Work on the Docker host](docs/Usage.md#2-work-on-the-docker-host)
3. [Work inside the PHP container](docs/Usage.md#3-work-inside-the-php-container)
4. [Managing Projects explained](docs/Usage.md#4-managing-projects-explained)
5. [Creating new Projects](docs/Usage.md#5-creating-new-projetcs)
6. [Switching container versions](docs/Usage.md#6-switching-container-versions)
7. [Emails](docs/Usage.md#7-emails)
8. [Log files](docs/Usage.md#8-log-files)
9. [Intranet](docs/Usage.md#9-intranet)
8. **[OS](docs/OS.md)**
1. [Linux](docs/OS.md#1-linux)
2. [Windows](docs/OS.md#2-windows)
3. [OSX](docs/OS.md#3-osx)
1. [Linux](docs/OS.md#1-linux)
2. [Windows](docs/OS.md#2-windows)
3. [OSX](docs/OS.md#3-osx)
9. **[Backups](docs/Backups.md)**
1. [Info](docs/Backups.md#1-info)
2. [MySQL](docs/Backups.md#2-mysql)
1. [MySQL Database Backup](docs/Backups.md#2-1-mysql-database-backup)
2. [MySQL Database Restore](docs/Backups.md#2-2-mysql-database-restore)
3. [PostgreSQL](docs/Backups.md#3-postgresql)
1. [PostgreSQL Database Backup](docs/Backups.md#3-1-postgresql-database-backup)
2. [PostgreSQL Database Restore](docs/Backups.md#3-1-postgresql-database-restore)
4. [MongoDB](docs/Backups.md#4-mongodb)
1. [MongoDB Database Backup](docs/Backups.md#4-1-mongodb-database-backup)
2. [MongoDB Database Restore](docs/Backups.md#4-1-mongodb-database-restore)
1. [Info](docs/Backups.md#1-info)
2. [MySQL](docs/Backups.md#2-mysql)
1. [MySQL Database Backup](docs/Backups.md#2-1-mysql-database-backup)
2. [MySQL Database Restore](docs/Backups.md#2-2-mysql-database-restore)
3. [PostgreSQL](docs/Backups.md#3-postgresql)
1. [PostgreSQL Database Backup](docs/Backups.md#3-1-postgresql-database-backup)
2. [PostgreSQL Database Restore](docs/Backups.md#3-1-postgresql-database-restore)
4. [MongoDB](docs/Backups.md#4-mongodb)
1. [MongoDB Database Backup](docs/Backups.md#4-1-mongodb-database-backup)
2. [MongoDB Database Restore](docs/Backups.md#4-1-mongodb-database-restore)
10. **[Examples](docs/Examples.md)**
1. [Introduction](docs/Examples.md#1-introduction)
2. [Setup CakePHP](docs/Examples.md#2-setup-cakephp)
3. [Setup Drupal](docs/Examples.md#3-setup-drupal)
4. [Setup Phalcon](docs/Examples.md#4-setup-phalcon)
5. [Setup Symfony](docs/Examples.md#5-setup-symfony)
6. [Setup Wordpress](docs/Examples.md#6-setup-wordpress)
7. [Setup Yii](docs/Examples.md#7-setup-yii)
8. [Setup Zend](docs/Examples.md#8-setup-zend)
1. [Introduction](docs/Examples.md#1-introduction)
2. [Setup CakePHP](docs/Examples.md#2-setup-cakephp)
3. [Setup Drupal](docs/Examples.md#3-setup-drupal)
4. [Setup Phalcon](docs/Examples.md#4-setup-phalcon)
5. [Setup Symfony](docs/Examples.md#5-setup-symfony)
6. [Setup Wordpress](docs/Examples.md#6-setup-wordpress)
7. [Setup Yii](docs/Examples.md#7-setup-yii)
8. [Setup Zend](docs/Examples.md#8-setup-zend)
11. **[Technical](docs/Technical.md)**
1. [Networking](docs/Technical.md#1-networking)
2. [Ports and forwarding](docs/Technical.md#2-ports-and-forwarding)
3. [Works the same on Host and PHP Container](docs/Technical.md#3-works-the-same-on-host-and-php-container)
1. [Networking](docs/Technical.md#1-networking)
2. [Ports and forwarding](docs/Technical.md#2-ports-and-forwarding)
3. [Works the same on Host and PHP Container](docs/Technical.md#3-works-the-same-on-host-and-php-container)
12. **[Hacking](docs/Hacking.md)**
1. [Rebuilding bundled Docker container](docs/Hacking.md#1-rebuilding-bundled-docker-container)
2. [Customizing the bundled Docker container](docs/Hacking.md#2-customizing-the-bundled-docker-container)
3. [Adding your own Docker container](docs/Hacking.md#3-adding-your-own-docker-container)
1. [Rebuilding bundled Docker container](docs/Hacking.md#1-rebuilding-bundled-docker-container)
2. [Customizing the bundled Docker container](docs/Hacking.md#2-customizing-the-bundled-docker-container)
3. [Adding your own Docker container](docs/Hacking.md#3-adding-your-own-docker-container)
13. **[FAQ](docs/FAQ.md)**


Expand Down
38 changes: 19 additions & 19 deletions docs/Backups.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ Backups |

1. [Info](#1-info)
2. [MySQL](#2-mysql)
1. [MySQL Database Backup](#2-1-mysql-database-backup)
1. [mysqldump-secure](#2-1-1-mysqldump-secure)
2. [mysqldump](#2-1-2-mysqldump)
3. [phpMyAdmin](#2-1-3-phpmyadmin)
4. [Adminer](#2-1-4-adminer)
2. [MySQL Database Restore](#2-2-mysql-database-restore)
1. [mysql](#2-2-1-mysql)
2. [phpMyAdmin](#2-2-2-phpmyadmin)
3. [Adminer](#2-2-3-adminer)
1. [MySQL Database Backup](#2-1-mysql-database-backup)
1. [mysqldump-secure](#2-1-1-mysqldump-secure)
2. [mysqldump](#2-1-2-mysqldump)
3. [phpMyAdmin](#2-1-3-phpmyadmin)
4. [Adminer](#2-1-4-adminer)
2. [MySQL Database Restore](#2-2-mysql-database-restore)
1. [mysql](#2-2-1-mysql)
2. [phpMyAdmin](#2-2-2-phpmyadmin)
3. [Adminer](#2-2-3-adminer)
3. [PostgreSQL](#3-postgresql)
1. [PostgreSQL Database Backup](#3-1-postgresql-database-backup)
1. [pg_dump](#3-1-1-pg_dump)
2. [Adminer](#3-1-2-adminer)
2. [PostgreSQL Database Restore](#3-1-postgresql-database-restore)
1. [psql](#3-2-1-psql)
2. [Adminer](#3-2-2-adminer)
1. [PostgreSQL Database Backup](#3-1-postgresql-database-backup)
1. [pg_dump](#3-1-1-pg_dump)
2. [Adminer](#3-1-2-adminer)
2. [PostgreSQL Database Restore](#3-1-postgresql-database-restore)
1. [psql](#3-2-1-psql)
2. [Adminer](#3-2-2-adminer)
4. [MongoDB](#4-mongodb)
1. [MongoDB Database Backup](#4-1-mongodb-database-backup)
1. [mongodump](#4-1-1-mongodump)
2. [MongoDB Database Restore](#4-1-mongodb-database-restore)
1. [mongorestore](#4-2-1-mongorestore)
1. [MongoDB Database Backup](#4-1-mongodb-database-backup)
1. [mongodump](#4-1-1-mongodump)
2. [MongoDB Database Restore](#4-1-mongodb-database-restore)
1. [mongorestore](#4-2-1-mongorestore)

---

Expand Down
100 changes: 50 additions & 50 deletions docs/Configure.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,61 +19,61 @@ Configure |
## Configure

1. [Overview](#1-overview)
1. [The devilbox `.env` file](#1-1-the-devilbox-env-file)
2. [The devilbox `cfg/` directory](#1-2-the-devilbox-cfg-directory)
3. [The operating system `hosts` file](#1-3-the-operating-system-hosts-file)
4. [The operating system `resolv.conf` file](#1-4-the-operating-system-resolv-conf-file)
1. [The devilbox `.env` file](#1-1-the-devilbox-env-file)
2. [The devilbox `cfg/` directory](#1-2-the-devilbox-cfg-directory)
3. [The operating system `hosts` file](#1-3-the-operating-system-hosts-file)
4. [The operating system `resolv.conf` file](#1-4-the-operating-system-resolv-conf-file)
2. [Devilbox general settings](#2-devilbox-general-settings)
1. [Verbosity](#2-1-verbosity)
2. [Devilbox base path](#2-2-devilbox-base-path)
3. [Host computer listening address](#2-3-host-computer-listening-address)
1. [Verbosity](#2-1-verbosity)
2. [Devilbox base path](#2-2-devilbox-base-path)
3. [Host computer listening address](#2-3-host-computer-listening-address)
3. [Project settings](#3-project-settings)
1. [Project domain](#3-1-project-domain)
2. [Project path](#3-2-project-path)
1. [Project domain](#3-1-project-domain)
2. [Project path](#3-2-project-path)
4. [Container settings](#4-container-settings)
1. [General](#4-1-general)
1. [Timezone](#4-1-1-timezone)
2. [User id](#4-1-1-user-id)
3. [Group id](#4-1-2-group-id)
2. [PHP / HHVM](#4-2-php-hhvm)
1. [Select PHP version](#4-2-1-select-php-version)
2. [Xdebug](#4-2-2-xdebug)
3. [php.ini](#4-2-3-php-ini)
4. [HHVM](#4-2-4-hhvm)
3. [Apache / Nginx](#4-3-apache-nginx)
1. [Select Httpd version](#4-3-1-select-httpd-version)
2. [Host port](#4-3-2-host-port)
4. [MySQL](#4-4-mysql)
1. [Select MySQL version](#4-4-1-select-mysql-version)
2. [Root password](#4-4-2-root-password)
3. [General Log](#4-4-3-general-log)
4. [Host port](#4-4-4-host-port)
5. [Data path](#4-4-5-data-path)
6. [my.cnf](#4-4-6-my-cnf)
5. [PostgreSQL](#4-5-postgresql)
1. [Select PostgreSQL version](#4-5-1-select-postgresql-version)
2. [Root user](#4-5-2-root-user)
3. [Root password](#4-5-3-root-password)
4. [Host port](#4-5-4-host-port)
5. [Data path](#4-5-5-data-path)
6. [Redis](#4-6-redis)
1. [Select Redis version](#4-6-1-select-redis-version)
2. [Host port](#4-6-2-host-port)
7. [Memcached](#4-7-memcached)
1. [Select Memcached version](#4-7-1-select-memcached-version)
2. [Host port](#4-7-2-host-port)
8. [MongoDB](#4-8-mongodb)
1. [Select MongoDB version](#4-8-1-select-mongodb-version)
2. [Host port](#4-8-2-host-port)
3. [Data path](#4-8-3-data-path)
9. [Bind](#4-9-bind)
1. [Upstream resolver](#4-9-1-upstream-resolver)
2. [Host port](#4-9-2-host-port)
1. [General](#4-1-general)
1. [Timezone](#4-1-1-timezone)
2. [User id](#4-1-1-user-id)
3. [Group id](#4-1-2-group-id)
2. [PHP / HHVM](#4-2-php-hhvm)
1. [Select PHP version](#4-2-1-select-php-version)
2. [Xdebug](#4-2-2-xdebug)
3. [php.ini](#4-2-3-php-ini)
4. [HHVM](#4-2-4-hhvm)
3. [Apache / Nginx](#4-3-apache-nginx)
1. [Select Httpd version](#4-3-1-select-httpd-version)
2. [Host port](#4-3-2-host-port)
4. [MySQL](#4-4-mysql)
1. [Select MySQL version](#4-4-1-select-mysql-version)
2. [Root password](#4-4-2-root-password)
3. [General Log](#4-4-3-general-log)
4. [Host port](#4-4-4-host-port)
5. [Data path](#4-4-5-data-path)
6. [my.cnf](#4-4-6-my-cnf)
5. [PostgreSQL](#4-5-postgresql)
1. [Select PostgreSQL version](#4-5-1-select-postgresql-version)
2. [Root user](#4-5-2-root-user)
3. [Root password](#4-5-3-root-password)
4. [Host port](#4-5-4-host-port)
5. [Data path](#4-5-5-data-path)
6. [Redis](#4-6-redis)
1. [Select Redis version](#4-6-1-select-redis-version)
2. [Host port](#4-6-2-host-port)
7. [Memcached](#4-7-memcached)
1. [Select Memcached version](#4-7-1-select-memcached-version)
2. [Host port](#4-7-2-host-port)
8. [MongoDB](#4-8-mongodb)
1. [Select MongoDB version](#4-8-1-select-mongodb-version)
2. [Host port](#4-8-2-host-port)
3. [Data path](#4-8-3-data-path)
9. [Bind](#4-9-bind)
1. [Upstream resolver](#4-9-1-upstream-resolver)
2. [Host port](#4-9-2-host-port)
5. [Intranet settings](#5-intranet-settings)
1. [DNS check timeout](#5-1-dns-check-timeout)
1. [DNS check timeout](#5-1-dns-check-timeout)
6. [Host computer](#6-host-computer)
1. [/etc/hosts](#6-1-etc-hosts)
2. [Auto-DNS](#6-2-auto-dns)
1. [/etc/hosts](#6-1-etc-hosts)
2. [Auto-DNS](#6-2-auto-dns)

---

Expand Down
12 changes: 6 additions & 6 deletions docs/Hacking.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Hacking |
## Hacking

1. [Rebuilding bundled Docker container](#1-rebuilding-bundled-docker-container)
1. [Why rebuild yourself?](#1-1-why-rebuild-yourself-)
2. [How to rebuild yourself?](#1-2-how-to-rebuild-yourself-)
3. [How to use the rebuild container?](#1-3-how-to-use-the-rebuild-container-)
1. [Why rebuild yourself?](#1-1-why-rebuild-yourself-)
2. [How to rebuild yourself?](#1-2-how-to-rebuild-yourself-)
3. [How to use the rebuild container?](#1-3-how-to-use-the-rebuild-container-)
2. [Customizing the bundled Docker container](#2-customizing-the-bundled-docker-container)
3. [Adding your own Docker container](#3-adding-your-own-docker-container)
1. [What information will you need?](#3-1-what-information-will-you-need-)
2. [How to add your service?](#3-2-how-to-add-your-service-)
3. [How to start your service?](#3-3-how-to-start-your-service-)
1. [What information will you need?](#3-1-what-information-will-you-need-)
2. [How to add your service?](#3-2-how-to-add-your-service-)
3. [How to start your service?](#3-3-how-to-start-your-service-)

---

Expand Down
10 changes: 5 additions & 5 deletions docs/Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ Install |
## Install

1. [Install Docker](#1-install-docker)
1. [Linux](#1-1-linux)
2. [Windows](#1-2-windows)
3. [OSX](#1-3-osx)
1. [Linux](#1-1-linux)
2. [Windows](#1-2-windows)
3. [OSX](#1-3-osx)
2. [Install Devilbox](#2-install-devilbox)
1. [Latest git tag](#2-1-latest-git-tag)
2. [Current master branch](#2-2-current-master-branch)
1. [Latest git tag](#2-1-latest-git-tag)
2. [Current master branch](#2-2-current-master-branch)

---

Expand Down
4 changes: 2 additions & 2 deletions docs/OS.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ OS |

1. [Linux](#1-linux)
2. [Windows](#2-windows)
1. [/etc/hosts](#2-1-etc-hosts-)
1. [/etc/resolv.conf](#2-2-etc-resolv-conf-)
1. [/etc/hosts](#2-1-etc-hosts-)
1. [/etc/resolv.conf](#2-2-etc-resolv-conf-)
3. [OSX](#3-osx)

---
Expand Down
16 changes: 8 additions & 8 deletions docs/Quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ Quickstart |

1. [Installation](#1-installation)
2. [Update](#2-update)
1. [Tagged release](#2-1-tagged-release)
2. [Master branch](#2-2-master-branch)
1. [Tagged release](#2-1-tagged-release)
2. [Master branch](#2-2-master-branch)
3. [Configuration](#3-configuration)
1. [.env](#3-1-env)
2. [Services](#3-2-services)
1. [.env](#3-1-env)
2. [Services](#3-2-services)
4. [Run](#4-run)
1. [Run all](#4-1-run-all)
2. [Run selection](#4-2-run-selection)
1. [Run all](#4-1-run-all)
2. [Run selection](#4-2-run-selection)
5. [Project setup](#5-project-setup)
1. [General setup](#5-1-general-setup)
2. [Specific Frameworks](#5-2-specific-frameworks)
1. [General setup](#5-1-general-setup)
2. [Specific Frameworks](#5-2-specific-frameworks)
6. [Enter the PHP Docker container](#6-enter-the-php-docker-container)

---
Expand Down
Loading

0 comments on commit 8fbc86f

Please sign in to comment.