From 23f5adcd9999b808c229a89b2639b40ac5e99a6f Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 25 Jan 2019 14:52:52 +0000
Subject: [PATCH] I2CP markdown fixes Proposal 123 cleanups

---
 i2p2www/spec/i2cp.rst                         | 23 ++++++++++---------
 .../spec/proposals/123-new-netdb-entries.rst  | 22 +++++++++++-------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/i2p2www/spec/i2cp.rst b/i2p2www/spec/i2cp.rst
index 0db31a45..ae1f6346 100644
--- a/i2p2www/spec/i2cp.rst
+++ b/i2p2www/spec/i2cp.rst
@@ -526,18 +526,19 @@ Since release 0.9.38. See proposal 123 for more information.
 Contents
 ````````
 1. `Session ID`_
-2. Type: One byte type of lease set to follow
-         Type 1 is a [LeaseSet]_
-         Type 3 is a [LeaseSet2]_
-         Type 5 is a [EncryptedLeaseSet]_
-         Type 7 is a [MetaLeaseSet]_
+2. One byte type of lease set to follow.
+   Type 1 is a [LeaseSet]_
+   Type 3 is a [LeaseSet2]_
+   Type 5 is a [EncryptedLeaseSet]_
+   Type 7 is a [MetaLeaseSet]_
 3. [LeaseSet]_ or [LeaseSet2]_ or [EncryptedLeaseSet]_ or [MetaLeaseSet]_
-4. [SigningPrivateKey]_: type and length as inferred from the lease set signature
-                         (by dest signing key or transient key)
-                         Not present for MetaLeaseSet
-5. [PrivateKey]_ list: One for each public key in the lease set, in the same order
-                       Types and lengths as inferred from the public keys in the lease set
-                       Not present for MetaLeaseSet
+4. [SigningPrivateKey]_ type and length as inferred from the lease set signature
+   (by Destination or transient signing key).
+   Not present for MetaLeaseSet.
+5. [PrivateKey]_ list.
+   One for each public key in the lease set, in the same order.
+   Types and lengths as inferred from the public keys in the lease set.
+   Not present for MetaLeaseSet.
 
 Notes
 `````
diff --git a/i2p2www/spec/proposals/123-new-netdb-entries.rst b/i2p2www/spec/proposals/123-new-netdb-entries.rst
index 6ce3103f..d0cd1c79 100644
--- a/i2p2www/spec/proposals/123-new-netdb-entries.rst
+++ b/i2p2www/spec/proposals/123-new-netdb-entries.rst
@@ -18,10 +18,14 @@ Status
 Portions of this proposal are complete, and implemented in 0.9.38.
 The Common Structures, I2CP, I2NP, and other specifications
 are now updated to reflect the changes that are supported now.
+
 The completed portions are still subject to minor revision.
 Other portions of this proposal are still in development
 and subject to substantial revision.
 
+Service Lookup (types 9 and 11) are low-priority and
+unscheduled, and may be split off to a separate proposal.
+
 
 Overview
 ========
@@ -1361,8 +1365,6 @@ Notes
 Common Structures Spec Changes Required
 =======================================
 
-TODO
-
 
 Key Certificates
 ----------------
@@ -1371,16 +1373,21 @@ Out of scope for this proposal.
 Add to ECIES proposal.
 
 
-Lease2
-------
+New Intermediate Structures
+---------------------------
 
-Add new structure with 4-byte expiration.
+Add new structures for Lease2, MetaLease, LeaseSet2Header, and OfflineSignature.
+Effective as of release 0.9.38.
 
 
 New NetDB Types
 ---------------
 
-Incorporate from above.
+Add structures for each new leaseset type, incorporated from above.
+For LeaseSet2, EncryptedLeaseSet, and MetaLeaseSet,
+effective as of release 0.9.38.
+For Service Record and Service List,
+preliminary and unscheduled.
 
 
 
@@ -1388,14 +1395,13 @@ Encryption Spec Changes Required
 ================================
 
 Out of scope for this proposal.
-Add to ECIES proposal.
+See proposals 144 and 145.
 
 
 
 I2NP Changes Required
 =====================
 
-TODO
 Add note: LS2 can only be published to floodfills with a minimum version.