New file salut-protocol.page: * Wrote small description of what the protocol is Work...

diff --git a/help/C/create-account.page b/help/C/create-account.page
index 5a2124f3e4da387091ca42771d8399e7f93fb4d9..6cfe2e5520436491e4267271c2acbd72f985c492 100644 (file)
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -1,15 +1,14 @@
 <page xmlns="http://projectmallard.org/1.0/"
       type="topic"
       id="create-account">
-
   <info>
     <link type="guide" xref="index#accounts"/>
     <link type="seealso" xref="add-account"/>
-    
-    <desc>Register an account with one of the supported messaging services.
+    <desc>
+      Register an account with one of the supported messaging services.
     </desc>
-    <revision version="3.0" date="2009-06-14" status="stub"/>
-
+    <revision version="3.0" date="2009-06-21" status="draft"/>
+    
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -30,93 +29,115 @@
     <p>Section about how to create an account.</p>
   </comment>
 
-
   <title>Register for a new account</title>
   
   <p>
     You can freely create an account on any of the following
     services. Follow the instructions reported on each website on
-    how to register your new account. At the end of the
-    registration process you should have a <em>user
-      name</em> (or an <em>account ID</em>) and
-      a <em>password</em> that you will use to
-    create the account in Empathy.
+    how to register your new account.
+  </p>
+  <p>
+    At the end of the registration process you should have a <em>user
+      name</em> (or an <em>account ID</em>) and a <em>password</em>
+      that you will use to add the account to <app>Empathy</app>.
   </p>
-  
   <p>
-    Click on the name of the service to visit its website:
+    Click on the name of the service to visit its website.
   </p>
   
   <section id="im-services">
     <title>Instant Messaging Services</title>
-    
+
     <list>
       <item>
        <p>
-         <link href="..">AIM</link>
+         <link href="http://dashboard.aim.com/aim">AIM</link>
        </p>
       </item>
       <item>
        <p>
-         <link href="..">Google Talk</link>
+         <link href="http://www.google.com/talk/">Google Talk</link>
        </p>
       </item>
       <item>
        <p>
-         <link href="..">ICQ</link>
+         <link href="https://www.icq.com/register/">ICQ</link>
        </p>
       </item>
       <item>
        <p>
-         <link href="..">Jabber</link>
+         <link href="http://register.jabber.org/">Jabber</link>
        </p>
+       <note>
+         <p>
+           It is possible to use the automatic creation of accounts
+           with this service and <app>Empathy</app>. Not all the
+           service providers support it. One service provider known
+           to work is <em>jabber.org</em>, the default one of the application.
+         </p>
+       </note>
       </item>
       <item>
        <p>
-         <link href="..">MSN</link>
+         <link href="https://accountservices.passport.net">MSN</link>
        </p>
       </item>
       <item>
        <p>
-         <link href="..">Yahoo!</link>
+         <link href="https://login.yahoo.com/config/login">Yahoo!</link>
        </p>
       </item>
     </list>
-    
+  </section>
+
+  <section id="local-service">
+    <title>Local Instant Messaging Services</title>
     <p>
-      To register a Jabber account you can use the automatic
-      account creation of <app>Empathy</app>. Not all Jabber service
-      providers support the automatic creation of accounts, one
-      service provider known to work with <app>Empathy</app> is <link
-       href="http://jabber.org">jabber.org</link>.
+      This service works when you are connected to a local network,
+      you do not need an Internet connetion in order to use it.
     </p>
+    <list>
+      <item>
+       <p>
+         <em>Salut</em>
+       </p>
+      </item>
+    </list>
     <p>
-      If you already have a Jabber account you can use the Salut service.
+      For more information, see <link type="seealso"
+      xref="salut-protocol" />.
     </p>
-    
+
   </section>
-  
+
   <section id ="sip-services">
-    <title>SIP Services</title>
+    <title>Telephony Services</title>
+
+    <p>
+      These services will let you do voice call over the Internet to
+      other people using the same service or even to normal phones. 
+    </p>
     
     <list>
       <item>
        <p>
-         <link href="..">Ekiga</link>
+         <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
        </p>
       </item>
       <item>
        <p>
-         <link href="..">FWD</link>
-       </p>
-      </item>
-      <item>
-       <p>
-         <link href="..">Sipphone</link>
+         <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
        </p>
       </item>
     </list>
 
+    <note>
+      <p>
+       In order to call normal phones over the Internet, you may need
+       to subscribe to a paid service. For more information, please
+       refer to the instructions provided on the website of the
+       service you will use.
+      </p>
+    </note>
   </section>
-    
 </page>

diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
new file mode 100644 (file)
index 0000000..164e204
--- /dev/null
+++ b/help/C/salut-protocol.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="salut-protocol">
+  
+  <info>
+    <link type="seealso" xref="create-account"/>
+      <desc>
+       Undesrtanding the <em>Salut</em> protocol.
+      </desc>
+      <revision version="" date="" status="stub"/>
+      
+      <credit type="author">
+       <name>Milo Casagrande</name>
+       <email>milo@ubuntu.com</email>
+      </credit>
+      <copyright>
+       <year>2009</year>
+       <name>GNOME Documentation Project</name>
+      </copyright>
+      
+      <license>Creative Commons Share Alike</license>
+      
+      <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"
+       />
+  </info>
+  
+  <comment>
+    <cite date="2009-06-21"><name>Milo Casagrande</name></cite>
+    <p>
+      Need to work on this section, explaining people in clear words
+      what the hell is this service!
+    </p>
+  </comment>
+
+  <title>What is the <em>Salut</em> service?</title>
+
+  <p>
+    The <em>Salut</em> service is a serverless communication service:
+    you do not need to connect and authenticate to a central server in
+    order to use it. 
+  </p>
+  <p>
+    This kind of serverless messaging system is restricted to local
+    network and an active Internet connection is not necessary.
+  </p>
+  <p>
+    The people that use this service inside the same local network
+    will be auto-discovered, and it will be possibile to send them messages
+    and files as with other services.
+  </p>
+  <p>
+    All the modern local network should be able to support this kind
+    of service.
+  </p>
+</page>