Index: doc/src/sgml/config.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/config.sgml,v
retrieving revision 1.249
diff -c -c -r1.249 config.sgml
*** doc/src/sgml/config.sgml	3 Feb 2010 17:25:05 -0000	1.249
--- doc/src/sgml/config.sgml	5 Feb 2010 23:17:17 -0000
***************
*** 1739,1745 ****
          server to switch to a new WAL segment file periodically.  When this
          parameter is greater than zero, the server will switch to a new
          segment file whenever this many seconds have elapsed since the last
!         segment file switch.  Note that archived files that are closed early
          due to a forced switch are still the same length as completely full
          files.  Therefore, it is unwise to use a very short
          <varname>archive_timeout</> &mdash; it will bloat your archive
--- 1739,1749 ----
          server to switch to a new WAL segment file periodically.  When this
          parameter is greater than zero, the server will switch to a new
          segment file whenever this many seconds have elapsed since the last
!         segment file switch, and there has been any database activity,
!         including a single checkpoint.  (Increasing
!         <varname>checkpoint_timeout</> will reduce unnecessary
!         checkpoints on an idle system.)
!         Note that archived files that are closed early
          due to a forced switch are still the same length as completely full
          files.  Therefore, it is unwise to use a very short
          <varname>archive_timeout</> &mdash; it will bloat your archive
Index: src/backend/postmaster/bgwriter.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/bgwriter.c,v
retrieving revision 1.66
diff -c -c -r1.66 bgwriter.c
*** src/backend/postmaster/bgwriter.c	15 Jan 2010 09:19:02 -0000	1.66
--- src/backend/postmaster/bgwriter.c	5 Feb 2010 23:17:21 -0000
***************
*** 543,549 ****
  
  /*
   * CheckArchiveTimeout -- check for archive_timeout and switch xlog files
!  *		if needed
   */
  static void
  CheckArchiveTimeout(void)
--- 543,552 ----
  
  /*
   * CheckArchiveTimeout -- check for archive_timeout and switch xlog files
!  *
!  * This will switch to a new WAL file and force an archive file write
!  * if any activity is recorded in the current WAL file, including just
!  * a single checkpoint record.
   */
  static void
  CheckArchiveTimeout(void)
