12 files changed, 18 insertions, 16 deletions
diff --git a/ds9/doc/helpdesk.html b/ds9/doc/helpdesk.html
index ed49b54..41a5d2b 100644
--- a/ds9/doc/helpdesk.html
+++ b/ds9/doc/helpdesk.html
@@ -16,7 +16,7 @@
       <p>If you encounter any problems or have suggestions with DS9,
         please
         contact us:<br>
-        saord @ cfa.harvard.edu</p>
+        ds9help [at] cfa.harvard.edu</p>
       <p>William Joye<br>
         Smithsonian Astrophysical Observatory<br>
         60 Garden St.<br>
diff --git a/ds9/doc/user/binning/index.html b/ds9/doc/user/binning/index.html
index 281df7f..1656b81 100644
--- a/ds9/doc/user/binning/index.html
+++ b/ds9/doc/user/binning/index.html
@@ -26,7 +26,7 @@
 	  combining pixels in an image.  
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/doc/user/catalogs/index.html b/ds9/doc/user/catalogs/index.html
index 5526580..c2765e1 100644
--- a/ds9/doc/user/catalogs/index.html
+++ b/ds9/doc/user/catalogs/index.html
@@ -20,7 +20,7 @@
 	  catalog properties.  
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/doc/user/contour/index.html b/ds9/doc/user/contour/index.html
index 88e9ca2..5abf652 100644
--- a/ds9/doc/user/contour/index.html
+++ b/ds9/doc/user/contour/index.html
@@ -19,7 +19,7 @@
 	  the current session or saved to file for future use with ds9. 
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/doc/user/gui/index.html b/ds9/doc/user/gui/index.html
index 45c3d63..5ab407f 100644
--- a/ds9/doc/user/gui/index.html
+++ b/ds9/doc/user/gui/index.html
@@ -17,7 +17,7 @@
 	  the ds9 graphical user interface (GUI).
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/doc/user/index.html b/ds9/doc/user/index.html
index c8d25d8..aec7b93 100644
--- a/ds9/doc/user/index.html
+++ b/ds9/doc/user/index.html
@@ -42,6 +42,6 @@
       </li>
     </ul>
     <p> If there are topics that you would like to see covered in the
-      Users Manual, please email: saord @ cfa.harvard.edu. </p>
+      Users Manual, please email: ds9help [at] cfa.harvard.edu. </p>
   </body>
 </html>
diff --git a/ds9/doc/user/rgb/index.html b/ds9/doc/user/rgb/index.html
index 735386a..0981425 100644
--- a/ds9/doc/user/rgb/index.html
+++ b/ds9/doc/user/rgb/index.html
@@ -26,7 +26,7 @@
           optimal display results. 
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/doc/user/scripts/index.html b/ds9/doc/user/scripts/index.html
index 923ecec..9972e6c 100644
--- a/ds9/doc/user/scripts/index.html
+++ b/ds9/doc/user/scripts/index.html
@@ -28,7 +28,7 @@
 	  observation of the galaxy cluster Abell 2142 (ObsID 5005).  
 	</p>
       <p>
-	    If you encounter any problems, please email saord @ cfa.harvard.edu.
+	    If you encounter any problems, please email ds9help [at] cfa.harvard.edu.
 	  </p>
 </div>
 <hr size="5" noshade>
diff --git a/ds9/library/analysis.tcl b/ds9/library/analysis.tcl
index da1de2e..721815c 100644
--- a/ds9/library/analysis.tcl
+++ b/ds9/library/analysis.tcl
@@ -121,7 +121,7 @@ proc InitAnalysisFile {} {
 
     # autoload
     if {$panalysis(autoload)} {
-	foreach dir [list {.} "[GetEnvHome]/bin" {/usr/local/bin} {/opt/local/bin} {/soft/saord/bin}] {
+	foreach dir [list {.} "[GetEnvHome]/bin" {/usr/local/bin} {/opt/local/bin}] {
 	    foreach fn [glob -directory $dir -nocomplain "*.ds9"] {
 		if {[file exists $fn]} {
 		    ProcessAnalysisFile $fn
diff --git a/ds9/library/samp.tcl b/ds9/library/samp.tcl
index 5122bb3..f9f7f1a 100644
--- a/ds9/library/samp.tcl
+++ b/ds9/library/samp.tcl
@@ -88,7 +88,7 @@ proc SAMPConnect {{verbose 1}} {
 
     set sampmap(home.page) {string "http://ds9.si.edu/"}
     set sampmap(author.name) {string "William Joye"}
-    set sampmap(author.email) {string "saord@cfa.harvard.edu"}
+    set sampmap(author.email) {string "ds9help@cfa.harvard.edu"}
     set sampmap(author.affiliation) {string "Smithsonian Astrophysical Observatory"}
     set sampmap(ds9.version) "string [lindex $ds9(version) 0]"
 
diff --git a/ds9/macosx/README b/ds9/macosx/README
index 45da95e..9ea402a 100644
--- a/ds9/macosx/README
+++ b/ds9/macosx/README
@@ -1,5 +1,7 @@
-  To install SAOimageDS9, drag and drop the DS9 icon onto the Applications 
-  Folder. You also can drag the DS9 icon from Applications to your Dock in
-  order to make DS9 more easily accessible.
+To install SAOimageDS9, drag and drop the DS9 icon onto the Applications 
+Folder. You also can drag the SAOImageDS9 icon from Applications to your 
+Dock in order to make DS9 more easily accessible.
+
+For futher information, please visit
+us at http://ds9.si.edu or contact us at ds9help [at] cfa.harvard.edu
 
-  Email us with questions and comments: saord@cfa.harvard.edu
diff --git a/ds9/win/about.txt b/ds9/win/about.txt
index e3d6513..92e83be 100644
--- a/ds9/win/about.txt
+++ b/ds9/win/about.txt
@@ -1,4 +1,4 @@
 SAOImageDS9 installation program.
+
 For futher information, please visit
-us at http://ds9.si.edu
-or contact us at saord @ cfa.harvard.edu.
+us at http://ds9.si.edu or contact us at ds9help [at] cfa.harvard.edu