gnome-user-share r310 - in trunk: . help help/C src

[hadess svn gnome org]

Author: hadess
Date: Tue Jan 27 15:33:16 2009
New Revision: 310
URL: http://svn.gnome.org/viewvc/gnome-user-share?rev=310&view=rev

Log:
2009-01-27  Bastien Nocera  <hadess hadess net>

	* help/Makefile.in: Remove

	* src/file-share-properties.c (main): Remove use of "Paired"
	in the UI

	* help/C/gnome-user-share.xml: Add notes about firewalls,
	and what trusted and bonded mean, and changes for the above



Removed:
   trunk/help/Makefile.in
Modified:
   trunk/ChangeLog
   trunk/help/C/gnome-user-share.xml
   trunk/src/file-share-properties.c

Modified: trunk/help/C/gnome-user-share.xml
==============================================================================
--- trunk/help/C/gnome-user-share.xml	(original)
+++ trunk/help/C/gnome-user-share.xml	Tue Jan 27 15:33:16 2009
@@ -46,21 +46,16 @@
   <indexterm><primary>file sharing</primary></indexterm>
   <indexterm><primary>sharing</primary></indexterm>
 
-<!-- TODO 
- - point out firewall pitfalls
- - explain bonding, pairing and trusted devices
--->
-
   <sect1 id="gnome-user-share-intro">
 	 <title>Introduction</title>
 	 <para>
 		&app; is a session service that exports the contents of the <filename>Public</filename> folder in your home directory, so that they can easily be accessed from other computers on the same local network. On the other computers, the shared folder will appear with a name like '<replaceable>user</replaceable>'s shared files' in the <application>nautilus</application> Network window, where <replaceable>user</replaceable> will be replaced by your user name.
 	 </para>
 	 <para>
-		&app; uses a WebDAV server to share the <filename>Public</filename> folder, and publishes the share on the local network using mDNS.
+		&app; uses a WebDAV server to share the <filename>Public</filename> folder, and advertises the share on the local network using mDNS.
 	 </para>
          <para>
-		Additionally, &app; can make the shared files available via ObexFTP over Bluetooth, and receive files that are send to your computer via Bluetooth.
+		Additionally, &app; can make the shared files available via ObexFTP over Bluetooth, and receive files that are sent to your computer via Bluetooth via ObexPush.
          </para>
   </sect1>
 
@@ -107,7 +102,8 @@
          </screenshot>
        </figure>
        <para>
-         To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. 
+	       To enable file sharing via WebDAV, use the <guilabel>Share public files on network</guilabel> checkbox. When file sharing it enabled, the controls for password protection allow to set a password that needs to be specified before a user on another computer is granted access to the shared files. 
+	 <note>Some firewall configurations on the local machine might cause problems with the advertisment, as well as the access to the shared files. Consult your system administrator for more details.</note>
          <itemizedlist>
            <listitem>
               <para>
@@ -152,7 +148,7 @@
        <para>
          To enable file sharing via Bluetooth, use the <guilabel>Share public files over Bluetooth</guilabel> checkbox.
          To allow remote Bluetooth devices to delete files in your shared folder, use the <guilabel>Allow remote devices to delete files</guilabel> checkbox.
-         To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to bond with this computer</guilabel> checkbox.
+         To allow remote Bluetooth devices to access your shared files even when they are not bonded with your computer, use the <guilabel>Require remote devices to pair with this computer</guilabel> checkbox.
          <note>When you allow unbonded remote devices to access your shared files, anybody with a Bluetooth-enabled cell phone in the vicinity of your computer can access and perhaps even modify your shared files.
          </note>
        </para>
@@ -184,12 +180,15 @@
             </listitem>
             <listitem>
               <para>
-                 Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices.
-              </para>
+                  Select <guilabel>Only for Bonded devices</guilabel> to accept files only from bonded devices.
+		  <note>Bonded devices are the ones that were connected to your computer, and had to enter a PIN code to connect to or from.</note>
+                    
+	      </para>
             </listitem>
             <listitem>
               <para>
-                 Select <guilabel>Only for Paired and Trusted devices</guilabel> to accept files only from paired devices.
+                  Select <guilabel>Only for Bonded and Trusted devices</guilabel> to accept files only from bonded devices.
+		  <note>Devices can be marked as trusted in the <application>bluetooth-properties</application>'s <guilabel>Known devices</guilabel> section.</note>
               </para>
             </listitem>
           </itemizedlist>

Modified: trunk/src/file-share-properties.c
==============================================================================
--- trunk/src/file-share-properties.c	(original)
+++ trunk/src/file-share-properties.c	Tue Jan 27 15:33:16 2009
@@ -575,7 +575,7 @@
 			_("Only for Bonded devices"), -1);
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, &iter, 0,
-			_("Only for Paired and Trusted devices"), -1);
+			_("Only for Bonded and Trusted devices"), -1);
     //FIXME implement
 #if 0
     gtk_list_store_append (store, &iter);