diff --git a/cron.php b/cron.php
index 31790bca81b0123da2093e08468fdac5de9e6cf2..84927b75e721436c8baca8d8bc0bfa8d158bc800 100644
--- a/cron.php
+++ b/cron.php
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Handles incoming requests to fire of regularly-scheduled tasks (cron jobs).
+ */
+
 include_once 'includes/bootstrap.inc';
 include_once 'includes/common.inc' ;
 
diff --git a/database/updates.inc b/database/updates.inc
index 61186b6a194b859f0e9586ea5e710c4007a0c7dd..e2332c16c079e3149b307e4fe6c8f9056538a689 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * All incremental database updates performed between Drupal releases.
+ */
+
 // Define the various updates in an array("date : comment" => "function");
 $sql_updates = array(
   "2002-06-22: first update since Drupal 4.0.0 release" => "update_32",
diff --git a/includes/conf.php b/includes/conf.php
index 0c78ed344f9ad5ae1358435a3436b41dae2f1822..3f04f1bccefa469b4b5f58cfd6eb6f5290bd5159 100644
--- a/includes/conf.php
+++ b/includes/conf.php
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Drupal site-specific configuration file.
+ */
+
 #
 # Database settings:
 #
diff --git a/includes/file.inc b/includes/file.inc
index 6eb0bfd3d72323cd640455284faf5de0494437dd..a8f447b7650661d70f49071dc724214a2d7a0e16 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * API for handling file uploads and server file management.
+ */
+
 /**
  * @defgroup file File interface
  *   Common file handling functions.
diff --git a/includes/locale.inc b/includes/locale.inc
index 986fc19a15a1e7a71d419425c39fe35671ea2ad9..93c05065ffb6e0996b49827b617f12fcd597c4ae 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -1,10 +1,9 @@
 <?php
 // $Id$
+
 /**
  * @file
- *
- * Admin related functions for locale.module
- *
+ * Admin-related functions for locale.module.
  */
 
 // ---------------------------------------------------------------------------------
diff --git a/includes/session.inc b/includes/session.inc
index 277885eae1647d3c53fd0d028afabfd99b981746..91351d7d4fc641de939729d7c23c85c6d71b2369 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * User session handling functions.
+ */
+
 session_set_save_handler("sess_open", "sess_close", "sess_read", "sess_write", "sess_destroy", "sess_gc");
 session_start();
 
diff --git a/index.php b/index.php
index c7e2e297b9407f09832f6575c42268a59fad3b85..89f8354f96a9061d142b6a8e30794782e4b5cedb 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,14 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * The PHP page that serves all page requests on a Drupal installation.
+ *
+ * The routines here dispatch control to the appropriate handler, which then
+ * prints the appropriate page.
+ */
+
 include_once 'includes/bootstrap.inc';
 drupal_page_header();
 include_once 'includes/common.inc';
diff --git a/modules/admin.module b/modules/admin.module
index 3bb035246a7363e88f30fad921936b3f5c4371f2..d528c2d49c3f50f8f847c102ceaef0c1de046f08 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Handles the administration pages.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 77e0cf6f2abc90e403e678a350da7bb869c8ac97..65cfbf52acb16f2f1787ee7ab5f58351e8fdc133 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * Used to aggregate syndicated content (RSS and RDF).
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 77e0cf6f2abc90e403e678a350da7bb869c8ac97..65cfbf52acb16f2f1787ee7ab5f58351e8fdc133 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * Used to aggregate syndicated content (RSS and RDF).
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/archive.module b/modules/archive.module
index 359d9e189647d22a5b62bcb1429e5ce9a0570a7d..57bea34199e3fc7e2bff85f8858158826ad09290 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Displays a calendar to navigate old content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index 359d9e189647d22a5b62bcb1429e5ce9a0570a7d..57bea34199e3fc7e2bff85f8858158826ad09290 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Displays a calendar to navigate old content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/block.module b/modules/block.module
index 7a755f7e7607b54be994754ac4c94f7b56512dfb..5ecf0f9ae0c56240419a10c5ab3332c53580ef06 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Controls the boxes that are displayed around the main content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/block/block.module b/modules/block/block.module
index 7a755f7e7607b54be994754ac4c94f7b56512dfb..5ecf0f9ae0c56240419a10c5ab3332c53580ef06 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Controls the boxes that are displayed around the main content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/blog.module b/modules/blog.module
index cbbf70edb10e03276b433920b55c3779625762e5..a40bb64b33a7d64290f286f06bb15dadf2bf0db7 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables keeping an easily and regularly updated web page or a blog.
+ */
+
 /**
  * Implementation of hook_settings().
  */
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index cbbf70edb10e03276b433920b55c3779625762e5..a40bb64b33a7d64290f286f06bb15dadf2bf0db7 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables keeping an easily and regularly updated web page or a blog.
+ */
+
 /**
  * Implementation of hook_settings().
  */
diff --git a/modules/blogapi.module b/modules/blogapi.module
index af20f89e25b974003b251f0f805ec7fa489152fa..ef902edb89f4480c9fc3b53da5a6a382a9348615 100644
--- a/modules/blogapi.module
+++ b/modules/blogapi.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enable users to post using applications that support XML-RPC blog APIs.
+ */
+
 /**
  * Implementation of hook_help().
  */
@@ -9,7 +14,7 @@ function blogapi_help($section) {
     case 'admin/help#blogapi':
       return t('This module adds support for several XML-RPC based blogging APIs. Specifically, it currently implements the %bloggerAPI, %metaweblogAPI, and most of the %moveabletype extensions.  This allows users to contribute to drupal using external GUI applications, which can often offer richer functionality that online forms based editing', array('%bloggerAPI' => '<a href="http://www.blogger.com/developers/api/1_docs/">Blogger API</a>', '%metaweblogAPI' => '<a href="http://www.xmlrpc.com/metaWeblogApi">MetaWeblog API</a>', '%moveabletype' => '<a href="http://www.movabletype.org/docs/mtmanual_programmatic.html">Moveable Type API</a>'));
     case 'admin/modules#description':
-      return t('Enable users to post using applications that support XML-RPC blog APIs');
+      return t('Enable users to post using applications that support XML-RPC blog APIs.');
   }
 }
 
diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module
index af20f89e25b974003b251f0f805ec7fa489152fa..ef902edb89f4480c9fc3b53da5a6a382a9348615 100644
--- a/modules/blogapi/blogapi.module
+++ b/modules/blogapi/blogapi.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enable users to post using applications that support XML-RPC blog APIs.
+ */
+
 /**
  * Implementation of hook_help().
  */
@@ -9,7 +14,7 @@ function blogapi_help($section) {
     case 'admin/help#blogapi':
       return t('This module adds support for several XML-RPC based blogging APIs. Specifically, it currently implements the %bloggerAPI, %metaweblogAPI, and most of the %moveabletype extensions.  This allows users to contribute to drupal using external GUI applications, which can often offer richer functionality that online forms based editing', array('%bloggerAPI' => '<a href="http://www.blogger.com/developers/api/1_docs/">Blogger API</a>', '%metaweblogAPI' => '<a href="http://www.xmlrpc.com/metaWeblogApi">MetaWeblog API</a>', '%moveabletype' => '<a href="http://www.movabletype.org/docs/mtmanual_programmatic.html">Moveable Type API</a>'));
     case 'admin/modules#description':
-      return t('Enable users to post using applications that support XML-RPC blog APIs');
+      return t('Enable users to post using applications that support XML-RPC blog APIs.');
   }
 }
 
diff --git a/modules/book.module b/modules/book.module
index 4dcdf18fbb508ed993e9bd51ed6705a53f91d60d..1a30c292980dc16a8e892d80d16e7fc754156bdb 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows users to collaboratively author a book.
+ */
+
 /**
  * Implementation of hook_node_name().
  */
diff --git a/modules/book/book.module b/modules/book/book.module
index 4dcdf18fbb508ed993e9bd51ed6705a53f91d60d..1a30c292980dc16a8e892d80d16e7fc754156bdb 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows users to collaboratively author a book.
+ */
+
 /**
  * Implementation of hook_node_name().
  */
