[Telepathy-commits] [telepathy-doc/master] docs/book/C/telepathy.xml: Channel: Moved the mention of TpChannel into the Requesting sub-section to avoid mentioning the functions before they have been introduced, and to remove duplication.

[Murray Cumming]

---
 ChangeLog                 |    8 +++++++-
 docs/book/C/telepathy.xml |    6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d516410..97ad56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2009-02-06  Murray Cumming  <murrayc at openismus.com>
+2009-02-10  Murray Cumming  <murrayc at openismus.com>
+
+	* docs/book/C/telepathy.xml: Channel: Moved the mention of TpChannel 
+	into the Requesting sub-section to avoid mentioning the functions 
+	before they have been introduced, and to remove duplication.
+
+2009-02-10  Murray Cumming  <murrayc at openismus.com>
 
 	* docs/book/C/telepathy.xml: Channel: Deal with TODOs, mentioning 
 	Capabilities and TpChannel.
diff --git a/docs/book/C/telepathy.xml b/docs/book/C/telepathy.xml
index ef747d4..673c3e3 100644
--- a/docs/book/C/telepathy.xml
+++ b/docs/book/C/telepathy.xml
@@ -604,8 +604,6 @@ AC_SUBST(EXAMPLE_LIBS)
   <!-- TODO: Mention that the base Channel interface provides channel type, handle and Interfaces 
      properties, and Close method, Closed signal? Only if we can say how it might be used. -->
 
-  <para><literal>telepathy-glib</literal> provides the <ulink url="&url_telepathy_glib_base;connection-requests.html"><classname>TpChannel</classname></ulink> proxy object, which can be created via <ulink url="&url_telepathy_glib_base;channel.html#tp-channel-new"><function>tp_channel_new()</function></ulink> with the object path provided, for instance, by the call to  <ulink url="&url_telepathy_glib_base;connection-requests.html#tp-cli-connection-interface-requests-call-create-channel"><function>tp_cli_connection_interface_requests_call_create_channel()</function></ulink>.</para>
-
   <!-- TODO: This seems superflous, but it was in the original ToC notes so somebody might think it's worth saying. murrayc -->
   <para>Of course, you would need two channels for two types of communication with the same contact, for instance if a user is simultaneously exchanging instant messages while in an audio call with the contaact.
   </para>
@@ -629,7 +627,9 @@ AC_SUBST(EXAMPLE_LIBS)
   <para>Alternatively, many Connection Managers allow you to specify an <indexterm><primary>Identifier</primary></indexterm><literal>Identifier</literal> (via the <property>TargetID</property> property) for the target contact or target list, instead of the <literal>Handle</literal> (via the <property>TargetHandle</property> property), if you do not yet have a <literal>Handle</literal>. For instance, this might be an individual's jabber address, a chat room name or the standard identifier for a server-defined list (see the <link linkend="sec-channel-contactlist-server-defined">Server-Defined Lists</link> section.</para>
 
 
-    <para>Telepathy-glib provides the <ulink url="&url_telepathy_glib_base;connection-requests.html#tp-cli-connection-interface-requests-call-create-channel"><function>tp_cli_connection_interface_requests_call_create_channel()</function></ulink> and <ulink url="&url_telepathy_glib_base;connection-requests.html#tp-cli-connection-interface-requests-call-ensure-channel"><function>tp_cli_connection_interface_requests_call_ensure_channel()</function></ulink> functions for this purpose.</para>
+    <para>Telepathy-glib provides the <ulink url="&url_telepathy_glib_base;connection-requests.html#tp-cli-connection-interface-requests-call-create-channel"><function>tp_cli_connection_interface_requests_call_create_channel()</function></ulink> and <ulink url="&url_telepathy_glib_base;connection-requests.html#tp-cli-connection-interface-requests-call-ensure-channel"><function>tp_cli_connection_interface_requests_call_ensure_channel()</function></ulink> functions for this purpose. You may then create a <ulink url="&url_telepathy_glib_base;connection-requests.html"><classname>TpChannel</classname></ulink> proxy object via <ulink url="&url_telepathy_glib_base;channel.html#tp-channel-new"><function>tp_channel_new()</function></ulink> with the provided object path.</para>
+
+
   <!-- TODO: This is complex enough that this is an ideal place for Davyd's snippet-of-a-full-example feature. --> 
 
     <note>
-- 
1.5.6.5