Merge branch 'patch-1' of git://github.com/gsantandrea/docker.github.io into gsantandrea-patch-1

engine/examples/running_ssh_service.md

@@ -18,6 +18,8 @@ quick access to a test container.
 
 __Note: Replace "THEPASSWORDYOUCREATED" with the password that you created in the previous step.__
 
+> *** NOTE: *** For Ubuntu 14.04, use  `without-password` instead of `prohibit-password`.
+
 ```Dockerfile
 FROM ubuntu:16.04
 
@@ -36,6 +38,7 @@ EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 ```
 
+
 Build the image using:
 
 ```bash