Merge pull request #144 from ehb54/370-request-email-address-maintenance

370 request email address maintenance
ehb54 · Oct 22, 2024 · df2ef24 · df2ef24
2 parents 11c2429 + adc6c23
commit df2ef24
Show file tree

Hide file tree

Showing 95 changed files with 110 additions and 130 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,8 +1,7 @@
 UltraScan is licensed under the LGPL v3 license.
 
 Copyright ©  Borries Demeler, Ph.D.
-The University of Texas
-****************************************************************************************
+***************************************************************************************
 
 GNU LESSER GENERAL PUBLIC LICENSE
 

diff --git a/alpha/us.cpp b/alpha/us.cpp
@@ -627,11 +627,11 @@ void US_Win::help( int index )
 
             " * Nikolay Dokholyan\n"
             " * Jose Garcia de la Torre\n"
-				" * Haram Kim\n"
-				" * Minji Kim\n"
+			" * Haram Kim\n"
+			" * Minji Kim\n"
             " * Brad Langford\n"
             " * Thomas Laue\n"
-				" * Konrad Löhr\n"
+			" * Konrad Löhr\n"
             " * Luitgard Nagel-Steger\n"
             " * Zach Ozer\n"
             " * Karel Planken\n"
@@ -652,18 +652,12 @@ void US_Win::help( int index )
         tr( "About UltraScan..." ),
         tr( "UltraScan III version %1  (DEVELOPMENT)\n"
             "%2\n"
-            "Copyright 1989 - 2018\n"
-            "Borries Demeler and the University of Texas System\n\n"
+            "Copyright 1989 - 2024\n"
+            "Borries Demeler\n\n"
             "For more information, please visit:\n"
-            "http://www.ultrascan.uthscsa.edu/\n\n"
+            "http://www.ultrascan.aucsolutions.com/\n\n"
             "The author can be reached at:\n"
-            "The University of Texas Health Science Center\n"
-            "Department of Biochemistry\n"
-            "7703 Floyd Curl Drive\n"
-            "San Antonio, Texas 78229-3900\n"
-            "voice: (210) 767-3332\n"
-            "Fax:   (210) 567-6595\n"
-            "E-mail: [email protected]" ).arg( US_Version ).arg( REVISION ) );
+            "E-mail: [email protected]" ).arg( US_Version ).arg( REVISION ) );
 
       statusBar()->showMessage( tr( "Ready" ) );
       break;
@@ -740,7 +734,7 @@ bool US_Win::notice_check()
    // Query notice table in the us3_notice database
    US_Passwd pw;
    US_DB2    db;
-   QString   host  ( "uslims3.uthscsa.edu" );
+   QString   host  ( "uslims3.aucsolutions.edu" );
    QString   dbname( "us3_notice" );
    QString   user  ( "us3_notice" );
    QString   passwd( "us3_notice" );

diff --git a/doc/manual/advanced_config.body b/doc/manual/advanced_config.body
@@ -9,7 +9,7 @@
     in an advanced mode. Certain applications can benefit from use of more
     than one thread. These variations are governed by the configuration values
     that are set in this panel. Actual values should be set only under the
-    guidance of UTHSCSA software developers, since meanings of settings vary
+    guidance of software developers, since meanings of settings vary
     considerably from application to application.</p>
 
     <p class='center'> <img src="images/advanced_config.png" alt='Advanced

diff --git a/doc/manual/convert.body b/doc/manual/convert.body
@@ -13,7 +13,7 @@
     channels us_convert would convert that into three binary AUC
     files, which can then be uploaded to an UltraScan III database
     and prepared for analysis. The AUC file format is described <a
-    href='http://wiki.bcf2.uthscsa.edu/ultrascan3/wiki/Us3Formats'>here</a>.
+    href='http://wiki.aucsolutions.com/ultrascan3/wiki/Us3Formats'>here</a>.
     </p>
 
     <p class='center'><img src="images/convert.png" 

diff --git a/doc/manual/ultrascan3.txt b/doc/manual/ultrascan3.txt
@@ -1,9 +1,8 @@
 UltraScan III
 
-Copyright 1989 - 2021
+Copyright 1989 - 2024
 
