From 42096fc030e59b0ce466c4095e5459c2c6ecb3af 2012-11-13 23:06:15
From: dkua <david.kua@mail.utoronto.ca>
Date: 2012-11-13 23:06:15
Subject: [PATCH] Made changes as per discussion in PR thread.

---

diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py
index 942c22a..8ddd9a0 100644
--- a/IPython/frontend/html/notebook/notebookapp.py
+++ b/IPython/frontend/html/notebook/notebookapp.py
@@ -473,10 +473,11 @@ class NotebookApp(BaseIPythonApplication):
         if not self.ip:
             warning = "WARNING: The notebook server is listening on all IP addresses"
             if ssl_options is None:
-                warning += ", and not using any encryption"
+                self.log.critical(warning + " and not using encryption. This"
+                    "is not recommended.")
             if not self.password and not self.read_only:
-                warning += ", and not using authentication"
-            self.log.critical(warning + ". This is highly insecure and not recommended.")
+                self.log.critical(warning + "and not using authentication."
+                    "This is highly insecure and not recommended.")
         success = None
         for port in random_ports(self.port, self.port_retries+1):
             try: