Merge branch 'master' into p2p-nip

1 files changed, 8 insertions, 9 deletions

diff --git a/58.md b/58.md
index 4a9ed4c..23921bd 100644
--- a/58.md
+++ b/58.md
@@ -9,12 +9,11 @@ Badges
 Three special events are used to define, award and display badges in
 user profiles:
 
-1. A "Badge Definition" event is defined as a parameterized replaceable event with kind `30009` having a `d` tag with a value that uniquely identifies the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can be updated.
+1. A "Badge Definition" event is defined as an addressable event with kind `30009` having a `d` tag with a value that uniquely identifies the badge (e.g. `bravery`) published by the badge issuer. Badge definitions can be updated.
 
 2. A "Badge Award" event is a kind `8` event with a single `a` tag referencing a "Badge Definition" event and one or more `p` tags, one for each pubkey the badge issuer wishes to award. Awarded badges are immutable and non-transferrable.
 
-3. A "Profile Badges" event is defined as a parameterized replaceable event
-with kind `30008` with a `d` tag with the value `profile_badges`.
+3. A "Profile Badges" event is defined as an _addressable event_ with kind `30008` with a `d` tag with the value `profile_badges`.
 Profile badges contain an ordered list of pairs of `a` and `e` tags referencing a `Badge Definition` and a `Badge Award` for each badge to be displayed.
 
 ### Badge Definition event
@@ -74,7 +73,7 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
 
 ### Example of a Badge Definition event
 
-```json
+```jsonc
 {
   "pubkey": "alice",
   "kind": 30009,
@@ -85,13 +84,13 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
     ["image", "https://nostr.academy/awards/bravery.png", "1024x1024"],
     ["thumb", "https://nostr.academy/awards/bravery_256x256.png", "256x256"]
   ],
-  ...
+  // other fields...
 }
 ```
 
 ### Example of Badge Award event
 
-```json
+```jsonc
 {
   "id": "<badge award event id>",
   "kind": 8,
@@ -101,14 +100,14 @@ Clients SHOULD attempt to render the most appropriate badge thumbnail according
     ["p", "bob", "wss://relay"],
     ["p", "charlie", "wss://relay"]
   ],
-  ...
+  // other fields...
 }
 ```
 
 ### Example of a Profile Badges event
 
 Honorable Bob The Brave:
-```json
+```jsonc
 {
   "kind": 30008,
   "pubkey": "bob",
@@ -119,6 +118,6 @@ Honorable Bob The Brave:
     ["a", "30009:alice:honor"],
     ["e", "<honor badge award event id>", "wss://nostr.academy"]
   ],
-  ...
+  // other fields...
 }
 ```