]> git.0d.be Git - empathy.git/commitdiff
[help] Updated help against new upcoming version
authorMilo Casagrande <milo@ubuntu.com>
Sun, 14 Feb 2010 21:48:42 +0000 (22:48 +0100)
committerMilo Casagrande <milo@ubuntu.com>
Sun, 14 Feb 2010 21:48:42 +0000 (22:48 +0100)
* Added logo to the front page
* Added a new small topic on the /help IRC command
* Added license page and license reference to all pages
* Added some links group
* Fixed validity errors
* Removed legal.xml
* Updated Makefile

47 files changed:
help/C/account-irc.page
help/C/account-jabber.page
help/C/accounts-window.page
help/C/add-account.page
help/C/add-contact.page
help/C/audio-call.page
help/C/audio-video.page
help/C/change-status.page
help/C/create-account.page
help/C/disable-account.page
help/C/favorite-rooms.page
help/C/figures/empathy-logo.png [new file with mode: 0644]
help/C/geolocation-not-showing.page
help/C/geolocation-privacy.page
help/C/geolocation-supported.page
help/C/geolocation-turn.page
help/C/geolocation-what-is.page
help/C/geolocation.page
help/C/group-conversations.page
help/C/import-account.page
help/C/index.page
help/C/introduction.page
help/C/irc-commands.page [new file with mode: 0644]
help/C/irc-join-pwd.page
help/C/irc-join-room.page
help/C/irc-manage.page
help/C/irc-nick-password.page
help/C/irc-send-file.page
help/C/irc-start-conversation.page
help/C/legal.xml [deleted file]
help/C/license.page [new file with mode: 0644]
help/C/offline-contacts.page
help/C/prev-conv.page
help/C/prob-conn-acctdisabled.page
help/C/prob-conn-auth.page
help/C/prob-conn-name.page
help/C/prob-conn-neterror.page
help/C/prob-conn.page
help/C/remove-account.page
help/C/salut-protocol.page
help/C/send-file.page
help/C/send-message.page
help/C/set-custom-status.page
help/C/share-desktop.page
help/C/status-icons.page
help/C/video-call.page
help/Makefile.am

index 01da491bc6fa9a6aa17317c1509d905dc794ea97..af41920f451436f0b2803f262167153ca111a130 100644 (file)
@@ -4,6 +4,7 @@
       id="account-irc">
 
   <info>
+    <desc>Additional information necessary for connecting to IRC networks.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-31" status="review">
       <!--
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> 
 -->
-    <desc>Additional information necessary for connecting to IRC networks.</desc>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
   <title>IRC Account Details</title>
index 0da3833721b1e0ecb003edbb3d2a8a05c3db6349..efa22d1b5e9088fdb37ac62e886a3617a3ffa814 100644 (file)
@@ -4,6 +4,7 @@
       id="account-jabber">
 
   <info>
+    <desc>Advanced options for Jabber and Google Talk accounts.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-27" status="review">
       <!--
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
-    <desc>Advanced options for Jabber and Google Talk accounts.</desc>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Jabber Account Details</title>
index 805646c23d420943f172ec1b568d42ae6a0d1a03..8e25b80a27ec902f2054cb8b6877dab69af8adcf 100644 (file)
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Accounts Window</title>
index 215a368d3e30b3b5008784348759d928a34db92d..ddb1e4d3a3b2d716814fe9bd6fbb410cc645cb39 100644 (file)
@@ -14,6 +14,7 @@
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.3" date="2010-02-03" status="review"/>    
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Add a new account</title>
       <gui>Accounts</gui></guiseq>, or press <key>F4</key>.</p>
     </item>
     <item>
-      <p>Click the <gui style="button">Add</gui> button.</p>
+      <p>
+        Click <gui style="button">Add</gui>.
+      </p>
     </item>
     <item>
