Merge pull request #2434 from J0WI/update-matomo-docs

Update Matomo

matomo/content.md

@@ -14,8 +14,8 @@
 
 You can run the Matomo container and service like so:
 
-```console
-docker run -d --link some-mysql:db matomo
+```bash
+docker run -d --link some-mysql:db %%IMAGE%%
 ```
 
 This assumes you've already launched a suitable MySQL or MariaDB database container.
@@ -24,8 +24,8 @@ This assumes you've already launched a suitable MySQL or MariaDB database contai
 
 Use a Docker volume to keep persistent data:
 
-```console
-docker run -d --link some-mysql:db -v matomo:/var/www/html matomo
+```bash
+docker run -d -p 8080:80 --link some-mysql:db -v matomo:/var/www/html %%IMAGE%%
 ```
 
 ## Matomo Installation
@@ -50,25 +50,26 @@ The following environment variables are also honored for configuring your Matomo
 -	`MATOMO_DATABASE_PASSWORD`
 -	`MATOMO_DATABASE_DBNAME`
 
+The PHP memory limit can be configured with the following environment variable:
+
+-	`PHP_MEMORY_LIMIT`
+
 ## Docker-compose examples and log import instructions
 
-A minimal set-up using docker-compose is available in the [.examples folder](https://github.com/matomo-org/docker/tree/master/.examples).
+A minimal set-up using docker-compose is available in the [.examples folder](%%GITHUB-REPO%%/tree/master/.examples).
 
 If you want to use the import logs script, you can then run the following container as needed, in order to execute the python import logs script:
 
-```console
-docker run --rm --volumes-from="matomo_app_1" --link matomo_app_1 python:2-alpine python /var/www/html/misc/log-analytics/import_logs.py --url=http://ip.of.your.piwik --login=yourlogin --password=yourpassword --idsite=1 --recorders=4 /var/www/html/logs/access.log
+```bash
+docker run --rm --volumes-from="matomo-app-1" --link matomo-app-1 python:3-alpine python /var/www/html/misc/log-analytics/import_logs.py --url=http://ip.of.your.matomo.example --login=yourlogin --password=yourpassword --idsite=1 --recorders=4 /var/www/html/logs/access.log
 ```
 
 ## Contribute
 
 Pull requests are very welcome!
 
-We'd love to hear your feedback and suggestions in the issue tracker: [github.com/motomo-org/docker/issues](https://github.com/matomo-org/docker/issues).
+We'd love to hear your feedback and suggestions in the issue tracker: [%%ISSUES%%](%%ISSUES%%).
 
 ## GeoIP
 
-~~This product includes GeoLite data created by MaxMind, available from [http://www.maxmind.com](http://www.maxmind.com).~~
-
--	https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/
--	https://matomo.org/faq/how-to/faq_163/
+~~This product includes GeoLite data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com).~~ https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/