GNOME.org
 

[gnome-user-docs/gnome-3-8] New sharing-media, fix files-share, updated links

commit 1837a2468728d3951bcf14bcd3a5ab8c88f94879
Author: Michael Hill <mdhillca gmail com>
Date:   Sun May 12 08:13:46 2013 -0400

    New sharing-media, fix files-share, updated links
    
    files-share updated according to Bug 680983

 gnome-help/C/bluetooth-send-file.page |   11 +++--
 gnome-help/C/files-share.page         |   63 +++++++++++++-----------------
 gnome-help/C/nautilus-connect.page    |    4 +-
 gnome-help/C/settings-sharing.page    |    6 +-
 gnome-help/C/sharing-desktop.page     |    3 +-
 gnome-help/C/sharing-media.page       |   68 +++++++++++++++++++++++++++++++++
 gnome-help/Makefile.am                |    1 +
 7 files changed, 109 insertions(+), 47 deletions(-)
---
diff --git a/gnome-help/C/bluetooth-send-file.page b/gnome-help/C/bluetooth-send-file.page
index d8bc41b..cfa1f82 100644
--- a/gnome-help/C/bluetooth-send-file.page
+++ b/gnome-help/C/bluetooth-send-file.page
@@ -34,12 +34,15 @@
   </if:when>
   <p>You can send files to connected Bluetooth devices, such as some mobile
   phones or other computers. Some types of devices don't allow the transfer
-  of files, or specific types of files. You can send files in one of three
-  ways: using the Bluetooth icon on the top bar, from the Bluetooth settings
-  window, or directly from the file manager.</p>
+  of files, or specific types of files. You can send files using the Bluetooth
+  icon on the top bar, or from the Bluetooth settings window.</p>
 </if:choose>
 
+<comment>
+<cite date="2013-05-11" href="mailto:mdhillca gmail com">mdhill</cite>
+  <p>The functionality in the following line was temporarily removed in 3.8</p>
   <p>To send files directly from the file manager, see <link xref="files-share"/>.</p>
+</comment>
 
   <note style="important">
     <p>Before you begin, make sure Bluetooth is enabled on your computer.
@@ -97,4 +100,4 @@
       <p>The owner of the receiving device usually has to press a button to accept the file. Once the owner 
accepts or declines, the result of the file transfer will be shown on your screen.</p>
     </item>
   </steps>
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/files-share.page b/gnome-help/C/files-share.page
index d4cf60d..3a7896f 100644
--- a/gnome-help/C/files-share.page
+++ b/gnome-help/C/files-share.page
@@ -4,68 +4,59 @@
 
   <info>
     <link type="guide" xref="files" group="more"/>
-<!--
-    <link type="guide" xref="net#sharing"/>
--->
+    <link type="guide" xref="sharing"/>
     <link type="seealso" xref="nautilus-connect"/>
-    <desc>Easily transfer files to your contacts and devices from
-    the file manager.</desc>
+    <desc>Easily transfer files to your email contacts from the file
+    manager.</desc>
 
-    <revision pkgversion="3.6.0" version="0.2" date="2012-09-25" status="review"/>
+    <revision pkgversion="3.8.2" version="0.3" date="2013-05-11" status="review"/>
 
     <credit type="author">
       <name>Shaun McCance</name>
       <email>shaunm gnome org</email>
     </credit>
+    <credit type="editor">
+      <name>Michael Hill</name>
+      <email>mdhillca gmail com</email>
+    </credit>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Share and transfer files</title>
+<title>Share files by email</title>
 
 <comment>
   <cite date="2012-02-20">jim</cite>
   <p>If we get gnome-user-share integrated eventually, we should discuss
   or link that here.</p>
 </comment>
+<comment>
+  <cite date="2013-05-11" href="mailto:mdhillca gmail com">mdhill</cite>
+  <p>All functionality except email removed for 3.8 per Bug 680983.</p>
+</comment>
 
