Merge branch 'gnome-3-8'

[empathy.git] / help / C / send-file.page

diff --git a/help/C/send-file.page b/help/C/send-file.page
index 0768696bfa46fbd4de9e8a57c14d5e6900193d91..53c9cafd1bf58d1c301534b3ba2ba7f6e187d92c 100644 (file)
--- a/help/C/send-file.page
+++ b/help/C/send-file.page
@@ -1,13 +1,18 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="send-file">
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic"
+      id="send-file">
 
   <info>
     <link type="guide" xref="index#advanced"/>
     <desc>Send a file from your computer to one of your contacts.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
-
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review">
+      <!--
+      <e:review by="shaunm@gnome.org" date="2009-09-09" status="deferred"/>
+      -->
+    </revision>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -16,12 +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>
@@ -34,7 +43,7 @@
       <list>
         <item>
           <p>
-            Right-click on the contact you want to send a file, and select <gui>Send file</gui>.
+            Right click on the contact you want to send a file to, and choose <gui>Send file</gui>.
           </p>
         </item>
         <item>
@@ -52,30 +61,37 @@
     </item>
     <item>
       <p>
-        The <gui>File Transfers</gui> window will appear. Wait for your contact to accept the 
-        file transfer, or click <gui>Stop</gui> to halt the transfer.
+        The <gui>File Transfers</gui> window will appear.
+      </p>
+      <p>
+        Wait for your contact to accept the file transfer, or click 
+        <gui>Stop</gui> to halt the transfer.
+      </p>
+    </item>
+    <item>
+      <p>
+        Once the transfer is finished, it is possible to close the <gui>File Transfers</gui>
+        window.
       </p>
     </item>
   </steps>
 
-  <p>
-    If your contact accepts the file transfer, you can watch the progress of the 
-    transfer and see the estimated amount of time remaining before it is complete.
-  </p>
-  <p>
-    If they do not accept it, the status of the transfer will change to <gui>File 
-    transfer cancelled</gui>, and the file will not be sent.
-  </p>
-  <p>
-    Once a transfer is finished, you can close the <gui>File Transfers</gui> 
-    window. If you have multiple finished transfers listed in the window, click on 
-    <gui>Clear</gui> to empty the list. This will only remove the files from the 
-    list and will not delete them from your computer.
-  </p>
-
+  <note style="tip">
+    <p>
+      If you have multiple finished transfers listed in the window, click on
+      <gui>Clear</gui> to empty the list. This will only remove the files from the
+      list and will not delete them from your computer.
+    </p>
+  </note>
+  <note>
+    <p>
+      It is possible to send files only using the following services: <em>Jabber</em>,
+       <em>Google Talk</em> and <em>People Nearby</em>.
+    </p>
+  </note>
   <note>
     <p>
-      In order to send a file to someone, you need to be connected to the Internet, or to 
+      In order to send a file to someone, you need to be connected to the Internet, or to
       a local area network.
     </p>
   </note>