Merge branch 'gnome-3-8'

[empathy.git] / help / C / salut-protocol.page

diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
index 176921e4cfeef1f1609aafff44fd1939f6c133d9..ba060ce2213f0171435c43b29cfc8443ad9d9c72 100644 (file)
--- a/help/C/salut-protocol.page
+++ b/help/C/salut-protocol.page
@@ -1,29 +1,44 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:e="http://projectmallard.org/experimental/"
       type="topic"
       id="salut-protocol">
 
   <info>
     <link type="seealso" xref="create-account"/>
     <desc>
-      Undesrtanding the <em>Salut</em> protocol.
+      Understanding the People Nearby feature.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-12" status="draft"/>
-    <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">
+      <!--
+      <e:review by="shaunm@gnome.org" date="2009-09-09" status="deferred"/>
+      -->
+    </revision>
     <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>What is the <em>Salut</em> service?</title>
+  <title>What is People Nearby?</title>
+
+  <comment>
+    <cite date="2009-09-09">Shaun McCance</cite>
+    <p>I'd like to see this played up a bit more.</p>
+  </comment>
 
   <p>
-    The <em>Salut</em> service is a serverless communication service:
+    The People Nearby service is a serverless communication service:
     you do not need to connect and authenticate to a central server in
     order to use it.
   </p>