diff --git a/docs/source/_templates/htmlnotebook.html b/docs/source/_templates/notebook_redirect.html
similarity index 55%
rename from docs/source/_templates/htmlnotebook.html
rename to docs/source/_templates/notebook_redirect.html
index 7133e91..0114404 100644
--- a/docs/source/_templates/htmlnotebook.html
+++ b/docs/source/_templates/notebook_redirect.html
@@ -1,9 +1,9 @@
 <html>
     <head>
-        <meta http-equiv="Refresh" content="0; url=notebook.html" />
-        <title>Notebook page has move</title>
-    </head> 
+        <meta http-equiv="Refresh" content="0; url=../notebook/index.html" />
+        <title>Notebook docs have moved</title>
+    </head>
     <body>
-        <p>The notebook page has moved to  <a href="notebook.html">this link</a>.</p>
+        <p>The notebook docs have moved <a href="../notebook/index.html">here</a>.</p>
     </body>
 </html>
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 381c3f6..5bc7f0f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -164,7 +164,10 @@ html_last_updated_fmt = '%b %d, %Y'
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 html_additional_pages = {
-                         'interactive/htmlnotebook': 'htmlnotebook.html',
+    'interactive/htmlnotebook': 'notebook_redirect.html',
+    'interactive/notebook': 'notebook_redirect.html',
+    'interactive/nbconvert': 'notebook_redirect.html',
+    'interactive/public_server': 'notebook_redirect.html',
 }
 
 # If false, no module index is generated.