THIS IS 6.70

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1e5f931eafe00f20e24d368f65c61ef231a35571..a2eaf75bcc4df56c1b3b3835c702fc7aca3611c8 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Fri Jan 13 12:11:46 EST 2006 ajc
+* THIS IS 6.70
+
 Wed Jan 11 11:07:47 EST 2006 ajc
 * Moved the "Content-Identifer" (sic) header out of the envelope journal
   subpart headers and into the top-level headers.

diff --git a/citadel/docs/citadel.html b/citadel/docs/citadel.html
index ce8d991d9624c8d4bda4b138ba7d420a698a0e39..77b5d0ecdb12504dac7d399f31b87104a68ba8e1 100644 (file)
--- a/citadel/docs/citadel.html
+++ b/citadel/docs/citadel.html
@@ -35,8 +35,7 @@ others<br>
     <tr>
       <td valign="top">Art Cancro<br>
       </td>
-      <td valign="top"><i>overall system design and lead
-developer<br>
+      <td valign="top"><i>overall system design and lead developer<br>
       </i></td>
     </tr>
     <tr>
@@ -84,15 +83,13 @@ developer<br>
     <tr>
       <td valign="top">Stu Mark<br>
       </td>
-      <td valign="top"><i>additional client features, IGnet protocol
-design<br>
+      <td valign="top"><i>additional client features, IGnet protocol design<br>
       </i></td>
     </tr>
     <tr>
       <td valign="top">Edward S. Marshall<br>
       </td>
-      <td valign="top"><i>RBL checking function
-design<br>
+      <td valign="top"><i>RBL checking function design<br>
       </i></td>
     </tr>
     <tr>
@@ -110,14 +107,13 @@ design<br>
     <tr>
       <td valign="top">Trey Van Riper<br>
       </td>
-      <td valign="top"><i>portability enhancements<br>
+      <td valign="top"><i>QA and portability enhancements<br>
       </i></td>
     </tr>
     <tr>
       <td valign="top">John Walker<br>
       </td>
-      <td valign="top"><i>author of public domain base64
-encoder/decoder<br>
+      <td valign="top"><i>author of public domain base64 encoder/decoder<br>
       </i></td>
     </tr>
     <tr>
@@ -143,7 +139,7 @@ of the License, or (at your option) any later version.<br>
 <br>
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&nbsp; See the GNU
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details. </div>
 <div align="justify"><br>
 For more information, visit either of these locations on

diff --git a/citadel/docs/journaling.html b/citadel/docs/journaling.html
index b2496ac9742c97e0b4a5d09516b963992716a1d2..5408346e60ac26fd2b0d1ac50448b51c6729df12 100644 (file)
--- a/citadel/docs/journaling.html
+++ b/citadel/docs/journaling.html
@@ -153,10 +153,18 @@ Email destination of journalized messages [example@example.com]:
 </pre>
 &quot;Non-email messages&quot; refers to any message which has no recipients.
 This includes posts to public and private rooms, calendar items, address book
-entries, notes, tasks, and any other data types which may be introduced in
-the future.
+entries, notes, tasks, instant messages, and any other data types which may
+be introduced in the future.
 </p>
 
+<p>Naive administrators may find the categorization of instant messages in the
+latter category to be somewhat confusing.  After all, instant messages do have
+both a sender and a recipient.  However, they were never passed through the
+email submission and delivery chain, therefore they are not categorized as
+email.  As you already know, all instant messages are saved as posts to the
+<tt>Sent/Received Pages</tt> rooms of both the sender and recipient.  These
+posts are actually what is being journaled.</p>
+
 <p>Configuration of journaling using WebCit is even easier.  Log in with your
 web browser and then select Administration --&gt; Edit site-wide
 configuration --&gt; Indexing/Journaling, and you will find the same three