Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.407
diff -u -r1.407 menu.inc
--- includes/menu.inc	23 Aug 2010 23:38:06 -0000	1.407
+++ includes/menu.inc	27 Aug 2010 22:51:55 -0000
@@ -72,7 +72,7 @@
  */
 
 /**
- * @name Menu flags
+ * @defgroup menu_flags Menu flags
  * @{
  * Flags for use in the "type" attribute of menu items.
  */
@@ -122,7 +122,7 @@
  */
 
 /**
- * @name Menu item types
+ * @defgroup menu_item_types Menu item types
  * @{
  * Menu item definitions provide one of these constants, which are shortcuts for
  * combinations of the above flags.
@@ -185,7 +185,7 @@
  */
 
 /**
- * @name Menu context types
+ * @defgroup menu_context_types Menu context types
  * @{
  * Flags for use in the "context" attribute of menu router items.
  */
@@ -213,7 +213,7 @@
  */
 
 /**
- * @name Menu status codes
+ * @defgroup menu_status_codes Menu status codes
  * @{
  * Status codes for menu callbacks.
  */
@@ -248,7 +248,7 @@
  */
 
 /**
- * @Name Menu tree parameters
+ * @defgroup menu_tree_parameters Menu tree parameters
  * @{
  * Menu tree
  */
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1211
diff -u -r1.1211 common.inc
--- includes/common.inc	27 Aug 2010 11:54:32 -0000	1.1211
+++ includes/common.inc	27 Aug 2010 22:51:55 -0000
@@ -378,7 +378,7 @@
 }
 
 /**
- * @name HTTP handling
+ * @defgroup http_handling HTTP handling
  * @{
  * Functions to properly handle HTTP responses.
  */
Index: includes/pager.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/pager.inc,v
retrieving revision 1.81
diff -u -r1.81 pager.inc
--- includes/pager.inc	4 Aug 2010 03:46:16 -0000	1.81
+++ includes/pager.inc	27 Aug 2010 22:51:56 -0000
@@ -416,7 +416,7 @@
 
 
 /**
- * @name Pager pieces
+ * @defgroup pagerpieces Pager pieces
  * @{
  * Use these pieces to construct your own custom pagers in your theme. Note that
  * you should NOT modify this file to customize your pager.
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.606
diff -u -r1.606 theme.inc
--- includes/theme.inc	22 Aug 2010 12:46:21 -0000	1.606
+++ includes/theme.inc	27 Aug 2010 22:51:56 -0000
@@ -10,7 +10,7 @@
  */
 
 /**
- * @name Content markers
+ * @defgroup content_flags Content markers
  * @{
  * Markers used by theme_mark() and node_mark() to designate content.
  * @see theme_mark(), node_mark()
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.416
diff -u -r1.416 bootstrap.inc
--- includes/bootstrap.inc	22 Aug 2010 14:11:47 -0000	1.416
+++ includes/bootstrap.inc	27 Aug 2010 22:51:54 -0000
@@ -231,12 +231,6 @@
 define('REQUEST_TIME', $_SERVER['REQUEST_TIME']);
 
 /**
- * @name Title text filtering flags
- * @{
- * Flags for use in drupal_set_title().
- */
-
-/**
  * Flag for drupal_set_title(); text is not sanitized, so run check_plain().
  */
 define('CHECK_PLAIN', 0);
@@ -247,10 +241,6 @@
 define('PASS_THROUGH', -1);
 
 /**
- * @} End of "Title text filtering flags".
- */
-
-/**
  * Signals that the registry lookup cache should be reset.
  */
 define('REGISTRY_RESET_LOOKUP_CACHE', 1);
Index: includes/database/sqlite/schema.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/sqlite/schema.inc,v
retrieving revision 1.19
diff -u -r1.19 schema.inc
--- includes/database/sqlite/schema.inc	28 Jul 2010 10:52:12 -0000	1.19
+++ includes/database/sqlite/schema.inc	27 Aug 2010 22:51:57 -0000
@@ -6,12 +6,11 @@
  * Database schema code for SQLite databases.
  */
 
-
 /**
+ * Database schema class for SQLite.
+ *
  * @ingroup schemaapi
- * @{
  */