-      <p>From the <gui>Add new</gui> drop-down list, select the type of account you wish
+      <p>From the <gui>Protocol</gui> drop-down list, select the type of account you wish
       to add.</p>
     </item>
     <item>
-      <p>If you do not already have a registered account, select <gui>Create a new account</gui>.
+      <p>If you do not already have a registered account, select <gui>Create a new account on the server</gui>.
       This feature is not available for all account types, and may not work with some account
       providers.  See <link xref="create-account"/> for more information.</p>
     </item>
-    <item>
-      <p>Click <gui>Create</gui>.</p>
-    </item>
     <item>
       <p>Enter the required information.  For most accounts, you will only need
       a login ID and a password.  Some accounts may require additional information.
       See <link xref="accounts-window#details"/> for more information.</p>
-    </item>
+    </item>    
     <item>
-      <p>Click <gui style="button">Connect</gui> to enable the new account.</p>
-
-      <!-- TODO: check if it's a bug or what. In case, this part needs to
-      be removed or we must signal it as a bug! -->
-
-      <note style="warning">
-        <p>If you close the <gui>Accounts</gui> window without clicking
-        <gui>Connect</gui>, the entire account will be lost, and you will
-        need to create it again.</p>
-        <p>If you select another account without clicking <gui>Connect</gui>,
-        any information you have entered will be lost.</p>
-      </note>
+      <p>
+        Click <gui style="button">Save</gui>.
+      </p>
     </item>
   </steps>
 
   <note style="tip">
-    <p>To change the name the identifies the account in the <gui>Accounts</gui>
+    <p>To change the name that identifies the account in the <gui>Accounts</gui>
     window, select the account from the list on the left and either click on the
     name or press the space bar.  Edit the account name and press <key>Enter</key>
     when you’re finished.</p>
index b9a47c8ad8d2afada8af7d950fcb579ad008da4a..0bf6a0b5470d5c79fba3838f6e9e6e659287a71f 100644 (file)
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Add someone to your list of contacts</title>
index ab1f2471e33c30621666ae651dee8d2313febb53..dd66ce3d52bda6b249f19762bfe63b49b4d3ed6a 100644 (file)
       <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>    
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Start an audio conversation</title>
   <p>You can call your contacts and have an audio conversation with them.
   This features only works with certain types of accounts, and it requires
   the other person to have an application that supports audio calls.</p>
-
+<!--
   <comment>
     <cite date="2009-09-02">Shaun McCance</cite>
     <p>Link to A/V support matrix</p>
   </comment>
-
+-->
   <steps>
     <item>
       <p>From the <gui>Contact List</gui> window, click the
       <media type="image" mime="image/png" src="figures/audio-input-microphone.png">audio call</media>
-      icon next to the name of the contact you wish to call.  Alternatively,
-      right click the contact and choose <gui>Audio Call</gui>.</p>
+      icon next to the name of the contact you wish to call and choose <gui style="menuitem">Audio Call</gui>.
+       Alternatively, right click the contact and choose <gui style="menuitem">Audio Call</gui>.</p>
     </item>
     <item>
       <p>A new window will open. When the connection is established, you will
       total conversation time.</p>
     </item>
     <item>
-      <p>To end the conversation, choose <guiseq><gui>Call</gui><gui>Hang up</gui></guiseq>.</p>
+      <p>To end the conversation, choose <guiseq><gui style="menu">Call</gui><gui style="menuitem">Hang up</gui></guiseq>.</p>
     </item>
   </steps>
   <note style="tip">
     <p>To turn an audio conversation into a video conversation, choose
-    <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the
+    <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video On</gui></guiseq>, or click the
     <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
     toolbar button to select it.</p>
   </note>
index bbc8b0aca333672fa8e6b744c8fda16da99a6bd8..f7589696f0d6cbf06c77449aa3e0e212dd9c94df 100644 (file)
       <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.2" date="2010-02-14" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Audio and Video Support</title>
         <td><p>No</p></td>
         <td><p>No</p></td>
       </tr>
