From 7a2aaeb97c359e3a300124b66bd468ef03507e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 2 Nov 2022 21:12:21 -0400
Subject: [PATCH] misc: replace "ring:" by "jami:"
Change-Id: Ifdee92480145ef56aafd93a914ae10982bd77eb0
---
developer/jami-identifiers.md | 4 ++--
developer/name-server-protocol.md | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/developer/jami-identifiers.md b/developer/jami-identifiers.md
index 094c97fe..e5b70d03 100644
--- a/developer/jami-identifiers.md
+++ b/developer/jami-identifiers.md
@@ -10,9 +10,9 @@ identifiers used in Jami with relevant examples.
- **Registered name** : a username associated to a Jami Infohash on
the blockchain such as `jeandupont`
- **URI** : a Jami or SIP URI such as
- `ring:3d1112ab2bb089370c0744a44bbbb0786418d40b` or `ring:jeandupont`
+ `jami:3d1112ab2bb089370c0744a44bbbb0786418d40b` or `jami:jeandupont`
or `<sip:nnnnn@host:5060>`. Must be compliant with [rfc3986](https://tools.ietf.org/html/rfc3986). If it's a SIP URI, it must be compliant with [rfc3261#19.1](https://tools.ietf.org/html/rfc3261#section-19.1).
-- **Canonical URI** : `ring:3d1112ab2bb089370c0744a44bbbb0786418d40b` or `sip:nnnnn@host:5060`. The most simplified form of the URI. Registered name must be resolved, doesn't include <> brackets or display name. Prefixed with the scheme (`ring:` or `sip:` or `sips:`).
+- **Canonical URI** : `jami:3d1112ab2bb089370c0744a44bbbb0786418d40b` or `sip:nnnnn@host:5060`. The most simplified form of the URI. Registered name must be resolved, doesn't include <> brackets or display name. Prefixed with the scheme (`jami:` or `sip:` or `sips:`).
- **User ID**: registered name (preferred) or public key fingerprint. User-facing identifier for an account public key.
- **Display name** or **Profile name** : an editable user-defined
profile name such as `Jean Dupont`.
diff --git a/developer/name-server-protocol.md b/developer/name-server-protocol.md
index 841e0b8b..7622fc1b 100644
--- a/developer/name-server-protocol.md
+++ b/developer/name-server-protocol.md
@@ -82,7 +82,7 @@ username is returned if one is registered on the name server.
### Request
-A request for the ID `ring:29347542eb07159f316577e1ae16243d152f6b7b`
+A request for the ID `jami:29347542eb07159f316577e1ae16243d152f6b7b`
is a `GET` request with
`/addr/`*`29347542eb07159f316577e1ae16243d152f6b7b`* as the URI.
--
GitLab