Merge branch 'master' of animus.robocracy.org:/srv/git/dotfiles

2 files changed, 14 insertions, 3 deletions

diff --git a/.pinerc b/.pinerc
index 07d9a7c..cade030 100644
--- a/.pinerc
+++ b/.pinerc
@@ -81,7 +81,7 @@ initial-keystroke-list=
 default-composer-hdrs=
 
 # Add these customized headers (and possible default values) when composing
-customized-hdrs=Reply-To
+customized-hdrs=Reply-To:
 
 # When viewing messages, include this list of headers
 viewer-hdrs=
@@ -160,7 +160,7 @@ character-set=
 editor=
 
 # Specifies the program invoked by ^T in the Composer.
-speller=
+speller=/usr/bin/ispell
 
 # Specifies the column of the screen where the composer should wrap.
 composer-wrap-column=
@@ -318,7 +318,7 @@ address-book=
 global-address-book=
 
 # Set by Pine; controls beginning-of-month sent-mail pruning.
-last-time-prune-questioned=119.10
+last-time-prune-questioned=199.11
 
 # Set by Pine; controls display of "new version" message.
 last-version-used=6.00
@@ -570,6 +570,8 @@ index-from-background-color=
 index-opening-foreground-color=
 index-opening-background-color=
 
+# LDAP servers for looking up addresses.
+
 # WebAlpine index table row height
 wp-indexheight=
 
diff --git a/.ssh/config b/.ssh/config
index 61e5187..abd6bc8 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -22,3 +22,12 @@ Host athena
     #GSSAPIAuthentication yes
     #GSSAPIDelegateCredentials yes
     #PreferredAuthentications publickey,gssapi,password
+Host spt
+    HostName spt.uchicago.edu
+    ForwardX11 yes
+Host fajitta
+    HostName 128.32.117.23
+    User mux
+Host flauta
+    HostName flauta.berkeley.edu
+    User polarbear