"in which to store the key" sounds clunky, so just getting rid of the "in".

[wiki.git] / doc / zephyr.mdwn

diff --git a/doc/zephyr.mdwn b/doc/zephyr.mdwn
index dae157f5f74a1a8d3ef84bd65f107456c5488298..2dc6fcba46a5ac6f07f28ccc8d1203389d3c7e27 100644 (file)
--- a/doc/zephyr.mdwn
+++ b/doc/zephyr.mdwn
@@ -17,13 +17,13 @@ Zephyr is an underlying chat system; the built-in tools for exchanging messages
 
 Here are some of the primary clients used at MIT. There's also a listing of [other Zephyr clients](http://zephyr.1ts.org/wiki/ZephyrClients), but their use is generally not recommended.
 
-### Barnowl
+### BarnOwl
 
-[Barnowl](http://barnowl.mit.edu/) is a command-line Zephyr client that supports advanced filtering and customisation. It is probably the most commonly used client, but requires some effort to get started. To use Barnowl effectively, you should connect to an [Athena dialup](http://web.mit.edu/dialup/www/ssh.html) and run Barnowl along with a program to renew your Kerberos tickets. The Athena command `athrun sipb owl-screen` will set this up for you.
+[BarnOwl](http://barnowl.mit.edu/) is a command-line Zephyr client that supports advanced filtering and customisation. It is probably the most commonly used client, but requires some effort to get started. To use BarnOwl effectively, you should connect to an [Athena dialup](http://web.mit.edu/dialup/www/ssh.html) and run BarnOwl along with a program to renew your Kerberos tickets. The Athena command `athrun sipb pag-screen` will set up ticket renewal, and `athrun barnowl` after that will run BarnOwl itself.
 
-In addition to primarily supporting Zephyr, Barnowl also lets you connect to [AIM](http://aim.com) and and [XMPP](http://xmpp.org/) (Google Talk, Facebook, etc.) networks.
+In addition to primarily supporting Zephyr, BarnOwl also lets you connect to [AIM](http://aim.com), [XMPP/Jabber](http://xmpp.org/) (Google Talk, Facebook, etc.), [Twitter](http://twitter.com), and IRC networks.
 
-See [Getting Started with Barnowl](http://barnowl.mit.edu/wiki/GettingStarted) for more information.
+See [Getting Started with BarnOwl](http://barnowl.mit.edu/wiki/GettingStarted) for more information.
 
 ### Roost
 
@@ -34,8 +34,7 @@ Roost makes use of [Webathena](https://webathena.mit.edu/) to keep you subscribe
 ### Zulip
 
 
-[Zulip](https://zulip.com/zephyr) is a fully-featured web-based Zephyr client that also provides [mobile apps](https://zephyr.zulip.com/apps) for Android and iOS and desktop apps for Linux, Mac, and Windows. Zulip is developed by a group of MIT alums and SIPB members who also developed [Ksplice](https://www.ksplice.com/) (rebootless updates for Linux).
-
+[Zulip](https://zulip.com/zephyr) is a web-based Zephyr client that also provides [mobile apps](https://zephyr.zulip.com/apps) for Android and iOS and desktop apps for Linux, Mac, and Windows. Zulip is developed by a company composed largely of MIT alums and SIPB members.
 Zulip, like Roost, is easy to set up because it uses Webathena for authentication.
 
 See [Zulip for MIT setup](http://zulip.com/zephyr) for details.