1 files changed, 28 insertions, 9 deletions

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index 92815ef..9d7acc5 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -168,33 +168,44 @@ Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 \
        procedures and events:
      </t>
      <dl>
-       <dt>PEER_CONNECTIVITY_CHANGED</dt>
+       <dt>PEER_CONNECTED(pk,address)</dt>
        <dd>
-         is a signal that allows the DHT to react to peers which connect or
-         disconnect. Such an event triggers, for example, updates in the
+         is a signal that allows the DHT to react to peers which connect.
+         Such an event triggers, for example, updates in the
          routing table.
        </dd>
-       <dt>CONNECT</dt>
+       <dt>PEER_DISCONNECTED(pk,address)</dt>
+       <dd>
+         is a signal that allows the DHT to react to peers which disconnect.
+         Such an event triggers, for example, updates in the
+         routing table.
+       </dd>
+       <dt>CONNECT(address)</dt>
        <dd>
          A function which allows a peer to attempt the establishment of
          a connection to another peer using an address.
        </dd>
-       <dt>RECEIVE</dt>
+       <dt>DISCONNECT(address)</dt>
+       <dd>
+         A function which allows a peer to disconnect from
+         another peer.
+       </dd>
+       <dt>RECEIVE(source, message)</dt>
        <dd>
          A function or event that allows the peer to receive protocol
          messages as defined in this document from a connected peer.
        </dd>
-       <dt>SEND</dt>
+       <dt>SEND(source?, target)</dt>
        <dd>
          A function that allows a peer to send protocol messages as defined
          in this document to a connected peer.
        </dd>
-       <dt>NETWORK_SIZE_ESTIMATE</dt>
+       <dt>NETWORK_SIZE_ESTIMATE(N)</dt>
        <dd>
          A function or event that provides estimates on the network size
          for use in the DHT routing algorithms.
        </dd>
-       <dt>ADDRESS_CHANGED</dt>
+       <dt>ADDRESS_CHANGED(pk, address)</dt>
        <dd>
          An event that allows the DHT to learn and react to address changes
          of the peer. This information is used, for example, to publish
@@ -202,7 +213,15 @@ Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 \
        </dd>
      </dl>
    </section>
-
+   <section anchor="routing" numbered="true" toc="default">
+     <name>Routing</name>
+     <section anchor="peer_distance" numbered="true" toc="default">
+       <name>Peer distance</name>
+     </section>
+     <section anchor="peer_selection" numbered="true" toc="default">
+       <name>Peer selection</name>
+     </section>
+   </section>
    <section anchor="p2p_messages" numbered="true" toc="default">
      <name>Peer-to-peer wire formats</name>
       <section anchor="p2p_bf" numbered="true" toc="default">