<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -85,3 +85,22 @@ argument, like so::
     env.shell = &quot;/bin/sh -c&quot;
 
 This has been shown to work on FreeBSD and may work on other systems as well.
+
+
+4. I'm sometimes incorrectly asked for a passphrase instead of a password.
+==========================================================================
+
+Due to a bug of sorts in our SSH layer (Paramiko), it's not currently possible
+for Fabric to always accurately detect the type of authentication needed. We
+have to try and guess whether we're being asked for a private key passphrase or
+a remote server password, and in some cases our guess ends up being wrong.
+
+The most common such situation is where you, the local user, appear to have an
+SSH keychain agent running, but the remote server is not able to honor your SSH
+key, e.g. you haven't yet transferred the public key over or are using an
+incorrect username. In this situation, Fabric will prompt you with &quot;Please
+enter passphrase for private key&quot;, but the text you enter is actually being
+sent to the remote end's password authentication.
+
+We hope to address this in future releases, either by doing heavier
+introspection of Paramiko or patching Paramiko itself.</diff>
      <filename>FAQ</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>20e558f77844dd29ceacf2fb0e06f966e270222b</id>
    </parent>
  </parents>
  <author>
    <name>Jeff Forcier</name>
    <email>jeff@bitprophet.org</email>
  </author>
  <url>http://github.com/bitprophet/fabric/commit/2b9bbc8db9346dcdf6ff81cc6c7c0185957b1237</url>
  <id>2b9bbc8db9346dcdf6ff81cc6c7c0185957b1237</id>
  <committed-date>2009-10-25T20:08:03-07:00</committed-date>
  <authored-date>2009-10-25T20:07:51-07:00</authored-date>
  <message>Add FAQ question re: passphrase/password prompt</message>
  <tree>7126c09c954082ec75d780db1086ac1d0e9d1119</tree>
  <committer>
    <name>Jeff Forcier</name>
    <email>jeff@bitprophet.org</email>
  </committer>
</commit>
