refreshing chapters with the latest version of IDE (docker#167)

Author: arun-gupta

developer-tools/java/chapters/ch01-setup.adoc

@@ -69,7 +69,7 @@ NOTE: For Linux, `docker-compose` and `docker` commands need `sudo` access. So p
 === Other Software
 
 . Download Java IDE based upon your choice and install.
-.. https://netbeans.org/downloads/[NetBeans 8.2] (`"Java EE"` version)
+.. https://netbeans.org/downloads/[NetBeans 8.2] (`"Java SE"` version)
 .. https://www.jetbrains.com/idea/download/[IntelliJ IDEA Community or Ultimate]
 .. http://www.eclipse.org/downloads/eclipse-packages/[Eclipse IDE for Java EE Developers]
 . Download https://maven.apache.org/download.cgi[Maven] and install.

developer-tools/java/chapters/ch07-eclipse.adoc

@@ -9,19 +9,17 @@ This chapter will show you basic Docker tooling with Eclipse:
 - Run/Start/Stop/Kill Docker containers
 - Customize views
 
-Watch a quick video explaining the key steps:
-
-video::XmhEZiS26os[youtube]
+Watch a quick video explaining the key steps in https://www.youtube.com/watch?v=XmhEZiS26os.
 
 === Install Docker Tooling in Eclipse
 
-Download http://eclipse.org/[Eclipse IDE for Java EE Developers Mars 2] and install.
+Download http://www.eclipse.org/downloads/eclipse-packages/[Eclipse IDE for Java EE Developers] and install.
 
 Go to "`Help`" menu, "`Install New Software...`".
 
-Select Eclipse Mars update site, search for Docker, select "`Docker Tooling`".
+Select Eclipse update site for the release, search for Docker, select "`Docker Tooling`".
 
-image::docker-eclipse-mars-update-site-selection.png[]
+image::docker-eclipse-update-site-selection.png[]
 
 Click on "`Next>`", "`Next>`", accept the license agreement, click on "`Finish`" to start the installation.
 
@@ -31,31 +29,39 @@ Restart Eclipse for the installation to complete.
 
 Go to "`Window`", "`Perspective`", "`Open Perspective`", "`Other...`", "`Docker Tooling`".
 
-image::docker-eclipse-mars-docker-perspective.png[]
+image::docker-eclipse-docker-perspective.png[]
 
 Click on "`OK`" to see the perspective.
 
-image::docker-eclipse-mars-docker-perspective-default-look.png[]
+image::docker-eclipse-docker-perspective-default-look.png[]
 
 This has three views:
 
 - *Docker Explorer*: a tree view listing all connected Docker instances, with image and containers.
 - *Docker Images*: a table view listing containers for selected Docker connection.
 - *Docker Containers*: a table view listing containers for selected Docker connection
 
-Click on the text in Docker Explorer to create a new connection. If you are on Mac, you are likely using Docker Toolbox (or Docker Machine) to setup Docker Host.
+Click on the text in Docker Explorer to create a new connection. If you are on Mac/Windows, you are likely using Docker for Mac/Windows or Docker Toolbox to setup Docker Host. Eclipse allows to configure Docker Engine using both Docker for Mac/Windows and Docker Toolbox.
+
+If you are using Docker for Mac/Windows, then the default values are shown:
+
+image::docker-eclipse-docker-connection.png[]
+
+Click on "`Test Connection`" to test the connection.
+
+image::docker-eclipse-docker-connection-test.png[]
 
-Enter the values as shown:
+If you are using Toolbox, enter the values as shown:
 
-image::docker-eclipse-mars-docker-connection.png[]
+image::docker-eclipse-docker-connection-toolbox.png[]
 
 The exact value of TCP Connection can be found using `docker-machine ls` command. The path for authentication is the directory name where certificates for your Docker Machine, `couchbase` in this case, are stored.
 
-Click on "`Finish`" to complete the configuration.
+Click on "`Test Connection`" to make sure the connection is successfully configured.
 
-Click on Test Connection to make sure the connection is successfully configured.
+image::docker-eclipse-docker-connection-test-toolbox.png[]
 
-image::docker-eclipse-mars-docker-connection-test.png[]
+In either case, the configuration can be completed once the connection is tested. Click on "`Finish`" to complete the configuration.
 
 Docker Explorer is updated to show the connection.
 

developer-tools/java/chapters/ch07-intellij.adoc

@@ -9,9 +9,11 @@ This chapter will show you basic Docker tooling with IntelliJ IDEA:
 - Run, stop, delete a Container
 - Build an Image
 
+NOTE: IntelliJ only supports configuring Docker Engine running using Docker Toolbox. This means that if you are running Docker for Mac or Docker for Windows then IntelliJ cannot be used.
+
 === Install Docker Plugin in IDEA
 
-Go to `"Preferences"`, "`Plugins`", "`Install JetBrains plugin...`", search on "`docker`" and click on "`Install`"
+Go to "`Preferences`", "`Plugins`", "`Install JetBrains plugin...`", search on "`docker`" and click on "`Install`"
 
 image::docker-intellij-plugin-install.png[]
 

developer-tools/java/chapters/ch07-netbeans.adoc

@@ -8,6 +8,8 @@ This chapter will show you basic Docker tooling with NetBeans:
 - Pull/Build Docker images
 - Run/Start/Stop Docker containers
 
+NOTE: NetBeans only supports configuring Docker Engine running using Docker Toolbox. This means that if you are running Docker for Mac or Docker for Windows then NetBeans cannot be used.
+
 === Configure Docker Host
 
 In "`Services`" window, right-click on "`Docker`", click on "`Add Docker...`"