diff --git a/modules/comment.module b/modules/comment.module
index 082c150a4930fe4f53032d4fc43792f806f5296e..0f9980b67c98793bac2cb5305c5afde52fded23d 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -3,8 +3,7 @@
 
 /**
  * @file
- *
- * Enables user to comment on published content.
+ * Enables users to comment on published content.
  *
  * When enabled, the Drupal comment module creates a discussion
  * board for each Drupal node. Users can post comments to discuss
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 082c150a4930fe4f53032d4fc43792f806f5296e..0f9980b67c98793bac2cb5305c5afde52fded23d 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -3,8 +3,7 @@
 
 /**
  * @file
- *
- * Enables user to comment on published content.
+ * Enables users to comment on published content.
  *
  * When enabled, the Drupal comment module creates a discussion
  * board for each Drupal node. Users can post comments to discuss
diff --git a/modules/drupal.module b/modules/drupal.module
index bae7ebfbdc590027193db79fa7bdca1049c1676d..b5f417f725759a1046ca3aabb9b80cbb16a0b1bb 100644
--- a/modules/drupal.module
+++ b/modules/drupal.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Lets users log in using a Drupal ID and can notify a central server about your site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index bae7ebfbdc590027193db79fa7bdca1049c1676d..b5f417f725759a1046ca3aabb9b80cbb16a0b1bb 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Lets users log in using a Drupal ID and can notify a central server about your site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/filter.module b/modules/filter.module
index 612a2b0379424545fa7ce23219c79d504696a5e2..e952e93018910e04f42d7735daba69b90d49a0df 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Framework for handling filtering of content.
+ */
+
 define('FILTER_FORMAT_DEFAULT', 0);
 
 define('FILTER_HTML_STRIP', 1);
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 612a2b0379424545fa7ce23219c79d504696a5e2..e952e93018910e04f42d7735daba69b90d49a0df 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Framework for handling filtering of content.
+ */
+
 define('FILTER_FORMAT_DEFAULT', 0);
 
 define('FILTER_HTML_STRIP', 1);
diff --git a/modules/forum.module b/modules/forum.module
index 5d633de70a55d740cf8bbd41c11c69760b4f6ed1..e90df6d9cbf4cf8f0b2a6c3772b9d9e82a209b47 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enable threaded discussions about general topics.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 5d633de70a55d740cf8bbd41c11c69760b4f6ed1..e90df6d9cbf4cf8f0b2a6c3772b9d9e82a209b47 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enable threaded discussions about general topics.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/help.module b/modules/help.module
index 5c68212dfff2069d2d6bfa17652bbfed547757db..1fb68e74337d9e19baf1d838ec1294b6cce5b32a 100644
--- a/modules/help.module
+++ b/modules/help.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Manages displaying online help.
+ */
+
 /**
  * Implementation of hook_menu().
  */
diff --git a/modules/help/help.module b/modules/help/help.module
index 5c68212dfff2069d2d6bfa17652bbfed547757db..1fb68e74337d9e19baf1d838ec1294b6cce5b32a 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Manages displaying online help.
+ */
+
 /**
  * Implementation of hook_menu().
  */
diff --git a/modules/locale.module b/modules/locale.module
index ee1458249895906803ae253138259a92111bf760..836cb50890856ce66a220432213f54b2da9c1b41 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -3,7 +3,6 @@
 
 /**
  * @file
- *
  * Enables administrators to manage the site interface languages.
  *
  * When enabled, the site interface can be displayed in different
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index ee1458249895906803ae253138259a92111bf760..836cb50890856ce66a220432213f54b2da9c1b41 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -3,7 +3,6 @@
 
 /**
  * @file
- *
  * Enables administrators to manage the site interface languages.
  *
  * When enabled, the site interface can be displayed in different
diff --git a/modules/menu.module b/modules/menu.module
index c90536c0ff134812f951460e47ad7b26a951da9f..916c3190369510779d2cb36dbff84886eab16c40 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows administrators to customize the site navigation menu.
+ */
+
 /**
  * Implementation of hook_menu().
  */
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index c90536c0ff134812f951460e47ad7b26a951da9f..916c3190369510779d2cb36dbff84886eab16c40 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows administrators to customize the site navigation menu.
+ */
+
 /**
  * Implementation of hook_menu().
  */
