Resolved conflicts with the latest version

DOCUMENTATION/content/contributing/index.md

@@ -81,7 +81,7 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 * Make sure you follow the same code/comments style.
 
-* Add the environment variables to the `env-example` if you have any.
+* Add the environment variables to the `.env.example` if you have any.
 
 * **MOST IMPORTANTLY** update the `Documentation`, add as much information.
 

DOCUMENTATION/content/getting-started/index.md

@@ -75,7 +75,7 @@ Your folder structure should look like this:
 We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
 
 ```
-cp env-example .env
+cp .env.example .env
 ```
 
 At the top, change the `APP_CODE_PATH_HOST` variable to your project path.
@@ -155,10 +155,10 @@ We recommend using a Docker version which is newer than 1.13.
 
 <br>
 
-1 - Enter the laradock folder and copy `env-example` to `.env`
+1 - Enter the laradock folder and copy `.env.example` to `.env`
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are being used.

DOCUMENTATION/content/introduction/index.md

@@ -46,10 +46,10 @@ Let's see how easy it is to setup our demo stack `PHP`, `NGINX`, `MySQL`, `Redis
 git clone https://github.com/Laradock/laradock.git
 ```
 
-2 - Enter the laradock folder and rename `env-example` to `.env`.
+2 - Enter the laradock folder and rename `.env.example` to `.env`.
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 3 - Run your containers: