From 46db0404512f9970483af8878ed826c43693c1b3 Mon Sep 17 00:00:00 2001
From: Shaun McCance <shaunm@gnome.org>
Date: Wed, 9 Sep 2009 10:12:43 -0500
Subject: [PATCH] [help] Changing "Salut" to "People Nearby"

---
 help/C/audio-video.page         |  5 -----
 help/C/group-conversations.page |  2 +-
 help/C/salut-protocol.page      | 11 ++++++++---
 help/C/send-file.page           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/help/C/audio-video.page b/help/C/audio-video.page
index 2021ec8c..38d79e4d 100644
--- a/help/C/audio-video.page
+++ b/help/C/audio-video.page
@@ -180,11 +180,6 @@
         <td><p>No</p></td>
         <td><p>No</p></td>
       </tr>
-      <tr>
-        <td><p>Salut</p></td>
-        <td><p>No</p></td>
-        <td><p>No</p></td>
-      </tr>
       <tr>
         <td><p>sametime</p></td>
         <td><p>No</p></td>
diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page
index e0e9968c..df779e71 100644
--- a/help/C/group-conversations.page
+++ b/help/C/group-conversations.page
@@ -29,7 +29,7 @@
   </p>
   <p>
     To have a group conversation you need to have a registered account with either
-    Jabber or Google Talk, or a Salut account.
+    Jabber or Google Talk, or a People Nearby account.
   </p>
 
   <note>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
index 176921e4..274e84e6 100644
--- a/help/C/salut-protocol.page
+++ b/help/C/salut-protocol.page
@@ -5,7 +5,7 @@
   <info>
     <link type="seealso" xref="create-account"/>
     <desc>
-      Undesrtanding the <em>Salut</em> protocol.
+      Undesrtanding 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"/>
@@ -20,10 +20,15 @@
     <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>
diff --git a/help/C/send-file.page b/help/C/send-file.page
index 9418bd27..cd1d6ead 100644
--- a/help/C/send-file.page
+++ b/help/C/send-file.page
@@ -76,7 +76,7 @@
   <note>
     <p>
       It is possible to send files only using the following services: <em>Jabber</em>,
-       <em>Google Talk</em> and <em>Salut</em>.
+       <em>Google Talk</em> and <em>People Nearby</em>.
     </p>
   </note>
   <note>
-- 
2.39.2