Merge branch 'release/3.5.0'

CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing to Contao
+
+The following is a set of guidelines for contributing to Contao and its
+packages, which are hosted in the [Contao organization][1] on GitHub. These
+are just guidelines, not rules, use your best judgement and feel free to
+propose changes to this document in a pull request.
+
+## Submitting issues
+
+* Use the search function to see if a similar issue has already been submitted.
+* Describe the issue in detail and include all the steps to follow in order to
+  reproduce the bug in the [online demo][2].
+* Include the version of Contao and PHP you are using.
+* Include screenshots if possible; they are immensely helpful.
+* If you are reporting a bug, please include any related error message you are
+  seeing and also check the `system/logs/error.log` file.
+
+## Pull requests
+
+* Follow the Contao coding standards.
+* Create your pull request against the `master` branch for bug fixes or the
+  `develop` branch for new features.
+* Include screenshots in your pull request whenever possible.
+
+## Git commit messages
+
+* Use the present tense ("Add feature" not "Added feature").
+* Use the imperative mood ("Move cursor to …" not "Moves cursor to …").
+* Reference issues and pull requests liberally.
+
+[1]: https://github.com/contao
+[2]: http://demo.contao.org

README.md

@@ -10,7 +10,7 @@ System requirements
 -------------------
 
  * Web server
- * PHP 5.3.7+ with GDlib, DOM, Phar and SOAP
+ * PHP 5.4.0+ with GDlib, DOM, Phar and SOAP
  * MySQL 5.0.3+
 
 
@@ -60,8 +60,8 @@ php composer.phar install --prefer-dist
 
 
 [1]: https://contao.org
-[2]: https://contao.org/manual/installation.html
-[3]: https://contao.org/manual.html
+[2]: https://docs.contao.org/books/manual/current/en/01-installation/installing-contao.html
+[3]: https://docs.contao.org/books/manual/current/
 [4]: system/docs/CHANGELOG.md
 [5]: system/docs/UPGRADE.md
 [6]: http://contaowiki.org