[help] Updated help against new upcoming version

* 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, 308 insertions, 110 deletions

diff --git a/help/C/account-irc.page b/help/C/account-irc.page
index 01da491bc..af41920f4 100644
--- a/help/C/account-irc.page
+++ b/help/C/account-irc.page
@@ -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"/>
@@ -13,14 +14,16 @@
       <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>
diff --git a/help/C/account-jabber.page b/help/C/account-jabber.page
index 0da383372..efa22d1b5 100644
--- a/help/C/account-jabber.page
+++ b/help/C/account-jabber.page
@@ -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"/>
@@ -13,14 +14,16 @@
       <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>
diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page
index 805646c23..8e25b80a2 100644
--- a/help/C/accounts-window.page
+++ b/help/C/accounts-window.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/add-account.page b/help/C/add-account.page
index 215a368d3..ddb1e4d3a 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -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>
@@ -22,13 +23,16 @@
       <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>
@@ -44,43 +48,33 @@
       <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>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index b9a47c8ad..0bf6a0b54 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index ab1f2471e..dd66ce3d5 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -13,17 +13,21 @@
       <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>
@@ -31,18 +35,18 @@
   <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
@@ -50,12 +54,12 @@
       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>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
index bbc8b0aca..f7589696f 100644
--- a/help/C/audio-video.page
+++ b/help/C/audio-video.page
@@ -12,17 +12,21 @@
       <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>
@@ -133,6 +137,11 @@
         <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>
         <td><p>No</p></td>
diff --git a/help/C/change-status.page b/help/C/change-status.page
index c036e9f7a..ad3b6f7a3 100644
--- a/help/C/change-status.page
+++ b/help/C/change-status.page
@@ -19,13 +19,16 @@
       <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>
diff --git a/help/C/create-account.page b/help/C/create-account.page
index 2935d9f04..c478d7d4f 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
index 5589a5880..789100c50 100644
--- a/help/C/disable-account.page
+++ b/help/C/disable-account.page
@@ -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>
@@ -23,13 +24,16 @@
       <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>
@@ -50,17 +54,12 @@
     </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>
diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page
index a86e3644f..6c14d1761 100644
--- a/help/C/favorite-rooms.page
+++ b/help/C/favorite-rooms.page
@@ -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
index 000000000..cd58a7134
--- /dev/null
+++ b/help/C/figures/empathy-logo.png
diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page
index 6a20ceb5b..4bbd5a31b 100644
--- a/help/C/geolocation-not-showing.page
+++ b/help/C/geolocation-not-showing.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page
index bbfebb313..86bae2ec8 100644
--- a/help/C/geolocation-privacy.page
+++ b/help/C/geolocation-privacy.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page
index 66042e890..8672b825a 100644
--- a/help/C/geolocation-supported.page
+++ b/help/C/geolocation-supported.page
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page
index 1c2b85628..a3e620c1b 100644
--- a/help/C/geolocation-turn.page
+++ b/help/C/geolocation-turn.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page
index 1eb1084eb..dd70be3cf 100644
--- a/help/C/geolocation-what-is.page
+++ b/help/C/geolocation-what-is.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/geolocation.page b/help/C/geolocation.page
index e738fc42f..8e06875f2 100644
--- a/help/C/geolocation.page
+++ b/help/C/geolocation.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page
index bcfe5aa20..e0b2851eb 100644
--- a/help/C/group-conversations.page
+++ b/help/C/group-conversations.page
@@ -19,13 +19,16 @@
       <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>
diff --git a/help/C/import-account.page b/help/C/import-account.page
index c25d70b46..c1411cbf6 100644
--- a/help/C/import-account.page
+++ b/help/C/import-account.page
@@ -27,13 +27,16 @@
       <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>
diff --git a/help/C/index.page b/help/C/index.page
index 686085129..219654587 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -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>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index e3ce7e909..7dc2441e9 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -13,13 +13,16 @@
       <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
index 000000000..8bf07dc86
--- /dev/null
+++ b/help/C/irc-commands.page
@@ -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>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index 0ea91df36..befbaf05a 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
index ad3a3c575..8a3a74d2e 100644
--- a/help/C/irc-join-room.page
+++ b/help/C/irc-join-room.page
@@ -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">
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index fe7a50ea9..1cd834c79 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -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"/>
@@ -17,13 +18,16 @@
       <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>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 30e8c08be..4d3d02e51 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/irc-send-file.page b/help/C/irc-send-file.page
index 81f5d7d2d..4decfba47 100644
--- a/help/C/irc-send-file.page
+++ b/help/C/irc-send-file.page
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page
index 6e1e312ae..3d04c8db3 100644
--- a/help/C/irc-start-conversation.page
+++ b/help/C/irc-start-conversation.page
@@ -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">
       <!--
@@ -15,13 +15,16 @@
       <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
index 86d6173ad..000000000
--- a/help/C/legal.xml
+++ /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
index 000000000..312b6cfa0
--- /dev/null
+++ b/help/C/license.page
@@ -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>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
index 53d5f9c18..33e1de215 100644
--- a/help/C/offline-contacts.page
+++ b/help/C/offline-contacts.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
index 3831885ea..a1668dfe1 100644
--- a/help/C/prev-conv.page
+++ b/help/C/prev-conv.page
@@ -20,13 +20,16 @@
       <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>
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
index bb84dc5e3..775ef2930 100644
--- a/help/C/prob-conn-acctdisabled.page
+++ b/help/C/prob-conn-acctdisabled.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index 96426aa67..01d72fa9c 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -20,13 +20,16 @@
       <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>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 740ca7efa..810feffed 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 9c3c928aa..5e6b6b042 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
index 49c5dafb9..332b2f56a 100644
--- a/help/C/prob-conn.page
+++ b/help/C/prob-conn.page
@@ -14,13 +14,16 @@
       <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>
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
index b78a2c278..2e025e8ce 100644
--- a/help/C/remove-account.page
+++ b/help/C/remove-account.page
@@ -17,13 +17,16 @@
       <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>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
index 01be24a1b..ba060ce22 100644
--- a/help/C/salut-protocol.page
+++ b/help/C/salut-protocol.page
@@ -18,13 +18,16 @@
       <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>
diff --git a/help/C/send-file.page b/help/C/send-file.page
index 61f887829..53c9cafd1 100644
--- a/help/C/send-file.page
+++ b/help/C/send-file.page
@@ -21,13 +21,16 @@
       <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>
diff --git a/help/C/send-message.page b/help/C/send-message.page
index 97e7d2ec8..fed39f56d 100644
--- a/help/C/send-message.page
+++ b/help/C/send-message.page
@@ -16,13 +16,16 @@
       <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>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
index ed19da095..f503073ef 100644
--- a/help/C/set-custom-status.page
+++ b/help/C/set-custom-status.page
@@ -19,13 +19,16 @@
       <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>
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
index da2a85df1..08a7dd6b4 100644
--- a/help/C/share-desktop.page
+++ b/help/C/share-desktop.page
@@ -13,13 +13,16 @@
       <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>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
index b3d4ea0ee..be63f994d 100644
--- a/help/C/status-icons.page
+++ b/help/C/status-icons.page
@@ -20,13 +20,16 @@
       <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>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index 559b288fc..1e8a78ec0 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -16,17 +16,21 @@
       <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
@@ -48,16 +52,13 @@
       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>
diff --git a/help/Makefile.am b/help/Makefile.am
index cb57b08c6..76303c65f 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -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