Rev 3421: Fixed as per John's review. in http://bazaar.launchpad.net/%7Evila/bzr/183705-auth-doc-unclear

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/183705-auth-doc-unclear

------------------------------------------------------------
revno: 3421
revision-id: v.ladeuil+lp at free.fr-20080509164021-kxtz21ozxnv16ivt
parent: v.ladeuil+lp at free.fr-20080509143114-gyzbc8v2x4noq238
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 183705-auth-doc-unclear
timestamp: Fri 2008-05-09 18:40:21 +0200
message:
  Fixed as per John's review.
modified:
  bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
  doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/authentication.txt'
--- a/bzrlib/help_topics/en/authentication.txt	2008-05-09 09:52:59 +0000
+++ b/bzrlib/help_topics/en/authentication.txt	2008-05-09 16:40:21 +0000
@@ -48,9 +48,9 @@
 1. user and password
 
 ``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``
-(``SFTP`` can use either password or host key to authenticate, but since ssh agents
-are a better and safer solution, we recommand their use and don't try to
-provide an alternative, less secure, way do to so).
+``SFTP`` can use either a password or a host key to authenticate. However,
+ssh agents are a better, more secure solution. So we have chosen to not provide
+our own less secure method.
 
 2. user, realm and password
 
@@ -175,14 +175,15 @@
         # The leading '.' ensures that 'shp.net' alone doesn't match
         host=.shp.net
         user=joe
-        # No pasword here, use ssh agents for providing either a password
-        # or a host key
+        # bzr don't support supplying a password for sftp,
+        # consider using an ssh agent if you don't want to supply
+        # a password interactively. (pageant, ssh-agent, etc)
 
 HTTPS, SFTP servers and their proxy
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-At company.com, the server hosting released and integration branches is behind
-a proxy, the two servers use different authentication policies::
+At company.com, the server hosting release and integration branches is behind a
+proxy, and the two branches use different authentication policies::
 
         [reference code]
         scheme=https
@@ -197,7 +198,6 @@
         host=dev.company.com
         path=/dev/integration
         user=user2
-        # No password since we use host keys
         
         # proxy
         [proxy]

=== modified file 'doc/developers/authentication-ring.txt'
--- a/doc/developers/authentication-ring.txt	2008-05-09 09:52:59 +0000
+++ b/doc/developers/authentication-ring.txt	2008-05-09 16:40:21 +0000
@@ -64,8 +64,8 @@
 Note that ssh servers can be configured to use keys instead of (``user``,
 ``password``) and, when used with appropriate agents, provide the same kind of
 comfort this specification aims to provide for all other schemes. Since ssh
-agents provide a safer way to secure the passwords, this specification restrict
-itself to providing ``user`` but never try to provide ``password``.
+agents provide a safer way to secure the passwords, this specification is
+restricted to providing ``user`` but does not provide ``password``.
 
 Authentication definitions
 --------------------------