diff --git a/modules/node.module b/modules/node.module
index 90abd53e907ad7d09ab44b02a61a5622a5ffa201..9ea8d10529b1761eb57f4cf12a857bc235a9a817 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * The core that allows content to be submitted to the site.
+ */
+
 define('NODE_NEW_LIMIT', time() - 30 * 24 * 60 * 60);
 
 /**
diff --git a/modules/node/node.module b/modules/node/node.module
index 90abd53e907ad7d09ab44b02a61a5622a5ffa201..9ea8d10529b1761eb57f4cf12a857bc235a9a817 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * The core that allows content to be submitted to the site.
+ */
+
 define('NODE_NEW_LIMIT', time() - 30 * 24 * 60 * 60);
 
 /**
diff --git a/modules/page.module b/modules/page.module
index 4d03361722ca164302e9071980b05f069a1bad45..6dc7c2441640fbe0253a5730b5740b393c067447 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the creation of pages that can be added to the navigation system.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/page/page.module b/modules/page/page.module
index 4d03361722ca164302e9071980b05f069a1bad45..6dc7c2441640fbe0253a5730b5740b393c067447 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the creation of pages that can be added to the navigation system.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/path.module b/modules/path.module
index 52279451d1a40f7c10c4016fd88e3e6855dd5a6d..daa53bf589e8bd7f1da056d39173084c8bb3a39f 100644
--- a/modules/path.module
+++ b/modules/path.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * Enables users to rename URLs.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/path/path.module b/modules/path/path.module
index 52279451d1a40f7c10c4016fd88e3e6855dd5a6d..daa53bf589e8bd7f1da056d39173084c8bb3a39f 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * Enables users to rename URLs.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/ping.module b/modules/ping.module
index ed0538defe29d63467b1d9f0a409adb72b9629da..429646fb8375866a661d813bead6676c5759b986 100644
--- a/modules/ping.module
+++ b/modules/ping.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Alerts other sites that your site has been updated.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/ping/ping.module b/modules/ping/ping.module
index ed0538defe29d63467b1d9f0a409adb72b9629da..429646fb8375866a661d813bead6676c5759b986 100644
--- a/modules/ping/ping.module
+++ b/modules/ping/ping.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Alerts other sites that your site has been updated.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/poll.module b/modules/poll.module
index bb0f2df7931191e8cbf8fa0573752b2eb26e11a3..34209894d6c7a631a5b7fa591ce72b6123d95efe 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -1,6 +1,12 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables your site to capture votes on different topics in the form of multiple
+ * choice questions.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index bb0f2df7931191e8cbf8fa0573752b2eb26e11a3..34209894d6c7a631a5b7fa591ce72b6123d95efe 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -1,6 +1,12 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables your site to capture votes on different topics in the form of multiple
+ * choice questions.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/profile.module b/modules/profile.module
index 9d43d5aef85f340c70b053c8f38f83a50d850957..e379d75db3d0f42b320685219e6f6cb0dbf4b5a0 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Support for configurable user profiles.
+ */
+
 /**
  * Flags to define the visibility of a profile field.
  */
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 9d43d5aef85f340c70b053c8f38f83a50d850957..e379d75db3d0f42b320685219e6f6cb0dbf4b5a0 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Support for configurable user profiles.
+ */
+
 /**
  * Flags to define the visibility of a profile field.
  */