+      <tr>
+        <td><p>Facebook Chat</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
       <tr>
         <td><p>gadugadu</p></td>
         <td><p>No</p></td>
index c036e9f7a8bc8f2c3903f2b0c9cdb093861b160b..ad3b6f7a3852c0330e1086da7c2273d12d19a381 100644 (file)
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Change your status</title>
index 2935d9f04a72ff58230fc9831bbe4eca4871a4e8..c478d7d4f1ee25c1d830f4b4a44b0c0e3528b3eb 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Register for a new account</title>
index 5589a58806f9164a24e02372c2a97c073a81ecc8..789100c5091f76100db269f104a939a8584b1c66 100644 (file)
@@ -15,6 +15,7 @@
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.5" date="2010-02-03" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Disable an account</title>
     </item>
     <item>
       <p>Deselect <gui style="checkbox">Enabled</gui> on the right side of the
-      window.  This option is after your primary account details, but before
-      any advanced settings.</p>
-    </item>
-    <item>
-      <p>
-        Click <gui style="button">Apply</gui>.
+      window.
       </p>
     </item>
   </steps>
 
-  <p>To re-enable the account, simply select <gui style="checkbox">Enabled</gui>
-  and click <gui>Apply</gui>.</p>
-
+  <p>
+    To re-enable the account, simply select <gui style="checkbox">Enabled</gui>.
+  </p>
 </page>
index a86e3644f7edb68ea1fc0b5a27362b2db1eb11fe..6c14d1761f8d2fb3a2414dca557b6124dec62a59 100644 (file)
@@ -9,17 +9,21 @@
     <link type="seealso" xref="group-conversations"/>
     <desc>Set, join and manage favorite rooms.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-21" status="draft"/>
+    <revision pkgversion="2.30" version="0.2" date="2010-02-03" status="review"/>    
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Favorite rooms</title>
@@ -49,7 +53,7 @@
     <item>
       <p>
         From the conversation window, choose 
-        <guiseq><gui>Conversation</gui><gui>Favorite Chatroom</gui></guiseq>.
+        <guiseq><gui>Conversation</gui><gui>Favorite Chat Room</gui></guiseq>.
       </p>
     </item>
   </steps>
diff --git a/help/C/figures/empathy-logo.png b/help/C/figures/empathy-logo.png
new file mode 100644 (file)
index 0000000..cd58a71
Binary files /dev/null and b/help/C/figures/empathy-logo.png differ
index 6a20ceb5b6754ecb81096c0302673b69db32bb33..4bbd5a31bb636dcd409a4ed0a392c43a0bedc57d 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Geographical position not published</title>
index bbfebb31323368c9040bd7eb8aa52fe10274c570..86bae2ec8e6827abf3e6099eedc736cb2b48a794 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Geolocation Privacy</title>
index 66042e8902d1c55edbf00ea00dbaced45ab69dc0..8672b825a5103bd6639539e00fa9c24a907de000 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Supported services</title>
index 1c2b85628a2a84256027785860039a0bacf41c1e..a3e620c1b1b663fafe378ef5a72da0d19b1c5df0 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Activate/Deactivate geolocation</title>
index 1eb1084eb266893c97e62220767761192086a872..dd70be3cfa42f79c7dd093691d53629efc9005d6 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>What is geolocation</title>
index e738fc42f4127cb49a12c14f72d78fcdd3890c3c..8e06875f23589f55a7022dbaa0e5a74af55e78f5 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
   
   <title>Geographical position</title>
index bcfe5aa20dd7dbcd52253891d20498dde7174709..e0b2851eb6131c845750f297d7fa8d983cdc0197 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Group conversations</title>
index c25d70b463dda564c249689f9c2c0d3589598b65..c1411cbf655fa55034bef225206c4539015a3ee5 100644 (file)
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Import an existing account</title>
index 6860851295f327f03330b3133c6bbaca68fe2066..219654587bd51d50021f6bd955d5d8a58c3a261e 100644 (file)
@@ -4,27 +4,29 @@
       id="index">
 
   <info>
