--- wikisrc/kerberos/system.mdwn	2013/02/16 11:50:13	1.8
+++ wikisrc/kerberos/system.mdwn	2015/02/04 03:18:21	1.13
@@ -24,45 +24,62 @@ NetBSD will now autodiscover and uses th
 in DNS. To use Kerberized TNF services, log in with your Kerberos
 [[password]]:
 
-`$ kinit <username>@NETBSD.ORG`
+    $ kinit <username>@NETBSD.ORG
 
-The right-hand side is a Kerberos realm, not a DNS domain. Case is significant!
+The right-hand side is a Kerberos realm, not a DNS domain. *Case is significant!*
 
 
-## MacOSX
+## Mac OS X
 
 OS X autodiscovers and uses the NETBSD.ORG KDC as defined in DNS.
 To use Kerberized TNF services, log in with your Kerberos [[password]]:
 
-`$ kinit <username>@NETBSD.ORG`
+7. Launch `Ticket Viewer.app` from `/System/Library/CoreServices`
 
-The right-hand side is a Kerberos realm, not a DNS domain. Case is significant!
+7. Press the "Add Identity" button
 
-### A Keychain.app trick
+7. In the identity field enter your `<username>@NETBSD.ORG`
 
-To pop up a GUI password dialog:
+    The right-hand side is a Kerberos realm, not a DNS domain. *Case is significant!*
 
-`$ kinit <username>@NETBSD.ORG </dev/null`
+7. Enter the password associated with this identity in the password field
 
-Check "Remember this password in my keychain" to make future Kerberos
-logins (sans input redirection) prompt-free.
+   By default Ticket Viewer.app will save password details in keychain, un-tick "Remember password in my keychain" if this is not desired behaviour
 
+7. Press continue
 
-## Windows XP
-
-Windows does not provide an easy way to configure and use KDCs different from the one embedded into an Active Directory.
+If successful, you'll be returned to the main window with a new entry below the icons containing `<username>@NETBSD.ORG` and the date and time which the ticket obtained is due to expire.
 
-Therefore, to use [[Kerberos]], you should follow the following steps:
+## Windows XP
 
-7. Download the [MIT Kerberos for Windows](http://web.mit.edu/Kerberos/dist/#kfw-3.2) installer. It is composed of different tools traditionally found with Kerberos distributions, like [[!template id=man name=kinit section=1]] or [[!template id=man name=klist section=1]], and a Network Identity Manager, an application used to manage credential caching of Kerberos tickets.
+Windows does not provide an easy way to configure and use KDCs
+different from the one embedded into an Active Directory.
 
-7. Install the package. Use the default provided options, then restart the computer.
+Therefore, to use [[Kerberos]], you should follow the following
+steps:
 
-7. The Network Identity Manager [(PDF)](http://web.mit.edu/kerberos/kfw-3.2/kfw-3.2.2/netidmgr_userdoc.pdf) should automatically start when you login. As there is no principal currently configured, it should open a dialog box to obtain the new credentials.
+7. Download the
+   [MIT Kerberos for Windows](http://web.mit.edu/Kerberos/dist/#kfw-3.2)
+   installer. It is composed of different tools traditionally found
+   with Kerberos distributions, like
+   [[!template id=man name=kinit section=1]] or
+   [[!template id=man name=klist section=1]], and a Network Identity
+   Manager, an application used to manage credential caching of
+   Kerberos tickets.
+
+7. Install the package. Use the default provided options, then
+   restart the computer.
+
+7. The Network Identity Manager
+   [(PDF)](http://web.mit.edu/kerberos/kfw-3.2/kfw-3.2.2/netidmgr_userdoc.pdf)
+   should automatically start when you login. As there is no principal
+   currently configured, it should open a dialog box to obtain the
+   new credentials.
 
 7. Enter your principal:
 
-        Username: <username>
-        Realm: NETBSD.ORG
+    Username: <username>
+    Realm: NETBSD.ORG
 
-7. Click `Ok`. After a few seconds, it should obtain the TGT for you from NetBSD.ORG KDC.
+7. Click `Ok`. After a few seconds, it should obtain the TGT for
+   you from the NETBSD.ORG KDC.