Merge branch 'fix/https' of https://github.com/satra/ipython into satra-fix/https

IPython/frontend/html/notebook/notebookapp.py

@@ -263,7 +263,10 b' class IPythonNotebookApp(BaseIPythonApplication):'
 
     def start(self):
         ip = self.ip if self.ip else '[all ip addresses on your system]'
-        self.log.info("The IPython Notebook is running at: http://%s:%i" % (ip, self.port))
+        proto = 'https' if self.certfile else 'http'
+        self.log.info("The IPython Notebook is running at: %s://%s:%i" % (proto,
+                                                                          ip,
+                                                                          self.port))
         ioloop.IOLoop.instance().start()
 
 #-----------------------------------------------------------------------------

docs/source/interactive/htmlnotebook.txt

@@ -26,8 +26,19 b' you want inline figures, you must manually select the ``inline`` backend::'
 
     $ ipython notebook --pylab=inline
 
+You can start the notebook to communicate via a secure protocol mode using a
+self-signed certificate by typing::
+
+    $ ipython notebook --certfile=mycert.pem
+
+.. note::
+
+    A self-signed certificate can be generated with openssl. For example:
+
+    openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout mycert.pem -out mycert.pem
+
 This server uses the same ZeroMQ-based two process kernel architecture as
-the QT Console as well Tornado for serving HTTP requests. Some of the main
+the QT Console as well Tornado for serving HTTP/S requests. Some of the main
 features of the Notebook include:
 
 * Display rich data (png/html/latex/svg) in the browser as a result of