From f2fd7dbbe7e6d9f1d2a36a8f14abaee17a6ede71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Wed, 20 Nov 2019 11:09:37 +0100 Subject: [PATCH 1/3] Adds a link to the Getting Started wiki section to the README --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e375bea..5c0ff33 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,15 @@ $ xdg-open "http://$(docker-compose port nginx 8080)/" &>/dev/null & Alternatively, use something like [Reception][docker-reception] to connect to _docker-compose_ projects. -Default credentials: +The default credentials are: * Username: **admin** * Password: **admin** * API Token: **0123456789abcdef0123456789abcdef01234567** +There is a more complete [Getting Started guide on our Wiki][wiki-getting-started]. + +[wiki-getting-started]: https://github.com/netbox-community/netbox-docker/wiki/Getting-Started [docker-reception]: https://github.com/nxt-engineering/reception ## Dependencies From 788804627e29a125c9f5668782e3bcf96e6f29ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Tue, 26 Nov 2019 12:27:25 +0100 Subject: [PATCH 2/3] Fix typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5c0ff33..a0f1fee 100644 --- a/README.md +++ b/README.md @@ -50,12 +50,12 @@ There is a more complete [Getting Started guide on our Wiki][wiki-getting-starte ## Dependencies -This project relies only on *Docker* and *docker-compose* meeting this requirements: +This project relies only on *Docker* and *docker-compose* meeting these requirements: * The *Docker version* must be at least `17.05`. * The *docker-compose version* must be at least `1.17.0`. -To ensure this, compare the output of `docker --version` and `docker-compose --version` with the requirements above. +To check the version installed on your system, compare the output of `docker --version` and `docker-compose --version` with the requirements above. ## Reference Documentation From 8a92640d1001fb074849a98d8d9b725461f322c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Tue, 26 Nov 2019 12:28:43 +0100 Subject: [PATCH 3/3] Re-wording of dependencies check paragraph --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0f1fee..82f01aa 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ This project relies only on *Docker* and *docker-compose* meeting these requirem * The *Docker version* must be at least `17.05`. * The *docker-compose version* must be at least `1.17.0`. -To check the version installed on your system, compare the output of `docker --version` and `docker-compose --version` with the requirements above. +To check the version installed on your system run `docker --version` and `docker-compose --version`. ## Reference Documentation