move processing options

1 files changed, 20 insertions, 29 deletions

diff --git a/draft-schanzen-r5n.xml b/draft-schanzen-r5n.xml
index f8c1294..1ff1e4a 100644
--- a/draft-schanzen-r5n.xml
+++ b/draft-schanzen-r5n.xml
@@ -234,8 +234,27 @@ GET(key[, options], callbackFunction)
        <t>
          The procedure takes two arguments. The first argument is the query
          key and is mandatory. The GET procedure may also allow the caller
-         to specifiy query options.
+         to specifiy <tt>RouteOptions</tt> in order to indicate certain
+         processing requirements for messages.
+         Any combination of options may be specificied.
        </t>
+       <dl>
+         <dt>DemultiplexEverywhere</dt>
+         <dd>
+           indicates that each peer along the way should process the request.
+         </dd>
+         <dt>RecordRoute</dt>
+         <dd>
+           indicates to keep track of the route that the message takes
+           in the P2P network.
+         </dd>
+         <dt>FindPeer</dt>
+         <dd>
+           indicates that this is a request used to find additional peers.
+           This is a special flag which modifies the message processing to
+           allow approximate results.
+         </dd>
+       </dl>
        <t>
          The procedure either returns a list of results or allows the caller
          to provide a callback function which is called for any result
@@ -528,34 +547,6 @@ END
 
 
       </section>
-      <section anchor="p2p_opts" numbered="true" toc="default">
-        <name>Processing options</name>
-        <t>
-          In order to indicate certain processing requirements for messages
-          a number of processing options may be specificied in the respective
-          field of the signalling messages.
-          The options field is 8 octets in length and each options is encoded
-          in a single bit.
-        </t>
-       <dl>
-         <dt>Demultiplex everywhere (0)</dt>
-         <dd>
-           Each peer along the way should process the request. Otherwise
-           only peers that are locally closest to the key and no longer in the
-           random path mode should process it.
-         </dd>
-         <dt>Record route (1)</dt>
-         <dd>
-           Indicates to keep track of the route that the message
-           took in the P2P network.
-         </dd>
-         <dt>Find peer (2)</dt>
-         <dd>
-           Indicates a 'FIND-PEER' request. Implies that approximate results are
-           acceptable.
-         </dd>
-       </dl>
-      </section>
       <section anchor="p2p_xq" numbered="true" toc="default">
         <name>Extended query</name>
         <t>TODO: What is this for? Not documented anywhere</t>