toc and polishing

myfear · myfear · commit 65abf76584fa · 2015-05-22T13:25:10.000+02:00
diff --git a/attendees/readme.adoc b/attendees/readme.adoc
@@ -3,7 +3,7 @@
 :toc-placement!:
 
 This folder contains instructions to setup an attendee environment. Please note, that it is only intended to setup the environment for this lab. The lab itself is in the link:https://github.com/arun-gupta/docker-java/blob/master/readme.adoc[main readme]. Continue with it after you finished this setup.
-You'll learn about all the software you installed here during the lab. For now just go through this document and let#s get ready as fast as possible for the lab.
+You'll learn about all the software you installed here during the lab. For now just go through this document and let'#'s get ready as fast as possible for the lab.
 
 Your instructor will have a a machine setup with all the relevant downloads and needed infrastructures. The IP will change depending on the network used. In this guide, it's refered to as <INSTRUCTOR_IP> make sure to replace this with the actuall IP address you get from your instructor.
 
diff --git a/instructor/readme.adoc b/instructor/readme.adoc
@@ -1,7 +1,11 @@
-# Docker for Java Developers
+= Docker for Java Developers - Instructor Setup
+:toc:
+:toc-placement!:
 
 This folder contains instructions to setup an Instructor environment.
 
+toc::[]
+
 IMPORTANT: Make sure to run these instructions prior to the lab already. Executing them might take up to 30 minutes.
 
 Instructor needs:
@@ -23,8 +27,8 @@ Instructor needs:
 # Linux / MacOS
 curl -L  https://get.docker.com/builds/Darwin/x86_64/docker-latest > /usr/local/bin/docker
 
-#Windows 
-Download: 
+#Windows
+Download:
 https://get.docker.com/builds/Windows/x86_64/docker-latest.exe
 https://get.docker.com/builds/Windows/i386/docker-latest.exe
 And save to c:\Users\<username>\docker\docker.exe
@@ -96,7 +100,7 @@ You can either insert your <HOST_IP> or the complete subnet e.g. 192.168.99.100
 ----
 docker-machine ssh
 
-$ # add EXTRA_ARGS="--insecure-registry <YOUR INSECURE HOST>" 
+$ # add EXTRA_ARGS="--insecure-registry <YOUR INSECURE HOST>"
 $ # to /var/lib/boot2docker/profile
 $ sudo /etc/init.d/docker restart
 ----
@@ -179,4 +183,4 @@ If you need some extra information like:
 - Uptating the attendees instructions served by the instructor httpd server
 - Backing up Nexus data container to a file
 
-Please, check the link:extra.adoc[extra instructions].
+Please, check the link:extra.adoc[extra instructions].
diff --git a/readme.adoc b/readme.adoc
@@ -128,6 +128,19 @@ These instructions are stored in a file called a Dockerfile. Docker reads this D
 
 A container consists of an operating system, user-added files, and meta-data. As we've seen, each container is built from an image. That image tells Docker what the container holds, what process to run when the container is launched, and a variety of other configuration data. The Docker image is read-only. When Docker runs a container from an image, it adds a read-write layer on top of the image (using a union file system as we saw earlier) in which your application can then run.
 
+### Docker Machine
+
+Machine makes it really easy to create Docker hosts on your computer, on cloud providers and inside your own data center. It creates servers, installs Docker on them, then configures the Docker client to talk to them.
+
+Once your Docker host has been created, it then has a number of commands for managing them:
+
+. Starting, stopping, restarting
+. Upgrading Docker
+. Configuring the Docker client to talk to your host
+
+You used Docker Machine already during the attendee setup. We won't need it too much further on. But if you need to create hosts, it's a very handy tool to know about.
+Find out more about the details at the link:https://docs.docker.com/machine/[Official Docker Machine Website]
+
 ### Ticket Monster
 
 ### Deploy Ticket Monster
