summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-12 11:50:42 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-12 11:50:49 +0100
commiteec83264bafeacc95e2293527f1df87c2f222a64 (patch)
treef7a69ebc8a39f5b545639c384999872f07cf73ef
parentdf4f357ccf7f4561584d95e9bc3c19fa6d4d05a2 (diff)
parentfa01a6981630b374789ee3c2723cd45a68ad101b (diff)
Merge remote-tracking branch 'jonny/call-typos'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--spec/Channel_Type_Call.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index 6deab1fd..eee38a95 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -613,7 +613,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
the remote client indicates that the user has been notified about
the call. If the network is known not to provide feedback about whether
the remote side is ringing, then the call should immediately be
- set to Ringing.</li>
+ set to Initialised.</li>
<li>Initialising → Initialised (for incoming calls, when e.g. the
implementation has been initialised far enough that it is sensible
to notify the user about the call (to reduce the probability that
@@ -1151,7 +1151,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<tp:rationale>
<p>A connection manager might be intended for a specialized hardware
device, which will take care of the audio streaming (e.g.
- telepathy-yafono, which uses GSM hardware which does the actual
+ telepathy-ring, which uses GSM hardware which does the actual
audio streaming for the call).</p>
</tp:rationale>