merge nips 12, 16, 20 and 33 into nip 01 (#703)

Co-authored-by: Viktor Vsk <me@viktorvsk.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/11.md b/11.md
index ec46b36..c71f89e 100644
--- a/11.md
+++ b/11.md
@@ -118,7 +118,7 @@ field of any event. This is a count of unicode characters. After
 serializing into JSON it may be larger (in bytes), and is still
 subject to the `max_message_length`, if defined.
 
-- `min_pow_difficulty`: new events will require at least this difficulty of PoW, 
+- `min_pow_difficulty`: new events will require at least this difficulty of PoW,
 based on [NIP-13](13.md), or they will be rejected by this server.
 
 - `auth_required`: this relay requires [NIP-42](42.md) authentication
@@ -129,7 +129,7 @@ Even if set to False, authentication may be required for specific actions.
 
 ### Event Retention ###
 
-There may be a cost associated with storing data forever, so relays 
+There may be a cost associated with storing data forever, so relays
 may wish to state retention times. The values stated here are defaults
 for unauthenticated users and visitors. Paid users would likely have
 other policies.
@@ -151,7 +151,7 @@ all, and preferably an error will be provided when those are received.
 }
 ```
 
-`retention` is a list of specifications: each will apply to either all kinds, or 
+`retention` is a list of specifications: each will apply to either all kinds, or
 a subset of kinds. Ranges may be specified for the kind field as a tuple of inclusive
 start and end values. Events of indicated kind (or all) are then limited to a `count`
 and/or time period.
@@ -161,8 +161,7 @@ a specific `kind` number, by giving a retention time of zero for those `kind` va
 While that is unfortunate, it does allow clients to discover servers that will
 support their protocol quickly via a single HTTP fetch.
 
-There is no need to specify retention times for _ephemeral events_ as defined
-in [NIP-16](16.md) since they are not retained.
+There is no need to specify retention times for _ephemeral events_ since they are not retained.
 
 
 ### Content Limitations ###
@@ -271,7 +270,7 @@ A URL pointing to an image to be used as an icon for the relay. Recommended to b
 As of 2 May 2023 the following `curl` command provided these results.
 
         >curl -H "Accept: application/nostr+json" https://eden.nostr.land
-        
+
         {"name":"eden.nostr.land",
         "description":"Eden Nostr Land - Toronto 1-01",
         "pubkey":"00000000827ffaa94bfea288c3dfce4422c794fbb96625b6b31e9049f729d700",
@@ -293,5 +292,5 @@ As of 2 May 2023 the following `curl` command provided these results.
                                   "payment_required":true},
         "payments_url":"https://eden.nostr.land/invoices",
         "fees":{"admission":[{"amount":5000000,"unit":"msats"}],
-                "publication":[]}}, 
+                "publication":[]}},
     "icon": "https://nostr.build/i/53866b44135a27d624e99c6165cabd76ac8f72797209700acb189fce75021f47.jpg"