X-Git-Url: https://sipb.mit.edu/gitweb.cgi/wiki.git/blobdiff_plain/feae757ba741e8672fc616e7aa24744e0c35ebe9..33a08c6a55e0ed73ffe14fe3995fe29a0bc0ec96:/doc/zephyr.mdwn

diff --git a/doc/zephyr.mdwn b/doc/zephyr.mdwn
index 2dc6fcb..d9c6e6c 100644
--- a/doc/zephyr.mdwn
+++ b/doc/zephyr.mdwn
@@ -86,6 +86,20 @@ instance with the -i option to zwrite:
 A message without an instance specified will default to the instance
 “personal”.
 
+You can send zephyrs to individuals (as opposed to classes) with:
+
+    :zwrite USERNAME
+
+### Aside: zephyr triplets
+
+All messages are actually sent to a "zephyr triplet" -- a class, instance, and recipient. Subscriptions are also made to zephyr triplets. The recipient can be either "*" -- to indicate a broadcast message -- or a specific individual.
+
+When sending, the default class is "message", instance is "personal", and recipient is "*". `zwrite` supports sending to arbitrary triples with `:zwrite -c CLASS -i INSTANCE USERNAME` -- the two examples above use the defaults for the parts that aren't specified.
+
+For subscriptions, the class must be specified. You can specify all instances on a class with "\*", or specify just one instance. You can only sub to recipient "\*" or your own personals (indicated by "%me%").)
+
+### Common classes
+
 Some common classes include:
 
 <strong>help</strong>:
@@ -128,6 +142,9 @@ phrases and words being thrown around.  Some of these include:
 > You may see an instance change from `-i foo` to `-i foo.d`.  This
 > indicates a deviation or tangent from the the original topic.
 
+<strong>.q</strong>:
+> Simiarly, `.q` at the end of an instance name indicates a quote.
+
 <strong>starking</strong>:
 > Answering a question or replying to a topic to a topic several hours
 > (or days, occasionally) later. The term originates from Greg Stark,
@@ -136,14 +153,23 @@ phrases and words being thrown around.  Some of these include:
 > had moved on to an entirely different topic.
 
 <strong>ttants</strong>:
->  Literally, "Things That Are Not The Same".
+> Literally, "Things That Are Not The Same".
 
 <strong>prnf</strong>:
->  Literally, "Pseudo-Random Neuron Firings".
+> Literally, "Pseudo-Random Neuron Firings".
+
+<strong>eiz</strong> or <strong>eip</strong> or <strong>else</strong>:
+> Instances used to comment on discussions on other classes in Zephyr without
+> linking to the original source for reasons of privacy or discretion. "eiz"
+> means "Elsewhere in Zephyr", "eip" means "Elsewhere in Personals".
+
+<strong>eim</strong>:
+> "Elsewhere in Meatspace"; instance used to comment on events not on Zephyr.
 
-There are many other acronyms that are used; if you don't know what it
-means, try using the `whats foo` command at an Athena terminal. If you
-don't have the command, run `add sipb` first.
+There are many other acronyms that are used; if you don't know what it means,
+try using the `whats foo` command at an Athena terminal. If you don't have the
+command, run `add sipb` first. Alternatively, running the single command
+`athrun sipb whats foo` works as well.
 
 ### Zephyr Etiquette
 
@@ -182,5 +208,4 @@ to your `~/.environment` file if you use `tcsh` or
     ZEPHYR_CLIENT=false
 
 to your `~/.bash_environment` if you use `bash`. This will cause your
-shell to launch the `false` executable instead of `zwgc` which does
-nothing.
+shell to launch the `false` executable instead of `zwgc`, thereby disabling it ('false' does nothing).