Dirk Dougherty 3b33cdcbf8 Doc merge from master:Training class on Identifying and Authenticating Users.
Conflicts:

	docs/html/training/id-auth/authenticate.jd
	docs/html/training/id-auth/custom_auth.jd
	docs/html/training/id-auth/identify.jd
	docs/html/training/id-auth/index.jd

Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
2011-12-15 19:45:27 -08:00
..