Index: /waeup/branches/ulif-rewrite/src/waeup/authentication.txt
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/authentication.txt	(revision 4092)
+++ /waeup/branches/ulif-rewrite/src/waeup/authentication.txt	(revision 4093)
@@ -28,15 +28,8 @@
 
 Before we can login, we have to provide a user (``principal`` in Zope
-terms). On the API level we can so by looking up a
-UserAuthenticationUtility named ``users``:
+terms) with a password (and optional a title or description):
 
-  >>> from zope.component import getUtility
-  >>> from zope.app.authentication.interfaces import IAuthenticatorPlugin
-  >>> authenticator = getUtility(IAuthenticatorPlugin, name=u'users')
-
-This plugin also enables us to add new users. At least a username and
-a password is required:
-
-  >>> authenticator.addUser('bob', 'bobssecret')
+  >>> root['app'].users.addUser('bob', 'bobsecret',
+  ...                           title='Bob', description='A sample user')
 
 We can also add complete `Account` objects. An `Account` stores the
@@ -45,5 +38,7 @@
   >>> from waeup.authentication import Account
   >>> alice = Account('alice', 'alicesecret')
-  >>> authenticator.addAccount(alice)
+  >>> root['app'].users.addAccount(alice)
+
+See ``users.txt`` for details about the UserContainer we use here.
 
 
@@ -62,8 +57,24 @@
   True
 
+  >>> 'form.logout' in browser.contents
+  False
+
 We use this form:
 
-  >>> browser.getControl(name='form.login').value = 'grok'
-  >>> browser.getControl(name='form.password').value = 'grok'
+  >>> browser.getControl(name='form.login').value = 'bob'
+  >>> browser.getControl(name='form.password').value = 'bobsecret'
   >>> browser.getControl('Login').click()
 
+Now the login form is gone. Instead we have the opportunity to logout:
+
+  >>> 'form.login' in browser.contents
+  False
+
+  >>> 'form.logout' in browser.contents
+  True
+
+The user name is also displayed in the sidebar:
+
+  >>> 'bob' in browser.contents
+
+  >>> print browser.contents