-Copyright � 1989?2021 Borries Demeler, Ph.D.
-Copyright � 1997?2021 The University of Texas Health Science Center at San Antonio
+Copyright � 1989?2021 Borries Demeler, Ph.D.
 All rights reserved.
 
 UltraScan is free software; you can redistribute it and/or modify it under the
@@ -12,14 +11,8 @@ Foundation; either version 3 of the License, or (at your option) any later
 version.
 
 For more information, please visit:
-http://www.ultrascan.uthscsa.edu/
+http://www.ultrascan.aucsolutions.com/
 
 The author can be reached at:
 
-The University of Texas Health Science Center
-Department of Biochemistry
-7703 Floyd Curl Drive
-San Antonio, Texas 78229-3900
-voice: (210) 567-6592
-Fax:   (210) 567-6595
-E-mail: [email protected]
+E-mail: [email protected]
diff --git a/programs/us/us_de_DE.ts b/programs/us/us_de_DE.ts
@@ -333,16 +333,10 @@ Copyright 1989 - 2008
 Borries Demeler and the University of Texas System
 
 For more information, please visit:
-http://www.ultrascan.uthscsa.edu/
+http://www.ultrascan.aucsolutions.com/
 
 The author can be reached at:
-The University of Texas Health Science Center
-Department of Biochemistry
-7703 Floyd Curl Drive
-San Antonio, Texas 78229-3900
-voice: (210) 567-6592
-Fax:   (210) 567-6595
-E-mail: [email protected]</source>
+E-mail: [email protected]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/us_somo/attic/INSTALL b/us_somo/attic/INSTALL
@@ -68,11 +68,11 @@ echo $LD_LIBRARY_PATH
 or
 ldconfig -v | grep ultrascan
 
-Contact: Borries Demeler (demeler@biochem.uthscsa.edu)
+Contact: Borries Demeler (borries.demeler@umontana.edu)
 
 This document is part of the UltraScan Software Documentation
 distribution.  The latest version of this document can always be found at:
 
-      http://www.ultrascan.uthscsa.edu
+      http://www.ultrascan.aucsolutions.edu
 
-Last modified on February 16, 2005
+Last modified on October 20, 2024
diff --git a/us_somo/develop/src/us_hydrodyn_dad.cpp b/us_somo/develop/src/us_hydrodyn_dad.cpp
@@ -1683,7 +1683,7 @@ void US_Hydrodyn_Dad::add_files( bool load_conc, bool from_dir ) {
                QMessageBox::warning( this, 
                                      windowTitle()+ us_tr( ": Add files" ),
                                      us_tr( "I am having a problem decoding the frame numbers or q values from the file names\n"
-                                         "Please email a list of the file names you are trying to load to emre@biochem.uthscsa.edu" ) );
+                                         "Please email a list of the file names you are trying to load to emre.brookes@umt.edu" ) );
                return;
             }
             tmp = prepend_tmp + tmp;

diff --git a/us_somo/develop/src/us_hydrodyn_mals.cpp b/us_somo/develop/src/us_hydrodyn_mals.cpp
@@ -1567,7 +1567,7 @@ void US_Hydrodyn_Mals::add_files( bool load_conc, bool from_dir ) {
                QMessageBox::warning( this, 
                                      windowTitle()+ us_tr( ": Add files" ),
                                      us_tr( "I am having a problem decoding the frame numbers or q values from the file names\n"
-                                         "Please email a list of the file names you are trying to load to emre@biochem.uthscsa.edu" ) );
+                                         "Please email a list of the file names you are trying to load to emre.brookes@umt.edu" ) );
                return;
             }
             tmp = prepend_tmp + tmp;

diff --git a/us_somo/develop/src/us_hydrodyn_mals_saxs.cpp b/us_somo/develop/src/us_hydrodyn_mals_saxs.cpp
@@ -1579,7 +1579,7 @@ void US_Hydrodyn_Mals_Saxs::add_files( bool load_conc, bool from_dir ) {
                QMessageBox::warning( this, 
                                      windowTitle()+ us_tr( ": Add files" ),
                                      us_tr( "I am having a problem decoding the frame numbers or q values from the file names\n"
-                                         "Please email a list of the file names you are trying to load to emre@biochem.uthscsa.edu" ) );
+                                         "Please email a list of the file names you are trying to load to emre.brookes@umt.edu" ) );
                return;
             }
             tmp = prepend_tmp + tmp;