-<p>You can easily share files with your contacts or transfer them to
-external devices or <link xref="nautilus-connect">network shares</link>
-directly from the file manager.</p>
+<p>You can easily share files with your contacts by email directly from the
+file manager.</p>
+
+  <note style="important">
+    <p>Before you begin, make sure <app>Evolution</app> is installed on your
+    computer, and your email account is configured.</p>
+  </note>
 
 <steps>
+  <title>To share a file by email:</title>
   <item><p>Open the <app>Files</app> application from the <gui>Activities</gui>
   overview.</p></item>
   <item><p>Locate the file you want to transfer.</p></item>
-  <item><p>Right-click the file and select <gui>Send To</gui>.</p></item>
-  <item><p>The <gui>Send To</gui> window will appear. Choose where you
-  want to send the file and click <gui>Send</gui>. See the list of
-  destinations below for more information.</p></item>
+  <item><p>Right-click the file and select <gui>Send To</gui>. The
+  <gui>Compose Message</gui> window will appear with the file attached.</p></item>
+  <item><p>Click <gui>To</gui> to choose a contact, or enter an email address
+  where you want to send the file. Fill in the <gui>Subject</gui> and the body
+  of the message as required and click <gui>Send</gui>.</p></item>
 </steps>
 
 <note style="tip">
   <p>You can send multiple files at once. Select multiple files by holding
-  down <key>Ctrl</key>, then right-click any selected file. You can have
-  the files automatically compressed into a zip or tar archive.</p>
+  down <key>Ctrl</key>, then right-click any selected file.</p>
 </note>
 
-<list>
-  <title>Destinations</title>
-  <item><p>To email the file, select <gui>Email</gui> and enter
-  the recipient's email address.</p></item>
-  <item><p>To send the file to an instant messaging contact, select
-  <gui>Instant Message</gui>, then select contact from the drop-down list.
-  Your instant messaging application may need to be started for this
-  to work.</p></item>
-  <item><p>To write the file to a CD or DVD, select <gui>CD/DVD Creator</gui>.
-  See <link xref="files-disc-write"/> to learn more.</p></item>
-  <item><p>To transfer the file to a Bluetooth device, select
-  <gui>Bluetooth (OBEX Push)</gui> and select the device to send the file to.
-  You will only see devices you have already paired with.
-  See <link xref="bluetooth"/> for more information.</p></item>
-  <item><p>To copy a file to an external device like a USB flash drive,
-  or to upload it to a server you've connected to, select <gui>Removable
-  disks and shares</gui>, then select the device or server where you want to
-  copy the file.</p></item>
-</list>
-
 </page>
diff --git a/gnome-help/C/nautilus-connect.page b/gnome-help/C/nautilus-connect.page
index 681c6e1..ae84cdc 100644
--- a/gnome-help/C/nautilus-connect.page
+++ b/gnome-help/C/nautilus-connect.page
@@ -4,9 +4,7 @@
 
   <info>
     <link type="guide" xref="files" group="more"/>
-<!--
-    <link type="guide" xref="net#sharing"/>
--->
+    <link type="guide" xref="sharing"/>
 
     <revision pkgversion="3.6.0" version="0.2" date="2012-10-06" status="review"/>
 
diff --git a/gnome-help/C/settings-sharing.page b/gnome-help/C/settings-sharing.page
index c698b87..8d7bbdc 100644
--- a/gnome-help/C/settings-sharing.page
+++ b/gnome-help/C/settings-sharing.page
@@ -6,9 +6,9 @@
   <link type="guide" xref="prefs"/>
   <revision pkgversion="3.8.2" version="0.1" date="2013-05-08" status="draft"/>
     <desc>
-<!--      <link xref="sharing-bluetooth">Bluetooth sharing</link>, -->
-      <link xref="sharing-desktop">Screen sharing</link>
-<!--      <link xref="sharing-media">Media sharing</link>… -->
+      <link xref="sharing-bluetooth">Bluetooth sharing</link>,
+      <link xref="sharing-desktop">Screen sharing</link>,
+      <link xref="sharing-media">Media sharing</link>…
     </desc>
   <credit type="author">
       <name>Michael Hill</name>