-
 class DatabaseSchema_sqlite extends DatabaseSchema {
 
   /**
Index: includes/database/sqlite/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/sqlite/database.inc,v
retrieving revision 1.37
diff -u -r1.37 database.inc
--- includes/database/sqlite/database.inc	27 Aug 2010 15:45:46 -0000	1.37
+++ includes/database/sqlite/database.inc	27 Aug 2010 22:51:57 -0000
@@ -6,15 +6,12 @@
  * Database interface code for SQLite embedded database engine.
  */
 
-/**
- * @ingroup database
- * @{
- */
-
 include_once DRUPAL_ROOT . '/includes/database/prefetch.inc';
 
 /**
  * Specific SQLite implementation of DatabaseConnection.
+ *
+ * @ingroup database
  */
 class DatabaseConnection_sqlite extends DatabaseConnection {
 
@@ -315,6 +312,8 @@
  * the data instead of using PDOStatement.
  *
  * @see DatabaseConnection_sqlite::PDOPrepare()
+ *
+ * @ingroup database
  */
 class DatabaseStatement_sqlite extends DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface {
 
@@ -441,7 +440,3 @@
     return $return;
   }
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: includes/database/sqlite/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/sqlite/query.inc,v
retrieving revision 1.11
diff -u -r1.11 query.inc
--- includes/database/sqlite/query.inc	3 Jul 2010 20:45:45 -0000	1.11
+++ includes/database/sqlite/query.inc	27 Aug 2010 22:51:57 -0000
@@ -7,16 +7,13 @@
  */
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * SQLite specific implementation of InsertQuery.
  *
  * We ignore all the default fields and use the clever SQLite syntax:
  *   INSERT INTO table DEFAULT VALUES
  * for degenerated "default only" queries.
+ *
+ * @ingroup database
  */
 class InsertQuery_sqlite extends InsertQuery {
 
@@ -61,6 +58,8 @@
  *   UPDATE test SET name = 'newname' WHERE tid = 1
  * will become:
  *   UPDATE test SET name = 'newname' WHERE tid = 1 AND name <> 'newname'
+ *
+ * @ingroup database
  */
 class UpdateQuery_sqlite extends UpdateQuery {
   /**
@@ -127,6 +126,8 @@
  *   - if the previous query hasn't matched, INSERT
  *
  * The first UPDATE query will acquire a RESERVED lock on the database.
+ *
+ * @ingroup database
  */
 class MergeQuery_sqlite extends MergeQuery {
   public function execute() {
@@ -186,6 +187,8 @@
  *
  * Prior to SQLite 3.6.5, SQLite does not return the actual number of rows deleted
  * by that optimized "truncate" optimization.
+ *
+ * @ingroup database
  */
 class DeleteQuery_sqlite extends DeleteQuery {
   public function execute() {
@@ -205,6 +208,8 @@
  *
  * SQLite doesn't support TRUNCATE, but a DELETE query with no condition has
  * exactly the effect (it is implemented by DROPing the table).
+ *
+ * @ingroup database
  */
 class TruncateQuery_sqlite extends TruncateQuery {
   public function __toString() {
@@ -214,7 +219,3 @@
     return $comments . 'DELETE FROM {' . $this->connection->escapeTable($this->table) . '} ';
   }
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.340
diff -u -r1.340 filter.module
--- modules/filter/filter.module	22 Aug 2010 12:55:04 -0000	1.340
+++ modules/filter/filter.module	27 Aug 2010 22:51:57 -0000
@@ -1089,7 +1089,7 @@
 }
 
 /**
- * @name Standard filters
+ * @defgroup standard_filters Standard filters
  * @{
  * Filters implemented by the filter.module.
  */
Index: includes/database/mysql/schema.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/mysql/schema.inc,v
retrieving revision 1.41
diff -u -r1.41 schema.inc
--- includes/database/mysql/schema.inc	2 Aug 2010 18:55:17 -0000	1.41
+++ includes/database/mysql/schema.inc	27 Aug 2010 22:51:57 -0000
@@ -8,10 +8,10 @@
 
 
 /**
+ * Database schema class for MySQL.
+ *
  * @ingroup schemaapi
- * @{
  */
-
 class DatabaseSchema_mysql extends DatabaseSchema {
 
   /**
@@ -517,7 +517,3 @@
   }
 
 }
-
-/**
- * @} End of "ingroup schemaapi".
- */
Index: includes/database/mysql/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/mysql/query.inc,v
retrieving revision 1.18
diff -u -r1.18 query.inc
--- includes/database/mysql/query.inc	26 Jun 2010 01:40:05 -0000	1.18
+++ includes/database/mysql/query.inc	27 Aug 2010 22:51:57 -0000
@@ -2,16 +2,16 @@
 // $Id: query.inc,v 1.18 2010/06/26 01:40:05 dries Exp $
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * @file
  * Query code for MySQL embedded database engine.
  */
 
 
+/**
+ * Insert query class for MySQL.
+ *
+ * @ingroup database
+ */
 class InsertQuery_mysql extends InsertQuery {
 
   public function execute() {
@@ -87,6 +87,11 @@
   }
 }
 
+/**
+ * Truncate query class for MySQL.
+ *
+ * @ingroup database
+ */
 class TruncateQuery_mysql extends TruncateQuery {
   public function __toString() {
     // TRUNCATE is actually a DDL statement on MySQL, and DDL statements are
@@ -102,7 +107,3 @@
     }
   }
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: includes/database/mysql/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/mysql/database.inc,v
retrieving revision 1.33
diff -u -r1.33 database.inc
--- includes/database/mysql/database.inc	11 Aug 2010 02:17:39 -0000	1.33
+++ includes/database/mysql/database.inc	27 Aug 2010 22:51:57 -0000
@@ -7,10 +7,10 @@
  */
 
 /**
+ * Database connection class for MySQL.
+ *
  * @ingroup database
- * @{
  */
-
 class DatabaseConnection_mysql extends DatabaseConnection {
 
   /**
@@ -140,8 +140,3 @@
     }
   }
 }
-
-
-/**
- * @} End of "ingroup database".
- */
Index: modules/system/system.queue.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.queue.inc,v
retrieving revision 1.13
diff -u -r1.13 system.queue.inc
--- modules/system/system.queue.inc	14 Jun 2010 13:10:31 -0000	1.13
+++ modules/system/system.queue.inc	27 Aug 2010 22:51:57 -0000
@@ -51,10 +51,14 @@
  * being reliable or not, the processing code should be aware that an item
  * might be handed over for processing more than once (because the processing
  * code might time out before it finishes).
+ *
+ * @} End of "defgroup queue".
  */
 
 /**
  * Factory class for interacting with queues.
+ *
+ * @ingroup queue
  */
 class DrupalQueue {
   /**
@@ -95,6 +99,11 @@
   }
 }
 
+/**
+ * Defines an interface for working with queues.
+ *
+ * @ingroup queue
+ */
 interface DrupalQueueInterface {
   /**
    * Start working with a queue.
@@ -194,12 +203,16 @@
  *
  * Classes implementing this interface preserve the order of messages and
  * guarantee that every item will be executed at least once.
+ *
+ * @ingroup queue
  */
 interface DrupalReliableQueueInterface extends DrupalQueueInterface {
 }
 
 /**
  * Default queue implementation.
+ *
+ * @ingroup queue
  */
 class SystemQueue implements DrupalReliableQueueInterface {
   /**
@@ -298,6 +311,8 @@
  * This allows "undelayed" variants of processes relying on the Queue
  * interface. The queue data resides in memory. It should only be used for
  * items that will be queued and dequeued within a given page request.
+ *
+ * @ingroup queue
  */
 class MemoryQueue implements DrupalQueueInterface {
   /**
@@ -364,7 +379,3 @@
     $this->id_sequence = 0;
   }
 }
-
-/**
- * @} End of "defgroup queue".
- */
Index: includes/database/select.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/select.inc,v
retrieving revision 1.45
diff -u -r1.45 select.inc
--- includes/database/select.inc	8 Aug 2010 02:18:53 -0000	1.45
+++ includes/database/select.inc	27 Aug 2010 22:51:57 -0000
@@ -2,11 +2,6 @@
 // $Id: select.inc,v 1.45 2010/08/08 02:18:53 dries Exp $
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * Interface for extendable query objects.
  *
  * "Extenders" follow the "Decorator" OOP design pattern.  That is, they wrap
@@ -15,6 +10,8 @@
  * operations.  Subclasses of this class may implement additional methods or
  * override existing methods as appropriate.  Extenders may also wrap other
  * extender objects, allowing for arbitrarily complex "enhanced" queries.
+ *
+ * @ingroup database
  */
 interface QueryExtendableInterface {
 
@@ -34,6 +31,8 @@
 
 /**
  * Interface definition for a Select Query object.
+ *
+ * @ingroup database
  */
 interface SelectQueryInterface extends QueryConditionInterface, QueryAlterableInterface, QueryExtendableInterface, QueryPlaceholderInterface {
 
@@ -507,6 +506,8 @@
 
 /**
  * The base extender class for Select queries.
+ *
+ * @ingroup database
  */
 class SelectQueryExtender implements SelectQueryInterface {
 
@@ -816,6 +817,8 @@
 
 /**
  * Query builder for SELECT statements.
+ *
+ * @ingroup database
  */
 class SelectQuery extends Query implements SelectQueryInterface {
 
@@ -1470,7 +1473,3 @@
     }
   }
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: includes/database/prefetch.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/prefetch.inc,v
retrieving revision 1.10
diff -u -r1.10 prefetch.inc
--- includes/database/prefetch.inc	30 Apr 2010 13:47:46 -0000	1.10
+++ includes/database/prefetch.inc	27 Aug 2010 22:51:56 -0000
@@ -10,15 +10,12 @@
  */
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * An implementation of DatabaseStatementInterface that prefetches all data.
  *
  * This class behaves very similar to a PDOStatement but as it always fetches
  * every row it is possible to manipulate those results.
+ *
+ * @ingroup database
  */
 class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface {
 
@@ -498,7 +495,3 @@
 
 }
 
-/**
- * @} End of "ingroup database".
- */
-
Index: includes/database/schema.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/schema.inc,v
retrieving revision 1.39
diff -u -r1.39 schema.inc
--- includes/database/schema.inc	22 Aug 2010 13:55:53 -0000	1.39
+++ includes/database/schema.inc	27 Aug 2010 22:51:56 -0000
@@ -146,8 +146,14 @@
  * @endcode
  *
  * @see drupal_install_schema()
+ * @} End of "defgroup schemaapi".
  */
 
+/**
+ * Represents an abstract database schema.
+ *
+ * @ingroup schemaapi
+ */
 abstract class DatabaseSchema implements QueryPlaceholderInterface {
 
   protected $connection;
@@ -673,6 +679,8 @@
  * For example, this exception should be thrown whenever there is an attempt to
  * create a new database table, field, or index that already exists in the
  * database schema.
+ *
+ * @ingroup schemaapi
  */
 class DatabaseSchemaObjectExistsException extends Exception {}
 
@@ -682,10 +690,7 @@
  * For example, this exception should be thrown whenever there is an attempt to
  * modify a database table, field, or index that does not currently exist in
  * the database schema.
+ *
+ * @ingroup schemaapi
  */
 class DatabaseSchemaObjectDoesNotExistException extends Exception {}
-
-/**
- * @} End of "defgroup schemaapi".
- */
-
Index: includes/database/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/database.inc,v
retrieving revision 1.132
diff -u -r1.132 database.inc
--- includes/database/database.inc	17 Aug 2010 15:30:01 -0000	1.132
+++ includes/database/database.inc	27 Aug 2010 22:51:56 -0000
@@ -166,6 +166,7 @@
  *   }
  * }
  * @endcode
+ * @} End of "ingroup database".
  */
 
 
@@ -178,6 +179,8 @@
  * database.
  *
  * @see http://php.net/manual/en/book.pdo.php
+ *
+ * @ingroup database
  */
 abstract class DatabaseConnection extends PDO {
 
@@ -1142,6 +1145,8 @@
  * This class is uninstantiatable and un-extendable. It acts to encapsulate
  * all control and shepherding of database connections into a single location
  * without the use of globals.
+ *
+ * @ingroup database
  */
 abstract class Database {
 
@@ -1562,16 +1567,22 @@
 
 /**
  * Exception for when popTransaction() is called with no active transaction.
+ *
+ * @ingroup database
  */
 class DatabaseTransactionNoActiveException extends Exception { }
 
 /**
  * Exception thrown when a savepoint or transaction name occurs twice.
+ *
+ * @ingroup database
  */
 class DatabaseTransactionNameNonUniqueException extends Exception { }
 
 /**
  * Exception thrown when a commit() function fails.
+ *
+ * @ingroup database
  */
 class DatabaseTransactionCommitFailedException extends Exception { }
 
@@ -1580,6 +1591,8 @@
  *
  * This exception will be thrown when the PDO connection commit() is called.
  * Code should never call this method directly.
+ *
+ * @ingroup database
  */
 class DatabaseTransactionExplicitCommitNotAllowedException extends Exception { }
 
@@ -1588,6 +1601,8 @@
  *
  * There are many ways that a merge query could be malformed.  They should all
  * throw this exception and set an appropriately descriptive message.
+ *
+ * @ingroup database
  */
 class InvalidMergeQueryException extends Exception {}
 
@@ -1596,21 +1611,29 @@
  *
  * It is not allowed to specify a field as default and insert field, this
  * exception is thrown if that is the case.
+ *
+ * @ingroup database
  */
 class FieldsOverlapException extends Exception {}
 
 /**
  * Exception thrown if an insert query doesn't specify insert or default fields.
+ *
+ * @ingroup database
  */
 class NoFieldsException extends Exception {}
 
 /**
  * Exception thrown if an undefined database connection is requested.
+ *
+ * @ingroup database
  */
 class DatabaseConnectionNotDefinedException extends Exception {}
 
 /**
  * Exception thrown if no driver is specified for a database connection.
+ *
+ * @ingroup database
  */
 class DatabaseDriverNotSpecifiedException extends Exception {}
 
@@ -1633,6 +1656,8 @@
  * In the vast majority of cases, you should not instantiate this class
  * directly. Instead, call ->startTransaction(), from the appropriate connection
  * object.
+ *
+ * @ingroup database
  */
 class DatabaseTransaction {
 
@@ -1728,6 +1753,8 @@
  * @code
  * class DatabaseStatement_oracle implements Iterator, DatabaseStatementInterface {}
  * @endcode
+ *
+ * @ingroup database
  */
 interface DatabaseStatementInterface extends Traversable {
 
@@ -1909,6 +1936,7 @@
  * constructor.
  *
  * @see http://us.php.net/pdostatement
+ * @ingroup database
  */
 class DatabaseStatementBase extends PDOStatement implements DatabaseStatementInterface {
 
@@ -2011,6 +2039,7 @@
  * result set that happens to contain no records.
  *
  * @see SearchQuery
+ * @ingroup database
  */
 class DatabaseStatementEmpty implements Iterator, DatabaseStatementInterface {
 
@@ -2086,6 +2115,11 @@
 }
 
 /**
+ * @ingroup database
+ * @{
+ */
+
+/**
  * Autoload callback for the database system.
  */
 function db_autoload($class) {
@@ -2548,7 +2582,7 @@
 }
 
 /**
- * @} End of "defgroup database".
+ * @} End of "ingroup database".
  */
 
 
Index: includes/database/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/query.inc,v
retrieving revision 1.55
diff -u -r1.55 query.inc
--- includes/database/query.inc	5 Aug 2010 08:26:35 -0000	1.55
+++ includes/database/query.inc	27 Aug 2010 22:51:56 -0000
@@ -2,17 +2,14 @@
 // $Id: query.inc,v 1.55 2010/08/05 08:26:35 webchick Exp $
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * @file
  * Non-specific Database query code. Used by all engines.
  */
 
 /**
  * Interface for a conditional clause in a query.
+ *
+ * @ingroup database
  */
 interface QueryConditionInterface {
 
@@ -122,6 +119,8 @@
 
 /**
  * Interface for a query that can be manipulated via an alter hook.
+ *
+ * @ingroup database
  */
 interface QueryAlterableInterface {
 
@@ -202,6 +201,8 @@
 
 /**
  * Interface for a query that accepts placeholders.
+ *
+ * @ingroup database
  */
 interface QueryPlaceholderInterface {
 
@@ -218,6 +219,8 @@
  * Base class for the query builders.
  *
  * All query builders inherit from a common base class.
+ *
+ * @ingroup database
  */
 abstract class Query implements QueryPlaceholderInterface {
 
@@ -312,6 +315,8 @@
 
 /**
  * General class for an abstracted INSERT operation.
+ *
+ * @ingroup database
  */
 class InsertQuery extends Query {
 
@@ -572,6 +577,8 @@
 
 /**
  * General class for an abstracted MERGE operation.
+ *
+ * @ingroup database
  */
 class MergeQuery extends Query {
   /**
@@ -898,6 +905,8 @@
 
 /**
  * General class for an abstracted DELETE operation.
+ *
+ * @ingroup database
  */
 class DeleteQuery extends Query implements QueryConditionInterface {
 
@@ -986,6 +995,8 @@
 
 /**
  * General class for an abstracted TRUNCATE operation.
+ *
+ * @ingroup database
  */
 class TruncateQuery extends Query {
 
@@ -1020,6 +1031,8 @@
 
 /**
  * General class for an abstracted UPDATE operation.
+ *
+ * @ingroup database
  */
 class UpdateQuery extends Query implements QueryConditionInterface {
 
@@ -1207,6 +1220,8 @@
 
 /**
  * Generic class for a series of conditions in a query.
+ *
+ * @ingroup database
  */
 class DatabaseCondition implements QueryConditionInterface, Countable {
 
@@ -1417,9 +1432,4 @@
 
     return $return;
   }
-
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: includes/database/pgsql/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/pgsql/database.inc,v
retrieving revision 1.41
diff -u -r1.41 database.inc
--- includes/database/pgsql/database.inc	11 Aug 2010 02:17:39 -0000	1.41
+++ includes/database/pgsql/database.inc	27 Aug 2010 22:51:57 -0000
@@ -7,15 +7,17 @@
  */
 
 /**
+ * The name by which to obtain a lock for retrive the next insert id.
+ *
  * @ingroup database
- * @{
  */
+define('POSTGRESQL_NEXTID_LOCK', 1000);
 
 /**
- * The name by which to obtain a lock for retrive the next insert id.
+ * Database connection class for PostgreSQL.
+ *
+ * @ingroup database
  */
-define('POSTGRESQL_NEXTID_LOCK', 1000);
-
 class DatabaseConnection_pgsql extends DatabaseConnection {
 
   public function __construct(array $connection_options = array()) {
@@ -189,7 +191,3 @@
     return $id;
   }
 }
-
-/**
- * @} End of "ingroup database".
- */
Index: includes/database/pgsql/query.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/pgsql/query.inc,v
retrieving revision 1.20
diff -u -r1.20 query.inc
--- includes/database/pgsql/query.inc	27 Aug 2010 15:53:43 -0000	1.20
+++ includes/database/pgsql/query.inc	27 Aug 2010 22:51:57 -0000
@@ -2,16 +2,16 @@
 // $Id: query.inc,v 1.20 2010/08/27 15:53:43 webchick Exp $
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * @file
  * Query code for PostgreSQL embedded database engine.
  */
 
 
+/**
+ * Insert query class for PostgreSQL.
+ *
+ * @ingroup database
+ */
 class InsertQuery_pgsql extends InsertQuery {
 
   public function execute() {
@@ -148,6 +148,11 @@
   }
 }
 
+/**
+ * Update query class for PostgreSQL.
+ *
+ * @ingroup database
+ */
 class UpdateQuery_pgsql extends UpdateQuery {
   public function execute() {
     $max_placeholder = 0;
@@ -209,6 +214,11 @@
   }
 }
 
+/**
+ * Select query class for PostgreSQL.
+ *
+ * @ingroup database
+ */
 class SelectQuery_pgsql extends SelectQuery {
 
   public function orderRandom() {
@@ -216,5 +226,4 @@
     $this->orderBy($alias);
     return $this;
   }
-
 }
Index: includes/database/pgsql/schema.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/pgsql/schema.inc,v
retrieving revision 1.36
diff -u -r1.36 schema.inc
--- includes/database/pgsql/schema.inc	27 Aug 2010 15:53:43 -0000	1.36
+++ includes/database/pgsql/schema.inc	27 Aug 2010 22:51:57 -0000
@@ -7,10 +7,10 @@
  */
 
 /**
+ * Database schema class for PostgreSQL.
+ *
  * @ingroup schemaapi
- * @{
  */
-
 class DatabaseSchema_pgsql extends DatabaseSchema {
 
   /**