diff --git a/modules/queue.module b/modules/queue.module
index 3aefe0102261a0d7d1fa3c692225fbc6e2cf8064..a0f9923b6b0101c468c430596f7ecedd3a4b056e 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables content to be moderated by the community.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/search.module b/modules/search.module
index 68262ff633950427fa3ea0baf13a033bdade0792..4143cfda2223d27993bcea7930caad2915de55c1 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables site-wide keyword searching.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/search/search.module b/modules/search/search.module
index 68262ff633950427fa3ea0baf13a033bdade0792..4143cfda2223d27993bcea7930caad2915de55c1 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables site-wide keyword searching.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/statistics.module b/modules/statistics.module
index 0634806d4e647df883ba5bc9718f0fd6873ff020..61e2600439e9e0849508079af6235d772374188a 100644
--- a/modules/statistics.module
+++ b/modules/statistics.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Logs access statistics for your site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 0634806d4e647df883ba5bc9718f0fd6873ff020..61e2600439e9e0849508079af6235d772374188a 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Logs access statistics for your site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/story.module b/modules/story.module
index 8000ed6c20a252e699a3d595357e67c7dfd1e037..f7b06782a54a53b51b5f858ab45ea227ab88ac26 100644
--- a/modules/story.module
+++ b/modules/story.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables users to submit stories, articles or similar content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/story/story.module b/modules/story/story.module
index 8000ed6c20a252e699a3d595357e67c7dfd1e037..f7b06782a54a53b51b5f858ab45ea227ab88ac26 100644
--- a/modules/story/story.module
+++ b/modules/story/story.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables users to submit stories, articles or similar content.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/system.module b/modules/system.module
index ee501599261a74ba1485c6930b43fe8b5a544276..96d2b14cfc7594b96b07963564e18c6faee3ff0e 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Configuration system that lets administrators modify the workings of the site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/system/system.module b/modules/system/system.module
index ee501599261a74ba1485c6930b43fe8b5a544276..96d2b14cfc7594b96b07963564e18c6faee3ff0e 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Configuration system that lets administrators modify the workings of the site.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 72a4c2889f0bfa72d9d6f6b3288b3a40672cbe87..13ce8b4f7dc295abf811755ee88a740e2aae94ab 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the organization of content into categories.
+ */
+
 /**
  * Implementation of hook_perm().
  */
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 72a4c2889f0bfa72d9d6f6b3288b3a40672cbe87..13ce8b4f7dc295abf811755ee88a740e2aae94ab 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the organization of content into categories.
+ */
+
 /**
  * Implementation of hook_perm().
  */
diff --git a/modules/throttle.module b/modules/throttle.module
index c093857d9f512c0fc69afbe19ab4d2d2afa0ea9e..edabde4e6aab93d7dedd60b902663248e16a02ac 100644
--- a/modules/throttle.module
+++ b/modules/throttle.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows configuration of congestion control auto-throttle mechanism.
+ */
+
 /**
  * Determine the current load on the site.
  *
diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module
index c093857d9f512c0fc69afbe19ab4d2d2afa0ea9e..edabde4e6aab93d7dedd60b902663248e16a02ac 100644
--- a/modules/throttle/throttle.module
+++ b/modules/throttle/throttle.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Allows configuration of congestion control auto-throttle mechanism.
+ */
+
 /**
  * Determine the current load on the site.
  *
diff --git a/modules/tracker.module b/modules/tracker.module
index fcf057d8307d3d2916f1247ba1483869b80e8fe3..ef406194fbb7dc00d703b2463810468c39e71347 100644
--- a/modules/tracker.module
+++ b/modules/tracker.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables tracking of recent posts for users.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index fcf057d8307d3d2916f1247ba1483869b80e8fe3..ef406194fbb7dc00d703b2463810468c39e71347 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables tracking of recent posts for users.
+ */
+
 /**
  * Implementation of hook_help().
  */
