summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2016-07-28 01:17:36 +0200
committerGitHub <noreply@github.com>2016-07-28 01:17:36 +0200
commitab5580e1528c2d4ecf295d8634881464c68af09d (patch)
tree63129b27c0ba70af260413f3f1c27571569b8b50
parentMerge branch 'hotfixes-v0.16.1' (diff)
parent3PID defined on first mention (diff)
downloadsynapse-ab5580e1528c2d4ecf295d8634881464c68af09d.tar.xz
Merge pull request #959 from evelynmitchell/patch-1
3PID defined on first mention
-rw-r--r--README.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.rst b/README.rst
index ebcb15a977..8cbd28fb8e 100644
--- a/README.rst
+++ b/README.rst
@@ -11,8 +11,8 @@ VoIP.  The basics you need to know to get up and running are:
   like ``#matrix:matrix.org`` or ``#test:localhost:8448``.
 
 - Matrix user IDs look like ``@matthew:matrix.org`` (although in the future
-  you will normally refer to yourself and others using a 3PID: email
-  address, phone number, etc rather than manipulating Matrix user IDs)
+  you will normally refer to yourself and others using a third party identifier 
+  (3PID): email address, phone number, etc rather than manipulating Matrix user IDs)
 
 The overall architecture is::