Merge branch 'human-id-rules' of github.com:matrix-org/matrix-doc into human-id-rules

This commit is contained in:
Kegan Dougal 2015-10-13 15:19:27 +01:00
commit 87f656ee0a

View file

@ -98,7 +98,7 @@ Room aliases cannot be rewritten as punycode and sent to the HS the alias is
referring to as the HS will not necessarily understand the rewritten alias. referring to as the HS will not necessarily understand the rewritten alias.
Other rejected solutions for failed checks Other rejected solutions for failed checks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ------------------------------------------
- Additional key: Informational key on the event attached by HS to say "unsafe - Additional key: Informational key on the event attached by HS to say "unsafe
ID". Problem: clients can just ignore it, and since it will appear only very ID". Problem: clients can just ignore it, and since it will appear only very
rarely, easy to forget when implementing clients. rarely, easy to forget when implementing clients.
@ -123,4 +123,3 @@ The capitalisation rules outlined above are nice but do not fully resolve issues
where ``@alice:example.com`` tries to speak with ``@bob:domain.com`` using where ``@alice:example.com`` tries to speak with ``@bob:domain.com`` using
``@Bob:domain.com``. It is up to ``domain.com`` to map ``Bob`` to ``bob`` in ``@Bob:domain.com``. It is up to ``domain.com`` to map ``Bob`` to ``bob`` in
a sensible way. a sensible way.