diff --git a/us_somo/develop/src/us_hydrodyn_saxs_hplc.cpp b/us_somo/develop/src/us_hydrodyn_saxs_hplc.cpp
@@ -1251,7 +1251,7 @@ void US_Hydrodyn_Saxs_Hplc::add_files( bool load_conc, bool from_dir ) {
                QMessageBox::warning( this, 
                                      windowTitle()+ us_tr( ": Add files" ),
                                      us_tr( "I am having a problem decoding the frame numbers or q values from the file names\n"
-                                         "Please email a list of the file names you are trying to load to emre@biochem.uthscsa.edu" ) );
+                                         "Please email a list of the file names you are trying to load to emre.brookes@umt.edu" ) );
                return;
             }
             tmp = prepend_tmp + tmp;

diff --git a/us_somo/develop/src/us_util.cpp b/us_somo/develop/src/us_util.cpp
@@ -287,7 +287,7 @@ void getFooter(QString *footer)
    date = QDate::currentDate();
    QString year;
    year.sprintf("%d", date.year());
-   *footer = "<hr><font face=helvetica size=-1>\nUltraScan Software Contact: <a href=mailto:demeler@biochem.uthscsa.edu>Borries Demeler</a>\n";
+   *footer = "<hr><font face=helvetica size=-1>\nUltraScan Software Contact: <a href=mailto:borries.demeler@umontana.edu>Borries Demeler</a>\n";
    *footer += "<br>\nThis document has been generated with the <i><b>UltraScan II</i></b> Data Analysis Software distribution.\n<br>\n";
    *footer += "All rights reserved, Copyright " + year + " <a href=http://www.uthscsa.edu>The University of";
    *footer += "Texas Health Science Center at San Antonio</a>.\n<br>UltraScan Home Page: ";

diff --git a/us_somo/extra/haddock/bin_i73/mpi/runjob b/us_somo/extra/haddock/bin_i73/mpi/runjob
@@ -5,7 +5,7 @@
 #SBATCH -n 1024          # total number of mpi tasks requested
 #SBATCH -p normal          # queue (partition) -- normal, development, etc.
 #SBATCH -t 02:00:00           # run time (hh:mm:ss)
-#SBATCH --mail-user=emre@biochem.uthscsa.edu
+#SBATCH --mail-user=emre.brookes@umt.edu
 #SBATCH --mail-type=begin  # email me when the job starts
 #SBATCH --mail-type=end    # email me when the job finishes
 

diff --git a/us_somo/somo/doc/manual/somo/IntegralBaselineTheory.html b/us_somo/somo/doc/manual/somo/IntegralBaselineTheory.html
@@ -69,7 +69,7 @@ <h3><center>Last updated: December 2017 </center></h3><p>
 <center><b>This is a work in progress and will eventually be updated.</b></center>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/baseline_best.html b/us_somo/somo/doc/manual/somo/baseline_best.html
@@ -33,7 +33,7 @@ <h3><center>Last updated: March 2016</center></h3><p>
 <center>This module is currently described within the main HPLC-SAXS panel help <a href=somo_saxs_hplc.html#baselinebest>here</a>.</center>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/copyright.html b/us_somo/somo/doc/manual/somo/copyright.html
@@ -5,7 +5,7 @@
 </td> <td align=vcenter> <h1 align=center><i>Manual</i></h1> </td> </tr> </table> <hr> <p> <H2><b><i>UltraScan</i></b> 
 Copyright Notice:</H2> <p><b>This software is licensed under the <a href=http://www.gnu.org/copyleft/gpl.html>General Public License v.3</a><p>
 
-Please direct all license inquiries to:<p> <a href=mailto:brookes@uthscsa.edu>
+Please direct all license inquiries to:<p> <a href=mailto:emre.brookes@umt.edu>
 Emre Brookes, Ph.D.</a>
 <p>and<p> 
 <a href=http://www.uthscsa.edu>The University of Texas Health  Science Center at San Antonio</a>
@@ -15,7 +15,7 @@
 
 <hr>
 <font face=helvetica size=-1>
