update latest

Author: mevdschee

00-about.md

@@ -21,7 +21,6 @@ Mainly to make it easy to learn for PHP developers.
 <br/>
 
 <a href='/installation/' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px; margin-right: 30px;">Download</a>
-<a href='http://maurits.server.nlware.com/' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px; margin-right: 30px;">Demo</a>
 <a href='https://github.com/mintyphp/mintyphp' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px; margin-right: 30px;">Github</a>
 
 <br/>
@@ -30,4 +29,4 @@ Mainly to make it easy to learn for PHP developers.
 
 - [MindaPHP: a new PHP framework optimized for learning](https://www.leaseweb.com/labs/2013/10/mindaphp-new-php-framework-optimized-learning/)
 - [MintyPHP now on packagist!](https://tqdev.com/2018-mindaphp-now-on-packagist)
-- [Reduce the mental load for developers](https://tqdev.com/2018-web-development-made-simple)
+- [Reduce the mental load for developers](https://tqdev.com/2018-web-development-made-simple)

01-installation.md

@@ -23,15 +23,24 @@ MintyPHP supports MariaDB (and other MySQL compatible databases).
 You can download the latest version as a zip archive by clicking the button below.
 
 <br>
+<<<<<<< HEAD
 <a href='http://github.com/mintyphp/mintyphp/archive/v.zip' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px;">Download MintyPHP v</a>
+=======
+<a href='http://github.com/mintyphp/mintyphp/archive/v2.0.4.zip' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px;">Download MintyPHP v2.0.4</a>
+>>>>>>> 1a66369292aa0e5ac4dc25bafb572a8fbc91c7c6
 <br>
 <br>
 
 Unzip the archive and run the start.sh script with the following command:
 
 ```
+<<<<<<< HEAD
 unzip mintyphp-.zip
 cd mintyphp-
+=======
+unzip mintyphp-2.0.4.zip
+cd mintyphp-2.0.4
+>>>>>>> 1a66369292aa0e5ac4dc25bafb572a8fbc91c7c6
 bash start.sh
 ```
 

04-api.md

@@ -37,7 +37,6 @@ This is a reference of the all global variables and functions.
 
 | Function                                    | Location      | Purpose         |
 | ------------------------------------------- | ------------- | --------------- | 
-| `Loader::register($path,$namespace):bool    ` | loader.php    | Loading classes |
 | `Buffer::set($name,$string)                 ` | *.php         | Set raw HTML    |
 | `Buffer::get($name):bool                    ` | *.phtml       | Get raw HTML    |
 | `Buffer::start($name)                       ` | *.phtml       | Nested template |

update.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=$(curl -s https://github.com/mintyphp/mintyphp/releases | grep -iA 20 'label-latest' | grep -o '"v[0-9]\+\.[0-9]\+\.[0-9]\+"')
+VERSION=$(curl -s https://github.com/mintyphp/mintyphp/releases | grep -iA 20 'latest' | grep -o 'v[0-9]\+\.[0-9]\+\.[0-9]\+')
 VERSION="${VERSION//\"}" # strip quote character
 VERSION="${VERSION//v}" # strip v character
 OLDVER=$(cat version.txt)

version.txt

@@ -1 +1 @@
-
+2.0.5