+    <title type="link">Empathy Instant Messenger</title>
+    <title type="text">Empathy Instant Messenger</title>
     <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/>
-    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-09-05" status="review">
       <!--
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       -->
     </revision>
-    <revision pkgversion="2.28" version="0.2" date="2009-09-05" status="review"/>
+    <revision pkgversion="2.30" version="0.3" date="2010-02-03" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
-<!--
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
--->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
   </info>
 
-  <title>Empathy Instant Messenger</title>
+  <title>
+    <media type="image" mime="image/png" src="figures/empathy-logo.png">Empathy Instant Messenger logo</media>
+    Empathy Instant Messenger
+  </title>
 
   <section id="text-conv" style="2column">
     <title>Text Conversations</title>
index e3ce7e9091a8540c0640e936d48a60fd448a9726..7dc2441e961863633f2b605635c8112f14b7a590 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Introduction</title>
diff --git a/help/C/irc-commands.page b/help/C/irc-commands.page
new file mode 100644 (file)
index 0000000..8bf07dc
--- /dev/null
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-commands">
+      
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>The supported IRC commands.</desc>
+    <revision pkgversion="2.30" version="0.1" date="2010-02-14" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+  </info>
+
+  <title>Supported IRC commands</title>
+  <p>
+    To see the list of the supported IRC commands, in a chat room type <input>/help</input>
+    and press <key>Enter</key>.
+  </p>
+  <note>
+    <p>
+      All commands available have a small description on their usage.
+    </p>
+  </note>
+</page>
index 0ea91df3601f31fdf93b508a57c126695ea76b6d..befbaf05ab1519774e627dfa3ecbbeeb669d139f 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Join a protected IRC chat room</title>
index ad3a3c575a27293ed772f1e0e866dda6de1cafc9..8a3a74d2e462f1e3ce312d632d7ce79d5f53cddf 100644 (file)
@@ -4,7 +4,7 @@
       id="irc-join-room">
 
   <info>
-    <link type="guide" xref="irc-manage#manage"/>
+    <link type="guide" xref="irc-manage#manage" group="one"/>
     <desc>Join an IRC channel.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Join an IRC chat room</title>
index fe7a50ea9b2c83082a0a961919ebb5b25f3499ca..1cd834c796ac3b4350f4d67b5da21f3e9a3dcdf1 100644 (file)
@@ -1,7 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
       type="guide" style="2column"
-      id="irc-manage">
+      id="irc-manage"
+      groups="one two">
 
   <info>
     <link type="guide" xref="index#text-conv"/>
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Internet Relay Chat (IRC)</title>
index 30e8c08bef339d11e13e0efc5ab3935cea2e91d1..4d3d02e51c45a6d5a433475f2f589ef774cd7440 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Use a nickname password on IRC</title>
index 81f5d7d2d2ab2f267769f6a91e1229fa1f81228b..4decfba4760c62345d3076f52a6dbc6b9ec94174 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Send files over IRC</title>
index 6e1e312aea293d5a4a920d1b9c37ceffeeecd871..3d04c8db34b5d28313852a21e6de5215c9c9939c 100644 (file)
@@ -4,7 +4,7 @@
       id="irc-start-conversation">
 
   <info>
