two more subpackage blocks

functions/gettext.php

@@ -1,7 +1,6 @@
 <?php
-
 /**
- * gettext.php
+ * SquirrelMail internal gettext functions
  *
  * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
@@ -13,9 +12,9 @@
  *   $sm_language, I think
  *
  * @link http://www.php.net/gettext Original php gettext manual
- *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage i18n
  */
 
 /** Almost everything requires global.php... */

functions/imap.php

@@ -9,8 +9,9 @@
  * This just includes the different sections of the imap functions.
  * They have been organized into these sections for simplicity sake.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  */
 
 /** Includes */

functions/imap_asearch.php

@@ -8,13 +8,14 @@
  *
  * IMAP asearch routines
  *
- * $Id$
+ * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
+ *
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  * @see search.php
  * @link ftp://ftp.rfc-editor.org/in-notes/rfc3501.txt
  * @author Alex Lemaresquier - Brainstorm - alex at brainstorm.fr
- *
- * Subfolder search idea from Patch #806075 by Thomas Pohl xraven at users.sourceforge.net. Thanks Thomas!
  */
 
 /** This functionality requires the IMAP and date functions */

functions/imap_general.php

@@ -8,8 +8,9 @@
  *
  * This implements all functions that do general imap functions.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  */
 
 /** Includes.. */

functions/imap_mailbox.php

@@ -8,8 +8,9 @@
  *
  * This impliments all functions that manipulate mailboxes
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  */
 
 /** UTF7 support */

functions/imap_messages.php

@@ -9,8 +9,9 @@
  * This implements functions that manipulate messages
  * NOTE: Quite a few functions in this file are obsolete
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  */
 
 /**

functions/imap_search.php

@@ -8,8 +8,9 @@
  *
  * IMAP search routines
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  * @deprecated This search interface has been largely replaced by asearch
  */
 

functions/imap_utf7_local.php

@@ -8,8 +8,9 @@
  *
  * This implements all functions that do imap UTF7 conversions.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
+ * @subpackage imap
  */
 
 /**