[SVN] r857 - in /branches/cyrus23/cyrus-imapd-2.3-development: debian/ man/ perl/sieve/ perl/sieve/lib/ perl/sieve/managesieve/ perl/sieve/scripts/ sieve/

debian at incase.de debian at incase.de
Sun Jan 17 20:34:15 UTC 2010


Author: myon
Date: Sun Jan 17 21:34:15 2010
New Revision: 857

URL: https://mail.incase.de/viewcvs?rev=857&root=cyrus22&view=rev
Log:
Revert whitespace- and copyright-only changes from diff.gz.

Modified:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-development/man/Makefile.in
    branches/cyrus23/cyrus-imapd-2.3-development/man/arbitron.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/chk_cyrus.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_cyrusdb.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_deliver.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_mboxlist.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/cvt_cyrusdb.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/cyr_expire.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/cyrus.conf.5
    branches/cyrus23/cyrus-imapd-2.3-development/man/deliver.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/fetchnews.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/fud.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/idled.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/imapd.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/imclient.3
    branches/cyrus23/cyrus-imapd-2.3-development/man/imtest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/installsieve.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/ipurge.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/krb.equiv.5
    branches/cyrus23/cyrus-imapd-2.3-development/man/lmtpd.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/lmtptest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/make_md5.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/master.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/mbexamine.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/mbpath.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/mupdatetest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/nntpd.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/nntptest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/notifyd.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/pop3d.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/pop3test.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/quota.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/reconstruct.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/rmnews.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/sivtest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/smmapd.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/smtptest.1
    branches/cyrus23/cyrus-imapd-2.3-development/man/squatter.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/sync_client.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/sync_reset.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/sync_server.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/syncnews.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/timsieved.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/tls_prune.8
    branches/cyrus23/cyrus-imapd-2.3-development/man/unexpunge.8
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/Makefile.in
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/Makefile.in
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/codes.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/exitcodes.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.c
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.c
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.c
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/Makefile.PL
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.h
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.pm
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/installsieve.pl
    branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/sieveshell.pl
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/COPYING
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.dist
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.in
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr-lex.l
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr.y
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_dump.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_emit.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_eval.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_generate.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/bytecode.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/comparator.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve-lex.l
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve.y
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_err.et
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_interface.h
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sievec.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieved.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/test.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.c
    branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.h

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog Sun Jan 17 21:34:15 2010
@@ -3,6 +3,7 @@
   * Remove versions from all Provides fields as dpkg doesn't support them.
   * Remove spurious leading and trailing spaces from Descriptions.
   * Remove Build-Depends on "| libsnmp5-dev" (package removed in 2005).
+  * Revert whitespace- and copyright-only changes from diff.gz.
 
  -- Christoph Berg <myon at debian.org>  Sun, 17 Jan 2010 13:10:15 +0100
 

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/Makefile.in?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/Makefile.in Sun Jan 17 21:34:15 2010
@@ -2,7 +2,7 @@
 # 
 # @configure_input@
 #
