Merge branch 'master' of https://github.com/epfl-sti/octave-x11-novnc…

…-docker

README.md

@@ -3,12 +3,11 @@
 This docker runs GNU Octave - an open source Matlab - which provides capabilities for the numerical solution of linear and nonlinear problems, and for performing other numerical experiments.
 The Octave GUI have to be accessed through a browser in a noVNC windows.
 
-![Demo Screenshot](https://github.com/epfl-sti/octave-x11-novnc-docker/blob/master/screenshot.png)
+![Demo Screenshot](http://epfl-sti.github.io/octave-x11-novnc-docker/images/lorenz.png)
 
+[... more screenshots](http://epfl-sti.github.io/octave-x11-novnc-docker/#screenshots)
 
-## About
-
-This container runs:
+## This container runs
 
 * [Xvfb](http://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml) - X11 in a virtual framebuffer
 * [x11vnc](http://www.karlrunge.com/x11vnc/) - A VNC server that scrapes the above X11 server
@@ -18,19 +17,27 @@ This container runs:
 
 ## How To
 
-### With Docker 
-* docker pull epflsti/octave-x11-novnc-docker
-* docker run -p 8083:8083 -ti  epflsti/octave-x11-novnc-docker:latest
-* firefox http://localhost:8083
+### With Docker Hub
+
+* `docker pull epflsti/octave-x11-novnc-docker`
+* `docker run -p 8083:8083 -ti  epflsti/octave-x11-novnc-docker:latest`
+* `firefox http://localhost:8083`
+* octave is launched, just run some script e.g. my_sombrero.m
 
 ### Manual Build
-* docker build -t epflsti/wine-x11-novnc-docker:latest .
-* docker run -p 8083:8083 -ti  epflsti/wine-x11-novnc-docker:latest
-* firefox http://localhost:8083
-* octave is launched, just launch some script e.g. my_sombrero.m
 
-## On DockerHub
-[epflsti/octave-x11-novnc-docker/](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/)
+* `docker build -t epflsti/octave-x11-novnc-docker:latest .`
+* `docker run -p 8083:8083 -ti  epflsti/octave-x11-novnc-docker:latest`
+* `firefox http://localhost:8083`
+* octave is launched, just run some script e.g. my_sombrero.m
+
+## Gh-pages
+Please visit the project's website on [http://epfl-sti.github.io/octave-x11-novnc-docker/](http://epfl-sti.github.io/octave-x11-novnc-docker/)
+
+## On DockerHub / GitHub
+
+* [epflsti/octave-x11-novnc-docker on DockerHub](https://registry.hub.docker.com/u/epflsti/octave-x11-novnc-docker/)
+* [epfl-sti/octave-x11-novnc-docker on GitHub](https://github.com/epfl-sti/octave-x11-novnc-docker)
 
 ## Thanks
-Based on  [wine-x11-novnc-docker](https://github.com/solarkennedy/wine-x11-novnc-docker), thanks @solarkennedy !
+Based on [wine-x11-novnc-docker](https://github.com/solarkennedy/wine-x11-novnc-docker), thanks @solarkennedy !