From d826ab34240383c91f8836b114a2f5e9313b5533 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 30 Aug 2012 17:37:06 -0400
Subject: [PATCH] Update for 'Connect to Server' changes

Talk about URLs, and give examples.
---
 gnome-help/C/nautilus-connect.page | 56 ++++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/gnome-help/C/nautilus-connect.page b/gnome-help/C/nautilus-connect.page
index 1284d31..2ad6ede 100644
--- a/gnome-help/C/nautilus-connect.page
+++ b/gnome-help/C/nautilus-connect.page
@@ -29,8 +29,7 @@ your local network.</p>
 
 <p>To browse files over the network, open the <app>Files</app>
 application from the <gui>Activities</gui> overview. Then, click
-<gui>Browse Network</gui> in the sidebar, or select
-<gui>Network</gui> from the <gui>Go</gui> menu. The file manager
+<gui>Browse Network</gui> in the sidebar. The file manager
 will find any computers on your local area network that advertise
 their ability to serve files. If you want to connect to a server
 on the internet, or if you do not see the computer you're looking
@@ -39,15 +38,13 @@ internet/network address.</p>
 
 <steps>
   <title>Connect to a file server</title>
-  <item><p>In the file manager, click <guiseq><gui>File</gui>
+  <item><p>In the file manager application menu, click
   <gui>Connect to Server</gui></guiseq>.</p></item>
-  <item><p>Enter the server address, select the type of server, and enter
-  any additional information as required. Then click <gui>Connect</gui>.
-  Details on server types are <link xref="#types">listed below</link>.</p>
-  <p>For servers on the internet, you can usually use the domain name
-  (e.g. <sys>ftp.example.com</sys>). For computers on your local network,
-  however, you may have to use the computer's
-  <link xref="net-findip">numeric IP address</link>.</p>
+  <item><p>Enter the URL of the server to connect to.</p>
+  <p>If you have connected to the server before, the URL may still be
+  available in the history list.</p>
+  Then click <gui>Connect</gui>.
+  Details on supported URLs are <link xref="#types">listed below</link>.</p>
   </item>
   <item><p>A new window will open showing you the files on the server.
   You can browse the files just as you would for those on your own computer.</p>
@@ -57,24 +54,33 @@ internet/network address.</p>
 </steps>
 
 <section id="types">
- <title>Different types of servers</title>
+  <title>Different types of servers</title>
 
-<p>You can connect to different types of servers. Some servers
-are public, and allow anybody to connect. Other servers require
-you to log in with a user name and password.</p>
-<p>You may not have permissions to perform certain actions on files
-on a server. For example, on public FTP sites, you will probably not be
-able to delete files.</p>
+<p>
+   You can connect to different types of servers. Some servers are public,
+   and allow anybody to connect. Other servers require you to log in with a
+   user name and password.
+</p>
+<p>
+  You may not have permissions to perform certain actions on files on a server.
+  For example, on public FTP sites, you will probably not be able to delete
+  files.
+</p>
+<p>
+  What kind of URL you have to enter depends on the protocol that the
+  server uses to exports its file shares.
+</p>
 
 <terms>
-<title>Types of servers</title>
+<title>Different types of servers</title>
 <item>
   <title>SSH</title>
   <p>If you have a <em>secure shell</em> account on a server, you
   can connect using this method. Many web hosts provide SSH accounts
   to members so they can securely upload files. SSH servers always
-  require you to log in. If you use a secure shell key to log in,
-  leave the password field blank.</p>
+  require you to log in.</p>
+  <p>A typical SSH URL looks like this:
+     <sys>ssh://username@hostname.example.com/folder</sys></p>
 
   <comment><cite>shaunm</cite><p>We should have a topics on encryption
   keys, possibly rolling the seahorse help into gnome-help. Then link
@@ -90,6 +96,8 @@ able to delete files.</p>
   access through SSH. Some servers, however, still allow or require
   you to use FTP to upload or download files. FTP sites with logins
   will usually allow you to delete and upload files.</p>
+  <p>A typical FTP URL looks like this:
+     <sys>ftp://username@ftp.example.com/path/</sys></p>
 </item>
 <item>
   <title>Public FTP</title>
@@ -97,6 +105,8 @@ able to delete files.</p>
   public or anonymous FTP access. These servers do not require a
   user name and password, and will usually not allow you to delete
   or upload files.</p>
+  <p>A typical anonymous FTP URL looks like this:
+     <sys>ftp://ftp.example.com/path/</sys></p>
   <p>Some anonymous FTP sites require you to log in with a
   public user name and password, or with a public user name using
   your email address as the password. For these servers, use the
@@ -110,6 +120,8 @@ able to delete files.</p>
   <em>domains</em> for organization and to better control access. If you have
   the right permissions on the remote computer, you can connect to a Windows
   share from the file manager.</p>
+  <p>A typical Windows share URL looks like this:
+    <sys>smb://servername/Share</sys></p>
 </item>
 <item>
   <title>WebDAV and Secure WebDAV</title>
@@ -118,6 +130,8 @@ able to delete files.</p>
   server you're connecting to supports secure connections, you should choose
   this option. Secure WebDAV uses strong SSL encryption, so that other users
   can't see your password.</p>
+  <p>A typical WebDAV URL looks like this:
+    <sys>http://example.hostname.com/path</sys></p>
   <comment>
     <cite date="2012-02-19">shaunm</cite>
     <p>Also used by gnome-user-share, but we're not talking about that
@@ -129,4 +143,4 @@ able to delete files.</p>
 </terms>
 </section>
 
-</page>
\ No newline at end of file
+</page>
-- 
1.7.12

