Merge branch 'master' into nip71-imeta

1 files changed, 36 insertions, 21 deletions

diff --git a/32.md b/32.md
index 92497a6..a99e52a 100644
--- a/32.md
+++ b/32.md
@@ -2,14 +2,13 @@ NIP-32
 ======
 
 Labeling
----------
+--------
 
 `draft` `optional`
 
-A label is a `kind 1985` event that is used to label other entities. This supports a number of use cases,
-including distributed moderation, collection management, license assignment, and content classification.
+This NIP defines two new indexable tags to label events and a new event kind (`kind:1985`) to attach those labels to existing events. This supports several use cases, including distributed moderation, collection management, license assignment, and content classification.
 
-This NIP introduces two new tags:
+New Tags:
 
 - `L` denotes a label namespace
 - `l` denotes a label
@@ -20,7 +19,7 @@ Label Namespace Tag
 An `L` tag can be any string, but publishers SHOULD ensure they are unambiguous by using a well-defined namespace
 (such as an ISO standard) or reverse domain name notation.
 
-`L` tags are REQUIRED in order to support searching by namespace rather than by a specific tag. The special `ugc`
+`L` tags are RECOMMENDED in order to support searching by namespace rather than by a specific tag. The special `ugc`
 ("user generated content") namespace MAY be used when the label content is provided by an end user.
 
 `L` tags starting with `#` indicate that the label target should be associated with the label's value.
@@ -29,7 +28,9 @@ This is a way of attaching standard nostr tags to events, pubkeys, relays, urls,
 Label Tag
 ----
 
-An `l` tag's value can be any string. `l` tags MUST include a `mark` matching an `L` tag value in the same event.
+An `l` tag's value can be any string. If using an `L` tag, `l` tags MUST include a mark matching an `L`
+tag value in the same event. If no `L` tag is included, a mark SHOULD still be included. If none is
+included, `ugc` is implied.
 
 Label Target
 ----
@@ -42,7 +43,7 @@ or topics respectively. As with NIP-01, a relay hint SHOULD be included when usi
 Content
 -------
 
-Labels should be short, meaningful strings. Longer discussions, such as for a review, or an
+Labels should be short, meaningful strings. Longer discussions, such as for an
 explanation of why something was labeled the way it was, should go in the event's `content` field.
 
 Self-Reporting
@@ -56,7 +57,7 @@ Example events
 
 A suggestion that multiple pubkeys be associated with the `permies` topic.
 
-```json
+```jsonc
 {
   "kind": 1985,
   "tags": [
@@ -65,13 +66,13 @@ A suggestion that multiple pubkeys be associated with the `permies` topic.
     ["p", <pubkey1>, <relay_url>],
     ["p", <pubkey2>, <relay_url>]
   ],
-  ...
+  // other fields...
 }
 ```
 
 A report flagging violence toward a human being as defined by ontology.example.com.
 
-```json
+```jsonc
 {
   "kind": 1985,
   "tags": [
@@ -80,13 +81,13 @@ A report flagging violence toward a human being as defined by ontology.example.c
     ["p", <pubkey1>, <relay_url>],
     ["p", <pubkey2>, <relay_url>]
   ],
-  ...
+  // other fields...
 }
 ```
 
 A moderation suggestion for a chat event.
 
-```json
+```jsonc
 {
   "kind": 1985,
   "tags": [
@@ -94,13 +95,13 @@ A moderation suggestion for a chat event.
     ["l", "approve", "nip28.moderation"],
     ["e", <kind40_event_id>, <relay_url>]
   ],
-  ...
+  // other fields...
 }
 ```
 
 Assignment of a license to an event.
 
-```json
+```jsonc
 {
   "kind": 1985,
   "tags": [
@@ -108,14 +109,14 @@ Assignment of a license to an event.
     ["l", "MIT", "license"],
     ["e", <event_id>, <relay_url>]
   ],
-  ...
+  // other fields...
 }
 ```
 
 Publishers can self-label by adding `l` tags to their own non-1985 events. In this case, the kind 1 event's author
 is labeling their note as being related to Milan, Italy using ISO 3166-2.
 
-```json
+```jsonc
 {
   "kind": 1,
   "tags": [
@@ -123,15 +124,29 @@ is labeling their note as being related to Milan, Italy using ISO 3166-2.
     ["l", "IT-MI", "ISO-3166-2"]
   ],
   "content": "It's beautiful here in Milan!",
-  ...
+  // other fields...
+}
+```
+
+Author is labeling their note language as English using ISO-639-1.
+
+```jsonc
+{
+  "kind": 1,
+  "tags": [
+    ["L", "ISO-639-1"],
+    ["l", "en", "ISO-639-1"]
+  ],
+  "content": "English text",
+  // other fields...
 }
 ```
 
 Other Notes
 -----------
 
-When using this NIP to bulk-label many targets at once, events may be deleted and a replacement
-may be published. We have opted not to use parameterizable/replaceable events for this due to the
+When using this NIP to bulk-label many targets at once, events may be requested for deletion using [NIP-09](09.md) and a replacement
+may be published. We have opted not to use addressable/replaceable events for this due to the
 complexity in coming up with a standard `d` tag. In order to avoid ambiguity when querying,
 publishers SHOULD limit labeling events to a single namespace.
 
@@ -154,8 +169,8 @@ be handled in some other way.
 
 
 Appendix: Known Ontologies
--------------------------
+--------------------------
 
 Below is a non-exhaustive list of ontologies currently in widespread use.
 
-- (social.ontolo.categories)[https://ontolo.social/]
+- [social.ontolo.categories](https://ontolo.social/)