[help] Wrote the previous conversations and the geolocation topics

 * Added al the new pages to Makefile
 * Fixed a typo in irc-manage

9 files changed, 366 insertions, 10 deletions

diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page
new file mode 100644
index 000000000..845f7e74b
--- /dev/null
+++ b/help/C/geolocation-not-showing.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-not-showing">
+
+  <info>
+    <link type="guide" xref="geolocation#problems"/>
+    <desc>
+      <app>Empathy</app> does not publish my geographical position.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" 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"/>
+  </info>
+
+  <title>Geographical position not published</title>
+
+  <p>
+    If your contacts cannot see your location, <app>Empathy</app> might not be able
+    to discover with a good margin of precision your geographical position.
+  </p>
+  <p>
+    In this case, your position will not be published, but you are still able to
+    see the location of your contacts.
+  </p>
+  <p>
+    If you want to publish your geographical position, you can try to use an
+    external device such as a GPS.
+  </p>
+
+</page>
diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page
new file mode 100644
index 000000000..23694e2b7
--- /dev/null
+++ b/help/C/geolocation-privacy.page
@@ -0,0 +1,89 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-privacy">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <desc>
+      What information are sent and to who.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" 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"/>
+  </info>
+
+  <title>Geolocation privacy</title>
+
+  <section id="info-sent">
+  <title>What are the information sent</title>
+  <p>
+    What is possible to send is: your country, region, locality, area, street, building,
+    floor, room, and postal code, longitude, latitude and altitude, speed and bearing.
+  </p>
+  <p>
+    The accuracy and the quantity of information about your geographical position are based
+    on the software or on the infrastructure used to discover your position.
+  </p>
+  <p>
+    Different kind of networks may have different accuracy settings, and may send
+    different information. The use of external devices such as GPS or mobile phone
+    will increase the accuracy of the information sent.
+  </p>
+  <p>
+    When the privacy mode is enabled, nothing more precise than your city will be
+    sent, even if you are using an external device.
+  </p>
+  </section>
+  
+  <section id="see-info">
+  <title>Who can see the information sent</title>
+  <p>
+    Only your contacts can see your geographical position.
+  </p>
+  </section>
+  
+  <section id="privacy-mode">
+  <title>What is the privacy mode</title>
+  <p>
+    The privacy mode, enabled by default, is a reduced accuracy mode that will
+    decrease the accuracy of the geographical position sent to your contacts.
+  </p>
+  </section>
+  
+  <section id="privacy-overview">
+  <title>Privacy overview</title>
+  <p>
+    Overview of the various geolocation privacy settings in <app>Empathy</app>.
+  </p>
+  <list>
+    <item>
+      <p>
+        Geolocation is not enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode is enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode prevails even when using external and more precise devices.
+      </p>
+    </item>
+    <item>
+      <p>
+        Only your contacts can see your position.
+      </p>
+    </item>
+  </list>
+  </section>
+
+</page>
diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page
new file mode 100644
index 000000000..f67b43755
--- /dev/null
+++ b/help/C/geolocation-supported.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-supported">
+
+  <info>
+    <desc>
+      Services that supports geolocation and compatibility.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="draft"/>
+    <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"/>
+  </info>
+
+  <title>Supported services</title>
+
+  <p>
+    The geolocation feature at the moment is compatible only with the Jabber service.
+    In order to use it, you and your contacts need to have a Jabber account.
+  </p>
+  
+  <note>
+    <p>
+      It is necessary that also the server you are using supports the geolocation
+      feature. Most of the Jabber servers support it. See your service website
+      documentation for more information.
+    </p>
+  </note>
+  
+  <section id="compatibility">
+  <title>Compatibility</title>
+  
+  <p>
+    <app>Empathy</app> geolocation feature is not compatible with other geographical
+    position services such as <em>Google Latitude</em>, <em>Yahoo Fire Eagle</em>
+    or <em>Brightkite</em>.
+  </p>
+  
+  </section>
+  
+</page>
diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page
new file mode 100644
index 000000000..6c01be90b
--- /dev/null
+++ b/help/C/geolocation-turn.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-turn">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-privacy"/>
+    <desc>
+      How to activate and deactivate geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" 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"/>
+  </info>
+
+  <title>Activate/Deactivate geolocation</title>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the <gui>Location</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Publish location to my contacts</gui> to activate geolocation.
+      </p>
+      <p>
+        To deactivate geolocation, deselect it.
+      </p>
+    </item>
+    <item>
+      <p>
+        To increase the accuracy of your position, deselect
+        <gui>Reduce location accuracy</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        If you have an external device like a GPS or want to send a more accurate
+        position, select the appropriate option in the <gui>Geoclue Settings</gui>
+        section. 
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page
new file mode 100644
index 000000000..fdbf0adbd
--- /dev/null
+++ b/help/C/geolocation-what-is.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-what-is">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-supported"/>
+    <desc>
+      Understanding geolocation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" 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"/>
+  </info>
+
+  <title>What is geolocation</title>
+
+  <p>
+    With <em>geolocation</em> it is intended the possibility to identify the real
+    geographical position of a computer or a device connected to the Internet.
+  </p>
+  <p>
+    With geolocation in <app>Empathy</app> you can:
+  </p>
+  <list>
+    <item>
+      <p>
+        Publish your geographical position to your contacts.
+      </p>
+    </item>
+    <item>
+      <p>
+        See your contacts geographical position and quickly contact them.
+      </p>
+    </item>
+    <item>
+      <p>
+        Set the accuracy of your position and the device used to discover your
+        position.
+      </p>
+    </item>
+  </list>
+
+  <note>
+    <p>
+      In order to see your contacts geographical position, they need to use a
+      service and an application that support geolocation.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/geolocation.page b/help/C/geolocation.page
new file mode 100644
index 000000000..409d22f49
--- /dev/null
+++ b/help/C/geolocation.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="geolocation"
+  style="2colum">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Use and understand geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" 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"/>
+  </info>
+  
+  <title>Geographical position</title>
+
+  <section id="geoloc" style="2column">
+    <title>Geolocation</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index bceef3660..07b6163f0 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -5,7 +5,7 @@
   <info>
     <link type="guide" xref="index#text-conv"/>
     <link type="seealso" xref="irc-account"/>