-# Copyright (c) 1997-2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -18,14 +18,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -40,7 +41,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: Makefile.in,v 1.36 2006/11/30 17:11:23 murch Exp $
+# $Id: Makefile.in,v 1.40 2008/04/04 12:46:49 murch Exp $
 
 srcdir = @srcdir@
 VPATH = @srcdir@

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/arbitron.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/arbitron.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/arbitron.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/arbitron.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH ARBITRON 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: arbitron.8,v 1.15 2006/11/30 17:11:23 murch Exp $
-
+.\" $Id: arbitron.8,v 1.16 2008/04/04 12:46:49 murch Exp $
 .SH NAME
 arbitron \- arbitron mailboxes
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/chk_cyrus.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/chk_cyrus.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/chk_cyrus.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/chk_cyrus.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CHK_CYRUS 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,6 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
+.\" $Id: chk_cyrus.8,v 1.5 2008/04/04 12:46:49 murch Exp $
 .SH NAME
 chk_cyrus \- perform a consistency check of the cyrus mailstore
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_cyrusdb.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_cyrusdb.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_cyrusdb.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_cyrusdb.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CTL_CYRUSDB 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ctl_cyrusdb.8,v 1.6 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: ctl_cyrusdb.8,v 1.7 2008/04/04 12:46:50 murch Exp $
 .SH NAME
 ctl_cyrusdb \- perform operations common to all Cyrus databases
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_deliver.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_deliver.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_deliver.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_deliver.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CTL_DELIVER 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ctl_deliver.8,v 1.9 2003/10/22 18:50:13 rjs3 Exp $
+.\" $Id: ctl_deliver.8,v 1.10 2008/04/04 12:46:50 murch Exp $
 .SH NAME
 ctl_deliver \- perform operations on the duplicate delivery database
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_mboxlist.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_mboxlist.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_mboxlist.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/ctl_mboxlist.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CTL_MBOXLIST 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ctl_mboxlist.8,v 1.10 2006/11/30 17:11:23 murch Exp $
+.\" $Id: ctl_mboxlist.8,v 1.13 2008/04/04 12:46:50 murch Exp $
 .SH NAME
 ctl_mboxlist \- perform operations on the mailbox list database
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/cvt_cyrusdb.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/cvt_cyrusdb.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/cvt_cyrusdb.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/cvt_cyrusdb.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CVT_CYRUSDB 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: cvt_cyrusdb.8,v 1.3 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: cvt_cyrusdb.8,v 1.4 2008/04/04 12:46:51 murch Exp $
 .SH NAME
 cvt_cyrusdb \- convert a database file between cyrus database formats
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/cyr_expire.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/cyr_expire.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/cyr_expire.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/cyr_expire.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CYR_EXPIRE 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: cyr_expire.8,v 1.3 2006/11/30 17:11:23 murch Exp $
+.\" $Id: cyr_expire.8,v 1.8 2008/10/06 15:24:04 murch Exp $
 .SH NAME
 cyr_expire \- expire messages and duplicate delivery database entries
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/cyrus.conf.5
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/cyrus.conf.5?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/cyrus.conf.5 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/cyrus.conf.5 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH CYRUS.CONF 5 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: cyrus.conf.5,v 1.13 2006/11/30 17:11:23 murch Exp $
+.\" $Id: cyrus.conf.5,v 1.16 2008/04/04 12:46:52 murch Exp $
 .SH NAME
 cyrus.conf \- Cyrus configuration file
 .SH DESCRIPTION

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/deliver.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/deliver.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/deliver.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/deliver.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH DELIVER 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: deliver.8,v 1.19 2006/11/30 17:11:23 murch Exp $
+.\" $Id: deliver.8,v 1.20 2008/04/04 12:46:52 murch Exp $
 .SH NAME
 deliver \- deliver mail to an IMAP mailbox
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/fetchnews.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/fetchnews.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/fetchnews.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/fetchnews.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH FETCHNEWS 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 2002 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: fetchnews.8,v 1.5 2006/11/30 17:11:23 murch Exp $
+.\" $Id: fetchnews.8,v 1.6 2008/04/04 12:46:52 murch Exp $
 .SH NAME
 fetchnews \- retrieve new articles from peer and feed to Cyrus
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/fud.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/fud.8?rev=857&root=cyrus22&r1=856&r2=857&view=3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/fud.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/fud.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH FUD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: fud.8,v 1.11 2003/10/22 18:50:13 rjs3 Exp $
+.\" $Id: fud.8,v 1.12 2008/04/04 12:46:53 murch Exp $
 .SH NAME
 FUD \- provide information about user mailboxes
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/idled.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/idled.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/idled.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/idled.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH IDLED 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: idled.8,v 1.4 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: idled.8,v 1.5 2008/04/04 12:46:53 murch Exp $
 .SH NAME
 idled \- provide near real-time updates for IMAP IDLE
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/imapd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/imapd.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/imapd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/imapd.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH IMAPD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: imapd.8,v 1.15 2002/10/03 19:02:41 ken3 Exp $
+.\" $Id: imapd.8,v 1.17 2008/08/20 20:41:16 wescraig Exp $
 .SH NAME
 imapd \- IMAP server process
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/imclient.3
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/imclient.3?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/imclient.3 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/imclient.3 Sun Jan 17 21:34:15 2010
@@ -1,6 +1,6 @@
 .TH IMCLIENT 3 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1997-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -16,15 +16,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -38,8 +39,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: imclient.3,v 1.12 2006/11/30 17:11:23 murch Exp $
-
+.\" $Id: imclient.3,v 1.13 2008/04/04 12:46:54 murch Exp $
 .SH NAME
 imclient library - authenticating callback interface to IMAP/IMSP servers
 .SH SYNOPSIS
@@ -382,8 +382,3 @@
 
 .SH KEYWORDS
 IMAP, ACAP, IMSP, Kerberos, Authentication
-
-.SH COPYRIGHT
-Copyright 1997-2002, Carnegie Mellon University.  All Rights Reserved.
-
-See the source distribution for copying information.

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/imtest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/imtest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/imtest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/imtest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH IMTEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: imtest.1,v 1.15 2006/11/30 17:11:23 murch Exp $
+.\" $Id: imtest.1,v 1.16 2008/04/04 12:46:55 murch Exp $
 .SH NAME
 imtest \- interactive IMAP test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/installsieve.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/installsieve.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/installsieve.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/installsieve.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH INSTALLSIEVE 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: installsieve.1,v 1.5 2002/05/25 19:57:48 leg Exp $