-    <link type="guide" xref="irc-manage#manage"/>
+    <link type="guide" xref="irc-manage#manage" group="two"/>
     <desc>Start a conversation witn an IRC contact.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
       <!--
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Chat with somebody on IRC</title>
diff --git a/help/C/legal.xml b/help/C/legal.xml
deleted file mode 100644 (file)
index 86d6173..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<license xmlns="http://projectmallard.org/1.0/"
-         href="http://creativecommons.org/licenses/by-sa/3.0/">
-<p>This work is licensed under a
-<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-Attribution-Share Alike 3.0 Unported License</link>.</p>
-<p>As a special exception, the copyright holders give you permission to copy,
-modify, and distribute the example code contained in this document under the
-terms of your choosing, without restriction.</p>
-</license>
diff --git a/help/C/license.page b/help/C/license.page
new file mode 100644 (file)
index 0000000..312b6cf
--- /dev/null
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="license">
+  
+  <info>
+    <link type="seealso" xref="index"/>
+    <revision pkgversion="2.30" version="0.1" date="2009-12-28" status="draft"/>
+    <desc>Legal information.</desc>
+  </info>
+
+  <title>License</title>
+  <p>
+    <!-- 
+    Translators: try to use the same translation as the one provided by the CreativeCommons website. 
+    If there is no translation for your language, consider providing one to CreativeCommons.
+    -->
+    This work is distributed under a CreativeCommons Attribution-Share Alike
+    3.0 Unported license.
+  </p>
+  <p>
+    You are free:
+  </p>
+  <terms>
+    <item>
+      <title><em>To share</em></title>
+      <p>To copy, distribute and transmit the work.</p>
+    </item>
+    <item>
+      <title><em>To remix</em></title>
+      <p>To adapt the work.</p> 
+    </item>
+  </terms>
+  <p>
+    Under the following conditions:
+  </p>
+  <terms>
+    <item>
+      <title><em>Attribution</em></title>
+      <p>
+        You must attribute the work in the manner specified by the author or 
+        licensor (but not in any way that suggests that they endorse you or 
+        your use of the work).  
+      </p>
+    </item>
+    <item>
+      <title><em>Share Alike</em></title>
+      <p>
+        If you alter, transform, or build upon this work, you may distribute the 
+        resulting work only under the same, similar or a compatible license.  
+      </p>
+    </item>
+  </terms>
+  <p>
+    <!-- Translators: there are no official localized versions of the legal code, only the deed is localized. -->
+    For the full text of the license, see the 
+    <link href="http://creativecommons.org/licenses/by-sa/3.0/legalcode">CreativeCommons website</link>, 
+    or read the full <link href="http://creativecommons.org/licenses/by-sa/3.0/">Commons Deed</link>. 
+  </p>
+</page>
index 53d5f9c18098c7830a2038ae6965ea820a3256db..33e1de215685c0e8247a55ad3fbf8d06b8f0be13 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
        <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Show offline contacts</title>
index 3831885eac89311177fda06d6381304a21c429d8..a1668dfe11733c3e3d1b86fb28df4c5507b4b014 100644 (file)
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>View previous conversations</title>
index bb84dc5e3aa5e005f96058c46a3d2685e7e29430..775ef29300230a4586fce7b9de8dcec58bbf8dbf 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>My account is not enabled</title>
index 96426aa6739bed8ab4bf30ecae2bce4d135e746c..01d72fa9c5f2cfe506bdbc49a5e75c2f48da12a5 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>I get a message that says "Authentication failed"</title>
index 740ca7efa20f4df8c56acd1d280808641da0655a..810feffed389936c53f88a4428a7baf95a5f7283 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>I get a message that says “Name in use”</title>
index 9c3c928aab160adacdfeb4e4d223ce7e98464906..5e6b6b042a234d938cd10b92fd7fa32040b281fa 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>I get a message that says "Network error"</title>
index 49c5dafb9bf648821268ab15488694b24bbb67b8..332b2f56a78aa91c0e1c3b0e478b6697f6d08972 100644 (file)
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Problems connecting to an instant messaging service</title>
index b78a2c278b0609577bdf982cbe3929a996cd6266..2e025e8ced374f4dcacf351427bd232bd676e814 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Remove an account</title>
index 01be24a1b3241223c772c95e3a2a53e851dfa76d..ba060ce2213f0171435c43b29cfc8443ad9d9c72 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>What is People Nearby?</title>
index 61f88782926eefba040658087d1cc224c475226b..53c9cafd1bf58d1c301534b3ba2ba7f6e187d92c 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Send files</title>
index 97e7d2ec84dbb73daa9392508450b4b320190447..fed39f56d5142dc7ac296d41c5695de804e59cab 100644 (file)
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Send a message to someone</title>
index ed19da09512b89658f597eb8542d2ebffeb0c27e..f503073ef523161c1dec588fb0ca656ce63c7957 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Set a custom message</title>
index da2a85df14be668139096d9c50d20a701a62f0d0..08a7dd6b4f5d0a36297ea650f698cfd9dd323c8d 100644 (file)
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+-->
   </info>
 
   <title>Share your desktop</title>