-    <desc>Hot to use IRC with <app>Empathy</app>.</desc>
+    <desc>How to use IRC with <app>Empathy</app>.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
     <credit type="author">
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
index de9e0f246..b521ada59 100644
--- a/help/C/prev-conv.page
+++ b/help/C/prev-conv.page
@@ -8,6 +8,7 @@
       Search your previous conversations.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-17" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-19" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -22,16 +23,16 @@
   <title>Previous conversations</title>
 
   <p>
-    <app>Empathy</app> automatically saves all your text conversations with your contacts,
-    and you can perform two different kinds of search: a normal text search, or a
-    per-conversation search.
+    <app>Empathy</app> automatically saves all your text conversations you have
+    with your contacts, and lets you perform two different kinds of search: a
+    normal text search, or a per-conversation search.
   </p>
   <p>
     The normal search is a <em>full text</em> search: it will search the exact text in
     all your previous conversations.
   </p>
   <p>
-    The per-conversation search permits you to limit the search to a particular
+    The per-conversation search permits you to limit the text search to a particular
     contact and conversation, and permits you to look at all the previous
     conversations you had with your contacts.
   </p>
@@ -46,7 +47,8 @@
   <steps>
     <item>
       <p>
-        To start searching your previous conversations, perform one of the following:
+        To start searching your previous conversations, from the <gui>Contact List</gui>
+        window, perform one of the following:
       </p>
       <list>
         <item>
@@ -92,7 +94,10 @@
     <item>
       <p>
         Click on the result to see the exact text you were searching for on the
-        bottom pane. The search result will be highlighted.
+        bottom pane.
+      </p>
+      <p>  
+        The search results will be highlighted.
       </p>
     </item>
   </steps>
@@ -114,11 +119,32 @@
     <item>
       <p>
         From the left top pane, select the contact you want to look the previous
-        conversations of.
+        conversations of. The previous conversations will be shown on the right pane.
+      </p>
+      <p>
+        By default, the last conversation you had will be shown.
+      </p>
+      <note>
+        <p>
+          Based on your account selected and the service of that account, it will
+          be possible to select contacts, IRC rooms or group conversations. 
+        </p>
+      </note>
+    </item>
+    <item>
+      <p>
+        From the left bottom pane, you can browse your conversations by date. Based
+        on the contact selected, the date in which you had a conversation will
+        be highlighted in bold text.
+      </p>
+    </item>
+    <item>
+      <p>
+        To perform a text search, type the text you want to search in the text box
+        at the top of the window.
       </p>
       <p>
-        Based on your account selected, and the service of the account, in this
-        pane it will be possible to select contacts, IRC rooms or group conversations. 
+        The search results will be highlighted.
       </p>
     </item>
   </steps>
diff --git a/help/Makefile.am b/help/Makefile.am
index 408f51804..be149cd04 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -18,6 +18,12 @@ DOC_PAGES = \
 	change-status.page \
 	create-account.page \
 	disable-account.page \
+	geolocation.page \
+	geolocation-not-showing.page \
+	geolocation-privacy.page \
+	geolocation-supported.page \
+	geolocation-turn.page \
+	geolocation-what-is.page \
 	group-conversations.page \
 	index.page \
 	introduction.page \
@@ -29,6 +35,7 @@ DOC_PAGES = \
 	irc-sending-file.page \
 	irc-start-conversation.page \
 	offline-contacts.page \
+	prev-conv.page \
 	prob-conn-acctdisabled.page \
 	prob-conn-auth.page \
 	prob-conn-name.page \