-www contact: <a href=mailto:brookes@uthscsa.edu>Emre Brookes</a>
+www contact: <a href=mailto:emre.brookes@umt.edu>Emre Brookes</a>
 <p>
 This document is part of the <i><b>UltraScan</b></i> Software Documentation
 distribution: <a href=copyright.html>Copyright &#169 notice</a>.

diff --git a/us_somo/somo/doc/manual/somo/cormap.html b/us_somo/somo/doc/manual/somo/cormap.html
@@ -264,7 +264,7 @@ <h3><center>Details</center></h3>
 </div>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/dad_parameters.html b/us_somo/somo/doc/manual/somo/dad_parameters.html
@@ -30,7 +30,7 @@ <h3><center>Last updated: April 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/fractal_dimension_options.html b/us_somo/somo/doc/manual/somo/fractal_dimension_options.html
@@ -150,7 +150,7 @@ <h3><center>Last updated: June 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/mals_options.html b/us_somo/somo/doc/manual/somo/mals_options.html
@@ -30,7 +30,7 @@ <h3><center>Last updated: April 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/mals_parameters.html b/us_somo/somo/doc/manual/somo/mals_parameters.html
@@ -30,7 +30,7 @@ <h3><center>Last updated: April 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/mals_saxs_options.html b/us_somo/somo/doc/manual/somo/mals_saxs_options.html
@@ -30,7 +30,7 @@ <h3><center>Last updated: April 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_Gaussian_theory.html b/us_somo/somo/doc/manual/somo/saxs_hplc_Gaussian_theory.html
@@ -67,7 +67,7 @@ <h3><center>Last updated: December 2017 </center></h3><p>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_ciq.html b/us_somo/somo/doc/manual/somo/saxs_hplc_ciq.html
@@ -94,7 +94,7 @@ <h3><center>Last updated: July 2024 </center></h3><p>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_conc_csv_frames.html b/us_somo/somo/doc/manual/somo/saxs_hplc_conc_csv_frames.html
@@ -125,7 +125,7 @@ <h3><center>Details</center></h3>
 <hr>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_dctr.html b/us_somo/somo/doc/manual/somo/saxs_hplc_dctr.html
@@ -43,7 +43,7 @@ <h3><center>Last updated: June 2024 </center></h3><p>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_nth.html b/us_somo/somo/doc/manual/somo/saxs_hplc_nth.html
@@ -38,7 +38,7 @@ <h3><center>Last updated: April 2016 </center></h3><p>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_options.html b/us_somo/somo/doc/manual/somo/saxs_hplc_options.html
@@ -181,7 +181,7 @@ <h3><center>Last updated: June 2024 </center></h3><p>
 <br>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_p3d.html b/us_somo/somo/doc/manual/somo/saxs_hplc_p3d.html
@@ -38,7 +38,7 @@ <h3><center>Last updated: October 2013 </center></h3><p>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_hplc_parameters.html b/us_somo/somo/doc/manual/somo/saxs_hplc_parameters.html
@@ -73,7 +73,7 @@ <h3><center>Last updated: June 2024 </center></h3><p>
 
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/saxs_ift.html b/us_somo/somo/doc/manual/somo/saxs_ift.html
@@ -229,7 +229,7 @@ <h3><center>Details</center></h3>
 <hr>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/somo.html b/us_somo/somo/doc/manual/somo/somo.html
@@ -552,7 +552,7 @@ <h3><b>Options menus:</b></h3>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/somo_BEST_Analysis.html b/us_somo/somo/doc/manual/somo/somo_BEST_Analysis.html
@@ -83,7 +83,7 @@ <h2>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/somo_BEST_setup.html b/us_somo/somo/doc/manual/somo/somo_BEST_setup.html
@@ -101,7 +101,7 @@ <h2>Results</h2>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">

diff --git a/us_somo/somo/doc/manual/somo/somo_Dammin_Dammif_bead_model_properties.html b/us_somo/somo/doc/manual/somo/somo_Dammin_Dammif_bead_model_properties.html
@@ -33,7 +33,7 @@ <h2>
 <p>
 <hr>
 <font face="helvetica" size="-1">
-www contact: <a href="mailto:brookes@uthscsa.edu">Emre Brookes</a>
+www contact: <a href="mailto:emre.brookes@umt.edu">Emre Brookes</a>
 </font>
 <p>
 <font face="helvetica" size="-1">