+.\" $Id: installsieve.1,v 1.6 2008/04/04 12:46:55 murch Exp $
 .SH NAME
 installsieve \- user utility for managing sieve scripts
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/ipurge.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/ipurge.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/ipurge.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/ipurge.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH IPURGE 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ipurge.8,v 1.9 2006/11/30 17:11:23 murch Exp $
+.\" $Id: ipurge.8,v 1.10 2008/04/04 12:46:55 murch Exp $
 .SH NAME
 ipurge \- delete mail from IMAP mailbox or partition based on age or size
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/krb.equiv.5
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/krb.equiv.5?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/krb.equiv.5 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/krb.equiv.5 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH KRB.EQUIV 5 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: krb.equiv.5,v 1.10 2003/10/22 18:50:13 rjs3 Exp $
+.\" $Id: krb.equiv.5,v 1.11 2008/04/04 12:46:55 murch Exp $
 .SH NAME
 \fB/etc/krb.equiv\fR \- Kerberos equivalences
 .SH DESCRIPTION

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/lmtpd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/lmtpd.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/lmtpd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/lmtpd.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH LMTPD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: lmtpd.8,v 1.6 2002/10/03 19:02:41 ken3 Exp $
+.\" $Id: lmtpd.8,v 1.7 2008/04/04 12:46:55 murch Exp $
 .SH NAME
 lmtpd \- LMTP server process
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/lmtptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/lmtptest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/lmtptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/lmtptest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH LMTPTEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: lmtptest.1,v 1.8 2006/11/30 17:11:23 murch Exp $
+.\" $Id: lmtptest.1,v 1.9 2008/04/04 12:46:56 murch Exp $
 .SH NAME
 lmtptest \- interactive LMTP test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/make_md5.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/make_md5.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/make_md5.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/make_md5.8 Sun Jan 17 21:34:15 2010
@@ -1,5 +1,46 @@
 .\" -*- nroff -*-
-.TH MAKE_MD5 HERMES 8
+.TH MAKE_MD5 8 "Project Cyrus" CMU
+.\"
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. The name "Carnegie Mellon University" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For permission or any legal
+.\"    details, please contact
+.\"      Carnegie Mellon University
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
+.\" 4. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by Computing Services
+.\"     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+.\"
+.\" CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+.\" THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+.\" AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+.\" FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.\" $Id: make_md5.8,v 1.4 2008/04/04 12:46:57 murch Exp $
 .SH NAME
 make_md5 \- Generate MD5 checksums for given set of users.
 .SH SYNOPSIS
@@ -36,7 +77,7 @@
 ]
 .SH DESCRIPTION
 Generate MD5 checksums for messages given set of users. Works as
-incremental update: reads in existing set of md5 checksums from
+incremental update: reads in existing set of MD5 checksums from
 \fImd5_dir/u/userid\fR (hashed on first letter of userid) if that file
 exists. Scans account looking for new messages, and then updates record.
 
@@ -48,7 +89,7 @@
 Read configuration options from \fIconfig-file\fR.
 .TP
 .BI \-D " md5_dir"
-Read and write md5 checksums from \fImd5_dir\fR, overrides configuration
+Read and write MD5 checksums from \fImd5_dir\fR, overrides configuration
 file setting of the same name.
 .TP
 .BI \-k " count"

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/master.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/master.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/master.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/master.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH MASTER 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1996-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $
+.\" $Id: master.8,v 1.15 2008/04/04 12:46:57 murch Exp $
 .SH NAME
 master \- master Cyrus process
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/mbexamine.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/mbexamine.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/mbexamine.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/mbexamine.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH MBEXAMINE 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: mbexamine.8,v 1.3 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: mbexamine.8,v 1.5 2008/04/04 12:46:58 murch Exp $
 .SH NAME
 mbexamine \- examine a cyrus-format mailbox
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/mbpath.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/mbpath.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/mbpath.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/mbpath.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH MBPATH 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: mbpath.8,v 1.6 2006/11/30 17:11:23 murch Exp $
+.\" $Id: mbpath.8,v 1.7 2008/04/04 12:46:58 murch Exp $
 .SH NAME
 mbpath \- translate mailbox names to filesystem paths
 .SH SYNOPSIS
@@ -86,4 +87,4 @@
 .TP
 .B /etc/imapd.conf
 
-.\" $Header: /cvs/src/cyrus/man/mbpath.8,v 1.6 2006/11/30 17:11:23 murch Exp $
+.\" $Header: /cvs/src/cyrus/man/mbpath.8,v 1.7 2008/04/04 12:46:58 murch Exp $

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/mupdatetest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/mupdatetest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/mupdatetest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/mupdatetest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH MUPDATETEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: mupdatetest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
-.\"
+.\" $Id: mupdatetest.1,v 1.8 2008/04/04 12:46:59 murch Exp $
 .SH NAME
 mupdatetest \- interactive MUPDATE test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/nntpd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/nntpd.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/nntpd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/nntpd.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH NNTPD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nntpd.8,v 1.3 2006/11/30 17:11:23 murch Exp $
