diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 18:20:54 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-07 18:20:54 +0000 |
| commit | bc8e08a8c092f35764be23684bb44deba46a089f (patch) | |
| tree | 8567c3d1a6793d6fbdab8224c502ee775a6e3290 | |
| parent | fa16b8ff3d3b95326252dc3f08298195e90dfb61 (diff) | |
| parent | daae5b8fa9de42f577c4741650a222cc8f8828bc (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | spec/Channel_Interface_SASL_Authentication1.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/Channel_Interface_SASL_Authentication1.xml b/spec/Channel_Interface_SASL_Authentication1.xml index 0edf15c4..820029e6 100644 --- a/spec/Channel_Interface_SASL_Authentication1.xml +++ b/spec/Channel_Interface_SASL_Authentication1.xml @@ -125,8 +125,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>To make it possible to implement a very simple password-querying user interface without knowledge of any particular SASL mechanism, implementations of this interface MUST implement the - pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless none - of the available mechanisms use a password at all.</p> + pseudo-mechanism <code>X-TELEPATHY-PASSWORD</code>, unless each + of the available mechanisms either requires additional information + beyond the password (such as a username), or does not use a + password.</p> </tp:docstring> </property> |