diff --git a/modules/upload.module b/modules/upload.module
index 12afc40397e323a06f13f93bcc67f066fed3be29..58e9f2d562ab6f325ac09142926f76572c1d105f 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * File-handling and attaching files to nodes.
+ */
+
 function upload_help($section) {
   switch ($section) {
     case 'admin/modules#description':
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 12afc40397e323a06f13f93bcc67f066fed3be29..58e9f2d562ab6f325ac09142926f76572c1d105f 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -1,6 +1,11 @@
 <?php
 /* $Id$ */
 
+/**
+ * @file
+ * File-handling and attaching files to nodes.
+ */
+
 function upload_help($section) {
   switch ($section) {
     case 'admin/modules#description':
diff --git a/modules/user.module b/modules/user.module
index 27188ad3948c48757c2482dce843b2bbeff1e1b4..915d3414fbe25532b6b5b54a2ac2c6636619c6b7 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the user registration and login system.
+ */
+
 /**
  * Invokes hook_user() in every module.
  *
diff --git a/modules/user/user.module b/modules/user/user.module
index 27188ad3948c48757c2482dce843b2bbeff1e1b4..915d3414fbe25532b6b5b54a2ac2c6636619c6b7 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Enables the user registration and login system.
+ */
+
 /**
  * Invokes hook_user() in every module.
  *
diff --git a/modules/watchdog.module b/modules/watchdog.module
index 3a3ad74f12218f1bf7d8f11f5c7fff8db2b09f0c..c37ff3b2b6f64990d3bafcff4ac2d396f2c362bb 100644
--- a/modules/watchdog.module
+++ b/modules/watchdog.module
@@ -3,7 +3,6 @@
 
 /**
  * @file
- *
  * System monitoring and logging for administrators.
  *
  * The watchdog module monitors your site and keeps a list of
diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module
index 3a3ad74f12218f1bf7d8f11f5c7fff8db2b09f0c..c37ff3b2b6f64990d3bafcff4ac2d396f2c362bb 100644
--- a/modules/watchdog/watchdog.module
+++ b/modules/watchdog/watchdog.module
@@ -3,7 +3,6 @@
 
 /**
  * @file
- *
  * System monitoring and logging for administrators.
  *
  * The watchdog module monitors your site and keeps a list of
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index c449d8f469ce804fc038d2670dbe0d971a9c0096..44df7589b75a055fc9399efb83e5aa71c246b121 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * A slim, CSS-driven theme.
+ */
+
 function chameleon_features() {
   return array(
        'logo',
diff --git a/themes/engines/xtemplate/xtemplate.engine b/themes/engines/xtemplate/xtemplate.engine
index 0a795f32cb75f644b5d8af8ffc1710104f6267c3..6bcffc65a133de96feaf7e7471afa6069a7d2db5 100644
--- a/themes/engines/xtemplate/xtemplate.engine
+++ b/themes/engines/xtemplate/xtemplate.engine
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * Handles the interface between XTemplate files and the Drupal theme system.
+ */
+
 // Initialize the xtemplate engine.
 function xtemplate_init($template) {
   // We cannot use the theme() or path_to_theme() functions here
diff --git a/update.php b/update.php
index f021cea845378aafe123b5f8eba82dcdaf16cde1..200493fb6e12e69059fa992e07f9b4f07d11e470 100644
--- a/update.php
+++ b/update.php
@@ -1,19 +1,21 @@
 <?php
 // $Id$
-/*
-** USAGE:
-**
-** - Point your browser to "http://www.site.com/update.php" and follow
-**   the instructions.
-**
-** - If you are not logged in as administrator, you will need to modify the
-**   statement below. Change the 1 into a 0 to disable the access check.
-**   After finishing the upgrade, open this file and change the 0 back into
-**   a 1!
-*/
+
+/**
+ * @file
+ * Administrative page for handling updates from one Drupal version to another.
+ *
+ * Point your browser to "http://www.site.com/update.php" and follow the
+ * instructions.
+ *
+ * If you are not logged in as administrator, you will need to modify the access
+ * check statement below. Change the TRUE into a FALSE to disable the access
+ * check. After finishing the upgrade, be sure to open this file and change the
+ * FALSE back into a TRUE!
+ */
 
 // Disable access checking?
-$access_check = 1;
+$access_check = TRUE;
 
 if (!ini_get("safe_mode")) {
   set_time_limit(180);
diff --git a/xmlrpc.php b/xmlrpc.php
index 7b52d5166891a7ae5e465330956e81beb37883ff..11f6ab74f28172124635a28215ccdc5e10080c17 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -1,6 +1,11 @@
 <?php
 // $Id$
 
+/**
+ * @file
+ * PHP page for handling incoming XML-RPC requests from clients.
+ */
+
 include_once 'includes/bootstrap.inc';
 include_once 'includes/common.inc';
 include_once 'includes/xmlrpc.inc';