From 99a0873510025f9adff38a40942e014337504a25 Mon Sep 17 00:00:00 2001
From: Markus Sabadello <markus@danubetech.com>
Date: Sat, 19 Oct 2019 23:54:01 +0400
Subject: [PATCH] Make "id" optional for services and public keys. Fix #47.

* Make "id" optional for services and public keys.
* Change MAY to SHOULD for public keys.
* Change MAY to SHOULD for service endpoints.
* Say "multiple" instead of "duplicate" entries.
* Apply suggestion from @msporny.
* Add comment about producing an error.
* Address feedback at https://github.com/w3c/did-spec/pull/66#discussion_r335776271.
---
 index.html | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index ebd638da..a6d0cd94 100644
--- a/index.html
+++ b/index.html
@@ -1249,9 +1249,15 @@ <h2>
         </li>
 
         <li>
-Each public key MUST include <code>id</code> and <code>type</code>
-properties, and exactly one value property. The array of public keys
-MUST NOT contain duplicate entries with the same <code>id</code>.
+Each public key SHOULD include an <code>id</code> property. The array
+of public keys MUST NOT contain multiple entries with the same
+<code>id</code>. A <a>DID document</a> processor MUST produce an error in that
+case.
+        </li>
+
+        <li>
+Each public key MUST include a <code>type</code> property
+and exactly one public key value, and MAY include additional properties.
         </li>
 
         <li>
@@ -1544,9 +1550,16 @@ <h2>
         </li>
 
         <li>
-Each <a>service endpoint</a> MUST include <code>id</code>,
-<code>type</code>, and <code>serviceEndpoint</code> properties, and
-MAY include additional properties.
+Each <a>service endpoint</a> SHOULD include an <code>id</code> property.
+The array of <a>service endpoints</a> MUST NOT contain multiple entries
+with the same <code>id</code>. A <a>DID document</a> processor MUST
+produce an error in that case.
+        </li>
+
+        <li>
+Each service endpoint MUST include <code>type</code> and
+<code>serviceEndpoint</code> properties, and MAY include additional
+properties.
         </li>
 
         <li>