Merge branch 'master' of github.com:coreos-inc/quay

data/users.py

@@ -202,8 +202,8 @@ class UserAuthentication(object):
       if decrypted is None:
         # This is a normal password.
         if features.REQUIRE_ENCRYPTED_BASIC_AUTH:
-          msg = ('Client login with passwords is disabled. Please generate a client token ' +
-                 'and use it in place of your password.')
+          msg = ('Client login with unecrypted passwords is disabled. Please generate an ' +
+                 'encrypted password in the user admin panel for use here.')
           return (None, msg)
       else:
         password = decrypted