+.\" $Id: nntpd.8,v 1.4 2008/04/04 12:46:59 murch Exp $
 .SH NAME
 nntpd \- NNTP server process
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/nntptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/nntptest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/nntptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/nntptest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH NNTPTEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: nntptest.1,v 1.4 2006/11/30 17:11:23 murch Exp $
+.\" $Id: nntptest.1,v 1.5 2008/04/04 12:47:00 murch Exp $
 .SH NAME
 nntptest \- interactive NNTP test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/notifyd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/notifyd.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/notifyd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/notifyd.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH NOTIFYD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: notifyd.8,v 1.7 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: notifyd.8,v 1.8 2008/04/04 12:47:00 murch Exp $
 .SH NAME
 notifyd \- Cyrus notification server
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/pop3d.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/pop3d.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/pop3d.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/pop3d.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH POP3D 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: pop3d.8,v 1.14 2006/11/30 17:11:23 murch Exp $
+.\" $Id: pop3d.8,v 1.15 2008/04/04 12:47:00 murch Exp $
 .SH NAME
 pop3d \- POP3 server process
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/pop3test.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/pop3test.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/pop3test.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/pop3test.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH POP3TEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: pop3test.1,v 1.11 2006/11/30 17:11:23 murch Exp $
+.\" $Id: pop3test.1,v 1.12 2008/04/04 12:47:01 murch Exp $
 .SH NAME
 pop3test \- interactive POP3 test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/quota.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/quota.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/quota.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/quota.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH QUOTA 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: quota.8,v 1.11 2003/10/22 18:50:13 rjs3 Exp $
+.\" $Id: quota.8,v 1.12 2008/04/04 12:47:01 murch Exp $
 .SH NAME
 quota \- report and optionally fix quota usage
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/reconstruct.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/reconstruct.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/reconstruct.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/reconstruct.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH RECONSTRUCT 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: reconstruct.8,v 1.21 2006/11/30 17:11:23 murch Exp $
+.\" $Id: reconstruct.8,v 1.25 2008/04/04 12:47:01 murch Exp $
 .SH NAME
 reconstruct \- reconstruct mailboxes
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/rmnews.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/rmnews.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/rmnews.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/rmnews.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH RMNEWS 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: rmnews.8,v 1.7 2003/08/09 23:43:14 rjs3 Exp $
+.\" $Id: rmnews.8,v 1.8 2008/04/04 12:47:02 murch Exp $
 .SH NAME
 rmnews \- expunge and remove news articles
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/sivtest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/sivtest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/sivtest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/sivtest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SIVTEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: sivtest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
-.\"
+.\" $Id: sivtest.1,v 1.8 2008/04/04 12:47:02 murch Exp $
 .SH NAME
 sivtest \- interactive MANAGESIEVE test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/smmapd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/smmapd.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/smmapd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/smmapd.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SMMAPD 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: smmapd.8,v 1.3 2006/11/30 17:11:23 murch Exp $
+.\" $Id: smmapd.8,v 1.4 2008/04/04 12:47:03 murch Exp $
 .SH NAME
 SMMAPD \- Sendmail socket map daemon
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/smtptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/smtptest.1?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/smtptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/smtptest.1 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SMTPTEST 1 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,8 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: smtptest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
-.\"
+.\" $Id: smtptest.1,v 1.8 2008/04/04 12:47:03 murch Exp $
 .SH NAME
 smtptest \- interactive SMTP test program
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/squatter.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/squatter.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/squatter.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/squatter.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SQUATTER 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: squatter.8,v 1.6 2003/10/22 18:50:13 rjs3 Exp $
+.\" $Id: squatter.8,v 1.9 2008/04/04 12:47:03 murch Exp $
 .SH NAME
 squatter \- create SQUAT indexes for mailboxes
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/sync_client.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/sync_client.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/sync_client.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/sync_client.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SYNC_CLIENT 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 2005 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: sync_client.8,v 1.3 2007/01/09 16:51:21 murch Exp $
+.\" $Id: sync_client.8,v 1.4 2008/04/04 12:47:04 murch Exp $
 .SH NAME
 sync_client \- client side of the synchronization (replication) engine
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/sync_reset.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/sync_reset.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/sync_reset.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/sync_reset.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SYNC_RESET 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 2005 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,11 +40,11 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: sync_reset.8,v 1.2 2006/11/30 17:11:23 murch Exp $
+.\" $Id: sync_reset.8,v 1.4 2008/04/04 12:47:04 murch Exp $
 .SH NAME
 sync_reset \- Account reset utility. DANGER.
 .SH SYNOPSIS
