* Fixed am/pm bug in time display

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1db0b0b2127e31498502f1c2a698e856b277fa23..447e9be5b4f05a6d0d8d4ea81ba15854e9b00182 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 570.12  2000/04/07 20:22:34  ajc
+ * Fixed am/pm bug in time display
+
  Revision 570.11  2000/04/07 19:22:45  ajc
  * For services disabled by setting port number to -1, administratively skip
    the bind instead of just allowing it to fail.
@@ -1808,3 +1811,6 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
+
+
+

diff --git a/citadel/docs/install.txt b/citadel/docs/install.txt
index 31428435a7ccc653d82e8b1393b93d5071f14df7..aa43ab7359f6ed1b508c4a9f3d17f5d0ffcee7ed 100644 (file)
--- a/citadel/docs/install.txt
+++ b/citadel/docs/install.txt
@@ -22,14 +22,14 @@ Unix and Unix-like platforms.  The author's current development environment
     - Documentation
  
  Some knowledge of the Unix system is necessary to install and manage the
-system. It is preferable that the sysop have superuser access to the operating
+system. It is mandatory that the sysop have "root" access to the operating
 system. The following are required to install Citadel/UX:
 
     - A Unix operating system (Linux, BSD, Solaris, DEC Unix, etc.)
     - C compiler (such as gcc or egcs) and "make"
-    - POSIX threads
+    - POSIX threads (the "pthreads" library)
     - TCP/IP
-    - The "gdbm" record manager
+    - The "gdbm" library
     - Enough disk space to hold all of the programs and data
  
  If you are running Citadel/UX on a Linux system, it is STRONGLY recommended
@@ -122,8 +122,16 @@ mail, finding private rooms, etc.   The Citadel server needs to be started
 as root in order to bind to a privileged port, but as soon as its
 initialization is finished, it changes its user ID to your BBS user ID in
 order to avoid security holes.
-  
-    
+ 
+ 
+ UPGRADING
+ 
+  Upgrading to a new version uses the same build procedure as compiling the
+program for a fresh install, except that you want to do "make install-exec"
+instead of "make install".  This will overwrite the programs but not your
+data.  Be sure to shut down citserver during this process!
+   
+     
  THE CITADEL.RC FILE
  
  This is a change from the way things were done before.  All client-side setup
@@ -175,7 +183,7 @@ example, you could use a command like "cat >>$HOME/archive" to save copies
 of important messages in a textfile.
 
 
-URL VIEWING:
+ URL VIEWING
 
 urlcmd=netscape -remote "openURL(%s)"
 

diff --git a/citadel/tools.c b/citadel/tools.c
index 5955db8b936c50f627bba61c17a78df68f44c5ae..94b1e456156750b6326fdff00b16613de36f356c 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -351,7 +351,7 @@ void fmt_date(char *buf, time_t thetime) {
                tm->tm_year + 1900,
                ( (tm->tm_hour > 12) ? (tm->tm_hour - 12) : (tm->tm_hour) ),
                tm->tm_min,
-               ( (tm->tm_hour > 12) ? "pm" : "am" )
+               ( (tm->tm_hour >= 12) ? "pm" : "am" )
        );
 }