diff --git a/gnome-help/C/sharing-desktop.page b/gnome-help/C/sharing-desktop.page
index a4c16c1..d0b299e 100644
--- a/gnome-help/C/sharing-desktop.page
+++ b/gnome-help/C/sharing-desktop.page
@@ -27,7 +27,7 @@
  allow others to access your desktop and set the security preferences.</p>
 
   <note style="info package">
-    <p>You must have the <sys>Vino</sys> package installed for
+    <p>You must have the <app>Vino</app> package installed for
      <gui>Screen Sharing</gui> to be visible.</p>
 
     <if:choose xmlns:if="http://projectmallard.org/if/1.0/";>
@@ -62,6 +62,7 @@
       person to move your mouse, run applications, and browse files on your
       computer, depending on the security settings which you are currently
       using.</p>
+
       <note style="tip">
         <p>This option is enabled by default when <gui>Remote View</gui> is
         <gui>ON</gui>.</p>
diff --git a/gnome-help/C/sharing-media.page b/gnome-help/C/sharing-media.page
new file mode 100644
index 0000000..cdd9aa3
--- /dev/null
+++ b/gnome-help/C/sharing-media.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic" style="task"
+      id="sharing-media">
+  <info>
+    <link type="guide" xref="sharing"/>
+    <link type="guide" xref="settings-sharing"/>
+
+    <revision pkgversion="3.8.2" version="0.1" date="2013-05-11" status="draft"/>
+
+    <credit type="author">
+      <name>Michael Hill</name>
+      <email>mdhillca gmail com</email>
+    </credit>
+
+    <desc>Share media on your local network using Rygel.</desc>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Share your music, photos and videos</title>
+
+  <p>You can browse, search and play the media on your computer using a
+ <sys>UPnP</sys> or <sys>DLNA</sys> enabled device such as a phone, TV or game
+ console. Configure <gui>Media Sharing</gui> to allow these devices to access
+ the folders containing your music, photos and videos.</p>
+
+  <note style="info package">
+    <p>You must have the <app>Rygel</app> package installed for
+     <gui>Media Sharing</gui> to be visible.</p>
+
+    <if:choose xmlns:if="http://projectmallard.org/if/1.0/";>
+      <if:when test="action:install">
+        <p><link action="install:rygel" style="button">Install Rygel</link></p>
+      </if:when>
+    </if:choose>
+  </note>
+
+  <steps>
+    <item>
+      <p>Click your name on the top bar and select <gui>Settings</gui>.</p>
+    </item>
+    <item>
+      <p>Open <gui>Sharing</gui>.</p>
+    </item>
+    <item>
+      <p>If <gui>Sharing</gui> is <gui>OFF</gui>, switch it to
+      <gui>ON</gui>.</p>
+    </item>
+    <item>
+      <p>Select <gui>Media Sharing</gui>.</p>
+    </item>
+    <item>
+      <p>Switch <gui>Share Media On This Network</gui> to <gui>ON</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">+</gui> to open the
+      <gui>Choose a folder</gui> window. Navigate <em>into</em> the desired
+      folder, <file>Music</file> in your <file>Home</file> directory for
+      example, and click <gui style="button">Open</gui>. Repeat for the other
+      folders you wish to share, for example <file>Pictures</file> and 
+      <file>Videos</file>.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Close</gui>. You will now be able to browse
+      or play media in the folders you selected using the external device.</p>
+    </item>
+  </steps>
+
+</page>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index c7d5880..9a35ea8 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -345,6 +345,7 @@ HELP_FILES = \
        settings-sharing.page \
        sharing.page \
        sharing-desktop.page \
+       sharing-media.page \
        shell-apps-favorites.page \
        shell-apps-open.page \
        shell-exit.page \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]