-.B sync_server
+.B sync_reset
 [
 .B \-C
 .I config-file

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/sync_server.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/sync_server.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/sync_server.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/sync_server.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SYNC_SERVER 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 2005 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: sync_server.8,v 1.2 2006/11/30 17:11:23 murch Exp $
+.\" $Id: sync_server.8,v 1.3 2008/04/04 12:47:04 murch Exp $
 .SH NAME
 sync_server \- server side of the synchronization (replication) engine
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/syncnews.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/syncnews.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/syncnews.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/syncnews.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH SYNCNEWS 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: syncnews.8,v 1.9 2003/08/09 23:43:15 rjs3 Exp $
+.\" $Id: syncnews.8,v 1.10 2008/04/04 12:47:05 murch Exp $
 .SH NAME
 syncnews \- synchronize IMAP news mailboxes with active file
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/timsieved.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/timsieved.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/timsieved.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/timsieved.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH TIMSIEVED 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: timsieved.8,v 1.7 2006/11/30 17:11:23 murch Exp $
+.\" $Id: timsieved.8,v 1.8 2008/04/04 12:47:05 murch Exp $
 .SH NAME
 timsieved \- CMU hack for getting sieve scripts onto the server
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/tls_prune.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/tls_prune.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/tls_prune.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/tls_prune.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH TLS_PRUNE 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2000 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: tls_prune.8,v 1.3 2003/08/09 23:43:15 rjs3 Exp $
+.\" $Id: tls_prune.8,v 1.4 2008/04/04 12:47:06 murch Exp $
 .SH NAME
 tls_prune \- prune expired sessions from the TLS sessions database
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/man/unexpunge.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/man/unexpunge.8?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/man/unexpunge.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/man/unexpunge.8 Sun Jan 17 21:34:15 2010
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .TH UNEXPUNGE 8 "Project Cyrus" CMU
 .\"
-.\" Copyright (c) 1998-2005 Carnegie Mellon University.  All rights reserved.
+.\" Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -17,15 +17,16 @@
 .\"
 .\" 3. The name "Carnegie Mellon University" must not be used to
 .\"    endorse or promote products derived from this software without
-.\"    prior written permission. For permission or any other legal
+.\"    prior written permission. For permission or any legal
 .\"    details, please contact
-.\"      Office of Technology Transfer
 .\"      Carnegie Mellon University
-.\"      5000 Forbes Avenue
-.\"      Pittsburgh, PA  15213-3890
-.\"      (412) 268-4387, fax: (412) 268-7395
-.\"      tech-transfer at andrew.cmu.edu
-.\"
+.\"      Center for Technology Transfer and Enterprise Creation
+.\"      4615 Forbes Avenue
+.\"      Suite 302
+.\"      Pittsburgh, PA  15213
+.\"      (412) 268-7393, fax: (412) 268-7395
+.\"      innovation at andrew.cmu.edu
+ *
 .\" 4. Redistributions of any form whatsoever must retain the following
 .\"    acknowledgment:
 .\"    "This product includes software developed by Computing Services
@@ -39,7 +40,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: unexpunge.8,v 1.2 2006/11/30 17:11:23 murch Exp $
+.\" $Id: unexpunge.8,v 1.4 2008/04/04 12:47:06 murch Exp $
 .SH NAME
 unexpunge \- restore expunged (but yet unremoved) messages
 .SH SYNOPSIS

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/Makefile.in?rev=857&root=cyrus22&r1=856&r2=3D857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/Makefile.in Sun Jan 17 21:34:15 2010
@@ -1,9 +1,8 @@
 # SIEVE Makefile for cyrus software
-# $Id: Makefile.in,v 1.16 2003/10/22 18:50:24 rjs3 Exp $
 #
 # @configure_input@
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -19,14 +18,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -41,7 +41,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: Makefile.in,v 1.16 2003/10/22 18:50:24 rjs3 Exp $
+# $Id: Makefile.in,v 1.18 2008/04/04 12:47:16 murch Exp $
 # 
 
 SUBDIRS = lib managesieve

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/Makefile.in?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/Makefile.in Sun Jan 17 21:34:15 2010
@@ -2,7 +2,7 @@
 # 
 # @configure_input@
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -18,14 +18,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -40,7 +41,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: Makefile.in,v 1.15 2006/11/30 17:11:24 murch Exp $
+# $Id: Makefile.in,v 1.16 2008/04/04 12:47:17 murch Exp $
 # 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/codes.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/codes.h?rev=857&root=cyrus22&r1=856&r2=3D857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/codes.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/codes.h Sun Jan 17 21:34:15 2010
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,14 +15,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -37,9 +38,8 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: codes.h,v 1.5 2008/04/04 12:47:17 murch Exp $
  */
-
-/* $Id: codes.h,v 1.4 2003/02/13 20:15:53 rjs3 Exp $ */
 
 #ifndef _CODES_H_
 #define _CODES_H_

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/exitcodes.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/exitcodes.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/exitcodes.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/exitcodes.h Sun Jan 17 21:34:15 2010
@@ -1,7 +1,6 @@
 /* exitcodes.h -- wrapper around sysextis.h
- * $Id: exitcodes.h,v 1.3 2003/02/13 20:15:53 rjs3 Exp $
  *
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -17,14 +16,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -39,6 +39,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: exitcodes.h,v 1.4 2008/04/04 12:47:18 murch Exp $
  */
 
 /* Sendmail has some weird ideas on what constitutes permenant failure.  On

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.c Sun Jan 17 21:34:15 2010
@@ -1,9 +1,8 @@
 /* lex.c -- lexers for command line script installer
  * Tim Martin
- * $Id: lex.c,v 1.8 2006/11/30 17:11:24 murch Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -19,14 +18,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -41,6 +41,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: lex.c,v 1.10 2008/04/04 12:47:20 murch Exp $
  */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/lex.h Sun Jan 17 21:34:15 2010
@@ -1,10 +1,9 @@
 /* lex.h 
  * Tim Martin
  * 9/21/99
- * $Id: lex.h,v 1.7 2003/02/13 20:15:53 rjs3 Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,14 +19,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -42,8 +42,8 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: lex.h,v 1.8 2008/04/04 12:47:20 murch Exp $
  */
-
 
 #ifndef _LEX_H_
 #define _LEX_H_

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.c Sun Jan 17 21:34:15 2010
@@ -1,10 +1,9 @@
 /* mystring.c -- string utility
  * Tim Martin
  * 9/21/99
- * $Id: mystring.c,v 1.7 2003/02/13 20:15:53 rjs3 Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,14 +19,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -42,6 +42,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: mystring.c,v 1.9 2008/04/04 12:47:20 murch Exp $
  */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/mystring.h Sun Jan 17 21:34:15 2010
@@ -1,10 +1,9 @@
 /* mystring.h
  * Tim Martin
  * 9/21/99
- * $Id: mystring.h,v 1.5 2003/02/13 20:15:53 rjs3 Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,14 +19,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -42,6 +42,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: mystring.h,v 1.6 2008/04/04 12:47:21 murch Exp $
  */
 
 #include "codes.h"

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.c Sun Jan 17 21:34:15 2010
@@ -1,10 +1,9 @@
 /* request.c -- request to execute functions on the timsieved server
  * Tim Martin
  * 9/21/99
- * $Id: request.c,v 1.16 2003/02/13 20:15:53 rjs3 Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,14 +19,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -42,6 +42,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: request.c,v 1.18 2008/04/04 12:47:21 murch Exp $
  */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/lib/request.h Sun Jan 17 21:34:15 2010
@@ -1,10 +1,9 @@
 /* request.h -- request to execute functions on the timsieved server
  * Tim Martin
  * 9/21/99
- * $Id: request.h,v 1.7 2003/02/13 20:15:53 rjs3 Exp $
  */
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -20,14 +19,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -42,6 +42,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: request.h,v 1.8 2008/04/04 12:47:22 murch Exp $
  */
 #ifndef _REQUEST_H_
 #define _REQUEST_H_

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/Makefile.PL
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/Makefile.PL?rev=857&root=cyrus22&r1=
3D856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/Makefile.PL (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/Makefile.PL Sun Jan 17 21:34:15 2010
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -15,14 +15,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -37,7 +38,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: Makefile.PL,v 1.14 2006/11/30 17:11:24 murch Exp $
+# $Id: Makefile.PL,v 1.15 2008/04/04 12:47:23 murch Exp $
 #
 use ExtUtils::MakeMaker;
 use Config;

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.h Sun Jan 17 21:34:15 2010
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,14 +15,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -37,9 +38,8 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: managesieve.h,v 1.6 2008/04/04 12:47:23 murch Exp $
  */
-
-/* $Id: managesieve.h,v 1.5 2003/02/13 20:15:55 rjs3 Exp $ */
 
 #include "isieve.h"
 

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.pm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.pm?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.pm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/managesieve/managesieve.pm Sun Jan 17 21:34:15 2010
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -15,14 +15,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -37,7 +38,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: managesieve.pm,v 1.8 2002/05/25 19:57:51 leg Exp $
+# $Id: managesieve.pm,v 1.9 2008/04/04 12:47:24 murch Exp $
 #
 package Cyrus::SIEVE::managesieve;
 

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/installsieve.pl
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/installsieve.pl?rev=857&root=cyrus22&r1=
3D856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/installsieve.pl (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/installsieve.pl Sun Jan 17 21:34:15 2010
@@ -2,7 +2,7 @@
 exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 #!perl -w
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -18,14 +18,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -40,7 +41,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: installsieve.pl,v 1.7 2002/05/25 19:57:52 leg Exp $
+# $Id: installsieve.pl,v 1.8 2008/04/04 12:47:25 murch Exp $
 #
 use Cyrus::SIEVE::managesieve;
 use Getopt::Long;

Modified: branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/sieveshell.pl
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/sieveshell.pl?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/sieveshell.pl (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/perl/sieve/scripts/sieveshell.pl Sun Jan 17 21:34:15 2010
@@ -2,7 +2,7 @@
 exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
 #!perl -w
 #
-# Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -18,14 +18,15 @@
 #
 # 3. The name "Carnegie Mellon University" must not be used to
 #    endorse or promote products derived from this software without
-#    prior written permission. For permission or any other legal
+#    prior written permission. For permission or any legal
 #    details, please contact
-#      Office of Technology Transfer
 #      Carnegie Mellon University
-#      5000 Forbes Avenue
-#      Pittsburgh, PA  15213-3890
-#      (412) 268-4387, fax: (412) 268-7395
-#      tech-transfer at andrew.cmu.edu
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
 #
 # 4. Redistributions of any form whatsoever must retain the following
 #    acknowledgment:
@@ -40,7 +41,7 @@
 # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: sieveshell.pl,v 1.24 2006/11/30 17:11:24 murch Exp $
+# $Id: sieveshell.pl,v 1.25 2008/04/04 12:47:25 murch Exp $
 #
 
 use Cyrus::SIEVE::managesieve;

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/COPYING
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/COPYING?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/COPYING (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/COPYING Sun Jan 17 21:34:15 2010
@@ -1,26 +1,44 @@
 /* cmu-sieve
  * Larry Greenfield
- * $Id: COPYING,v 1.1.1.1 1999/07/02 18:55:35 leg Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: COPYING,v 1.2 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1998 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.dist
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.dist?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.dist (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.dist Sun Jan 17 21:34:15 2010
@@ -1,4 +1,4 @@
-# $Id: Makefile.dist,v 1.8 2006/11/30 17:11:24 murch Exp $
+# $Id: Makefile.dist,v 1.9 2007/10/17 20:05:57 murch Exp $
 
 YFLAGS = -d
 

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.in?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/Makefile.in Sun Jan 17 21:34:15 2010
@@ -1,27 +1,46 @@
 # Makefile.in - sieve makefile
 # @configure_input@
-# $Id: Makefile.in,v 1.39 2006/11/30 17:11:24 murch Exp $
-################################################################
-#        Copyright 1998 by Carnegie Mellon University
 #
-#                      All Rights Reserved
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
-#Permission to use, copy, modify, and distribute this software and its
-#documentation for any purpose and without fee is hereby granted,
-#provided that the above copyright notice appear in all copies and that
-#both that copyright notice and this permission notice appear in
-#supporting documentation, and that the name of Carnegie Mellon University
-#not be used in advertising or publicity pertaining to distribution of the
-#software without specific, written prior permission.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
 #
-#CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-#SOFTWARE, INCLUDING #ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, 
-#IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR ANY SPECIAL, 
-#INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
-#LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-#OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-#PERFORMANCE OF THIS SOFTWARE.
-################################################################
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $Id: Makefile.in,v 1.45 2008/07/10 16:37:20 murch Exp $
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr-lex.l
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr-lex.l?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr-lex.l (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr-lex.l Sun Jan 17 21:34:15 2010
@@ -2,30 +2,48 @@
 /*
  * addr-lex.l -- RFC 822 address lexer
  * Ken Murchison
- * $Id: addr-lex.l,v 1.9 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: addr-lex.l,v 1.11 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #include "addr.h"
 #include <stdlib.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr.y
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr.y?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr.y (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/addr.y Sun Jan 17 21:34:15 2010
@@ -2,30 +2,48 @@
 /*
  * addr.y -- RFC 822 address parser
  * Ken Murchison
- * $Id: addr.y,v 1.12 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: addr.y,v 1.14 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_dump.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_dump.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_dump.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_dump.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* bc_generate.c -- sieve bytecode- almost flattened bytecode
  * Rob Siemborski
- * $Id: bc_dump.c,v 1.3 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: bc_dump.c,v 1.5 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 2001 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_emit.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_emit.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_emit.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_emit.c Sun Jan 17 21:34:15 2010
@@ -1,30 +1,48 @@
 /* bc_emit.c -- sieve bytecode - pass 2 of the compiler
  * Rob Siemborski
  * Jen Smith
- * $Id: bc_emit.c,v 1.3 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: bc_emit.c,v 1.4 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 2001 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_eval.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_eval.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_eval.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_eval.c Sun Jan 17 21:34:15 2010
@@ -1,28 +1,46 @@
 /* bc_eval.c - evaluate the bytecode
- * $Id: bc_eval.c,v 1.9 2007/02/05 18:44:01 jeaton Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: bc_eval.c,v 1.13 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 2001 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_generate.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_generate.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_generate.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/bc_generate.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* bc_generate.c -- sieve bytecode- almost flattened bytecode
  * Rob Siemborski
- * $Id: bc_generate.c,v 1.4 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: bc_generate.c,v 1.5 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 2001 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/bytecode.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/bytecode.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/bytecode.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/bytecode.h Sun Jan 17 21:34:15 2010
@@ -1,27 +1,46 @@
 /* bytecode.h -- bytecode definition
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: bytecode.h,v 1.5 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*****************************************************************/
 
 #ifndef SIEVE_BYTECODE_H
 #define SIEVE_BYTECODE_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/comparator.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/comparator.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/comparator.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/comparator.h Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* comparator.h
  * Larry Greenfield
- * $Id: comparator.h,v 1.12 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: comparator.h,v 1.16 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifndef COMPARATOR_H
 #define COMPARATOR_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* interp.c -- sieve script interpretor builder
  * Larry Greenfield
- * $Id: interp.c,v 1.24 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: interp.c,v 1.26 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/interp.h Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* interp.h -- interpretor definition
  * Larry Greenfield
- * $Id: interp.h,v 1.8 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: interp.h,v 1.9 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*****************************************************************/
 
 #ifndef SIEVE_INTERP_H
 #define SIEVE_INTERP_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* message.c -- message parsing functions
  * Larry Greenfield
- * $Id: message.c,v 1.30 2007/02/05 18:44:01 jeaton Exp $
- */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: message.c,v 1.34 2008/03/24 20:08:46 murch Exp $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/message.h Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* message.h
  * Larry Greenfield
- * $Id: message.h,v 1.17 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: message.h,v 1.19 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifndef MESSAGE_H
 #define MESSAGE_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* script.c -- sieve script functions
  * Larry Greenfield
- * $Id: script.c,v 1.63 2006/11/30 17:11:24 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/script.h Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* script.h -- script definition
  * Larry Greenfield
- * $Id: script.h,v 1.12 2006/11/30 17:11:25 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: script.h,v 1.13 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifndef SIEVE_SCRIPT_H
 #define SIEVE_SCRIPT_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve-lex.l
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve-lex.l?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve-lex.l (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve-lex.l Sun Jan 17 21:34:15 2010
@@ -1,30 +1,48 @@
 %{
 /* sieve.l -- sieve lexer
  * Larry Greenfield
- * $Id: sieve-lex.l,v 1.22 2007/02/07 13:25:14 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: sieve-lex.l,v 1.23 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve.y
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve.y?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve.y (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve.y Sun Jan 17 21:34:15 2010
@@ -1,30 +1,48 @@
 %{
 /* sieve.y -- sieve parser
  * Larry Greenfield
- * $Id: sieve.y,v 1.33 2006/11/30 17:11:25 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: sieve.y,v 1.39 2008/10/02 13:36:56 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_err.et
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_err.et?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_err.et (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_err.et Sun Jan 17 21:34:15 2010
@@ -1,8 +1,46 @@
 # sieve_err.et -- Error codes for the Sieve subsystem
-# $Id: sieve_err.et,v 1.2 2002/05/25 19:57:52 leg Exp $
 #
-# Copyright 2000 Carnegie Mellon University
+# Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
 #
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The name "Carnegie Mellon University" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For permission or any legal
+#    details, please contact
+#      Carnegie Mellon University
+#      Center for Technology Transfer and Enterprise Creation
+#      4615 Forbes Avenue
+#      Suite 302
+#      Pittsburgh, PA  15213
+#      (412) 268-7393, fax: (412) 268-7395
+#      innovation at andrew.cmu.edu
+#
+# 4. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by Computing Services
+#     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+#
+# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# $Id: sieve_err.et,v 1.3 2008/03/24 20:08:46 murch Exp $
+
 error_table siev
 
 ec SIEVE_FAIL,

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_interface.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_interface.h?rev=857&root=cyrus22&r1=856&r2=
3D857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_interface.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieve_interface.h Sun Jan 17 21:34:15 2010
@@ -1,28 +1,46 @@
 /* sieve_interface.h -- interface for deliver
- * $Id: sieve_interface.h,v 1.20 2006/11/30 17:11:25 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: sieve_interface.h,v 1.21 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifndef SIEVE_H
 #define SIEVE_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sievec.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sievec.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sievec.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sievec.c Sun Jan 17 21:34:15 2010
@@ -1,9 +1,7 @@
 /* sievec.c -- compile a sieve script to bytecode manually
  * Rob Siemborski
- * $Id: sievec.c,v 1.6 2006/11/30 17:11:25 murch Exp $
- */
-/*
- * Copyright (c) 1999-2000 Carnegie Mellon University.  All rights reserved.
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -19,14 +17,15 @@
  *
  * 3. The name "Carnegie Mellon University" must not be used to
  *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any other legal
+ *    prior written permission. For permission or any legal
  *    details, please contact
- *      Office of Technology Transfer
  *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer at andrew.cmu.edu
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
  *
  * 4. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
@@ -41,6 +40,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
+ * $Id: sievec.c,v 1.8 2008/03/24 20:08:46 murch Exp $
  */
 
 #ifdef HAVE_CONFIG_H

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieved.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieved.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieved.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/sieved.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* sieved.c -- bytecode decompiler
  * Jen Smith
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: sieved.c,v 1.8 2008/03/24 20:08:46 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*****************************************************************/
-
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/test.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/test.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/test.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/test.c Sun Jan 17 21:34:15 2010
@@ -2,32 +2,51 @@
   
  * test.c -- tester for libsieve
  * Larry Greenfield
- * $Id: test.c,v 1.26 2006/11/30 17:11:25 murch Exp $
  *
  * usage: "test message script"
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
+/*
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: test.c,v 1.29 2008/03/24 20:08:46 murch Exp $
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.c?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.c Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* tree.c -- abstract syntax tree handling
  * Larry Greenfield
- * $Id: tree.c,v 1.12 2006/11/30 17:11:25 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: tree.c,v 1.14 2008/03/24 20:08:47 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.h?rev=857&root=cyrus22&r1=856&r2=857&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/sieve/tree.h Sun Jan 17 21:34:15 2010
@@ -1,29 +1,47 @@
 /* tree.h -- abstract syntax tree
  * Larry Greenfield
- * $Id: tree.h,v 1.10 2006/11/30 17:11:25 murch Exp $
+ *
+ * Copyright (c) 1994-2008 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation at andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * $Id: tree.h,v 1.11 2008/03/24 20:08:47 murch Exp $
  */
-/***********************************************************
-        Copyright 1999 by Carnegie Mellon University
-
-                      All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Carnegie Mellon
-University not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-******************************************************************/
 
 #ifndef TREE_H
 #define TREE_H




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list