index b3d4ea0ee7f7827a4cae8c17c2c584e00e60edf9..be63f994d31f54ec602cfab400819cd97106de1e 100644 (file)
       <name>Shaun McCance</name>
       <email>shaunm@gnome.org</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
--->
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
   <title>Status Types and Icons</title>
index 559b288fc27b7f0831381a8e8ac1fe835df611ae..1e8a78ec0e467aff484bc78f63a3235f82089adf 100644 (file)
       <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
       -->
     </revision>
+    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>    
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
 <!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> 
 -->
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   <title>Start a video conversation</title>
 
@@ -39,8 +43,8 @@
     <item>
       <p>From the <gui>Contact List</gui> window, click the
       <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
-      icon next to the name of the contact you wish to call.  Alternatively,
-      right click the contact and choose <gui>Video Call</gui>.</p>
+      icon next to the name of the contact you wish to call and choose <gui style="menuitem">Video Call</gui>.  
+      Alternatively, right click the contact and choose <gui style="menuitem">Video Call</gui>.</p>
     </item>
     <item>
       <p>A new window will open. When the connection is established, you will
       total conversation time.</p>
     </item>
     <item>
-      <p>To end the conversation, choose <guiseq><gui>Call</gui><gui>Hang up</gui></guiseq>.</p>
+      <p>To end the conversation, choose <guiseq><gui style="menu">Call</gui><gui style="menuitem">Hang up</gui></guiseq>.</p>
     </item>
   </steps>
   <note style="tip">
     <p>To turn a video conversation into an audio conversation, choose
-    <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click the
+    <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>, or click the
     <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
     toolbar button to deselect it.</p>
   </note>
-
-
-
 </page>
index cb57b08c6a4a720bad312f51a1f9ca15685dcfea..76303c65f804fea0a5ad86499e29d863e8f4e466 100644 (file)
@@ -1,7 +1,6 @@
 include $(top_srcdir)/gnome-doc-utils.make
 
 DOC_ID = empathy
-DOC_INCLUDES = legal.xml
 DOC_FIGURES = \
        figures/audio-input-microphone.png \
        figures/available.png \
@@ -9,6 +8,7 @@ DOC_FIGURES = \
        figures/busy.png \
        figures/camera-web.png \
        figures/empathy-main-window.png \
+       figures/empathy-logo.png \
        figures/gtk-add.png \
        figures/gtk-edit.png \
        figures/gtk-remove.png \
@@ -36,12 +36,14 @@ DOC_PAGES = \
        import-account.page \
        index.page \
        introduction.page \
+       irc-commands.page \
        irc-join-pwd.page \
        irc-join-room.page \
        irc-manage.page \
        irc-nick-password.page \
        irc-send-file.page \
        irc-start-conversation.page \
+       license.page \
        offline-contacts.page \
        prev-conv.page \
        prob-conn-acctdisabled.page \
@@ -58,6 +60,5 @@ DOC_PAGES = \
        status-icons.page \
        video-call.page
 
-
 DOC_LINGUAS = ca cs de el en_GB es fi fr it ru sv
 dist-hook: doc-dist-hook