Merge pull request #165 from cytopia/DVL-013-doc-fixes

Dvl 013 doc fixes

.devilbox/www/config.php

@@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
 $DEVILBOX_VERSION = 'v0.12';
-$DEVILBOX_DATE = '2017-11-21';
+$DEVILBOX_DATE = '2017-12-07';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,10 @@
-Fixes # .
+# FEATURE_NAME
 
-Changes proposed in this pull request:
+#### Short description
 
-- ...
+<!-- Enter a short description here -->
+<!-- Link to issues in case it fixes an issue -->
+
+#### Tasks done
+
+* [ ] Updated `$DEVILBOX_DATE` in [config.php](https://github.com/cytopia/devilbox/blob/master/.devilbox/www/config.php#L17)

README.md

@@ -370,6 +370,8 @@ As far as tested there are no limitations and you can use any Framework or CMS j
     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. [/etc/hosts](docs/Configure.md#61-etchosts)
+		2. [Auto-DNS](docs/Configure.md#62-auto-dns)
 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)
@@ -414,7 +416,7 @@ As far as tested there are no limitations and you can use any Framework or CMS j
         7. [Setup Wordpress](docs/Examples.md#27-setup-wordpress)
         8. [Setup Yii](docs/Examples.md#28-setup-yii)
         9. [Setup Zend](docs/Examples.md#29-setup-zend)
-   3. [Code analysis](docs/Examples.md#3-code-analysis)
+    3. [Code analysis](docs/Examples.md#3-code-analysis)
         1. [awesome-ci](docs/Examples.md#31-awesome-ci)
         2. [phpcs](docs/Examples.md#32-phpcs)
         3. [eslint](docs/Examples.md#33-eslint)

docs/Configure.md

@@ -976,12 +976,20 @@ The devilbox provides its own DNS nameserver that automatically configures itsel
 
 You can make advantage of that by adding this DNS nameserver to your host computers DNS config in `/etc/resolv.conf`. Then everytime you make a request (in your Browser for example) to a devilbox project domain, the bundled DNS name server will successfully answer the request and direct you to the project. This will remove the need to make custom `/etc/hosts` entries for each project.
 
+
 **What is required for this to work?**
 
-First of all, you need to make sure that nothing on your host computer is listening on port 53.
+By default, the Bind port (`.env`: `HOST_PORT_BIND=1053`) is set to a non standard DNS port in order to avoid failed devilbox startups in case you already have a local DNS resolver running. So edit your `.env` file and set the Bind port to `53`:
+```
+$ vi .env
+
+HOST_PORT_BIND=53
+```
+
+Then you need to make sure that nothing on your host computer is listening on port 53. Do this before starting up the devilbox.
 
 ```shell
-$ netstat -tulpen | grep ':53'
+$ netstat -tuln | grep ':53'
 ```
 
 If there is already something listening on that port, you will need to stop whatever is listening in port 53 (TCP and UDP).

docs/Usage.md

@@ -89,6 +89,14 @@ Here is an example to list the PHP inside the container from the Docker host.
 $ docker-compose exec --user devilbox php php -v
 ```
 
+However, instead of having to type all of the above for a simple command execution, you might be better off to simply enter the PHP container and work on a normal shell. Going into the container is as simple as this:
+
+```
+$ ./shell.sh
+```
+
+Read more about this in the next section.
+
 
 ## 3. Work inside the PHP container