diff --git a/docs/source/development/gitwash/git_links.txt b/docs/source/development/gitwash/git_links.txt
index b1579f6..bcf41b5 100644
--- a/docs/source/development/gitwash/git_links.txt
+++ b/docs/source/development/gitwash/git_links.txt
@@ -20,7 +20,7 @@
 
 .. ipython
 .. _ipython: http://ipython.scipy.org
-.. _`ipython github`: http://github.com/ipython
+.. _`ipython github`: http://github.com/ipython/ipython
 .. _`ipython mailing list`: http://mail.scipy.org/mailman/listinfo/IPython-dev
 
 .. nipy
diff --git a/docs/source/development/messaging.rst b/docs/source/development/messaging.rst
deleted file mode 100644
index 9cf6253..0000000
--- a/docs/source/development/messaging.rst
+++ /dev/null
@@ -1,97 +0,0 @@
-=====================
-Message Specification
-=====================
-
-Note: not all of these have yet been fully fleshed out, but the key ones are,
-see kernel and frontend files for actual implementation details.
-
-General Message Format
-=====================
-
-General message format::
-
-    {
-        header : { 'msg_id' : 10,    # start with 0
-	           'username' : 'name',
-		   'session' : uuid
-		   },
-	parent_header : dict,
-        msg_type : 'string_message_type',
-        content : blackbox_dict , # Must be a dict
-    }
-
-Side effect: (PUB/SUB)
-======================
-
-# msg_type = 'stream'
-content = {
-    name : 'stdout',
-    data : 'blob',
-}
-
-# msg_type = 'pyin'
-content = {
-    code = 'x=1',
-}
-
-# msg_type = 'pyout'
-content = {
-    data = 'repr(obj)',
-    prompt_number = 10
-}
-
-# msg_type = 'pyerr'
-content = {
-    traceback : 'full traceback',
-    exc_type : 'TypeError',
-    exc_value :  'msg'
-}
-
-# msg_type = 'file'
-content = {
-    path = 'cool.jpg',
-    data : 'blob'
-}
-
-Request/Reply
-=============
-
-Execute
--------
-
-Request:
-
-# msg_type = 'execute_request'
-content = {
-    code : 'a = 10',
-}
-
-Reply:
-
-# msg_type = 'execute_reply'
-content = {
-  'status' : 'ok' OR 'error' OR 'abort'
-  # data depends on status value
-}
-
-Complete
---------
-
-# msg_type = 'complete_request'
-content = {
-    text : 'a.f',    # complete on this
-    line : 'print a.f'    # full line
-}
-
-# msg_type = 'complete_reply'
-content = {
-    matches : ['a.foo', 'a.bar']
-}
-
-Control
--------
-
-# msg_type = 'heartbeat'
-content = {
-
-}