--- a/packages/redboot/current/ChangeLog
+++ b/packages/redboot/current/ChangeLog
@@ -1,3 +1,18 @@
+2009-03-20  John Dallaway  <john@dallaway.org.uk>
+
+	* doc/redboot_cmds.sgml: Add note concerning the termination of
+	ELF downloads once all relevant sections have been transferred.
+	[ Bugzilla 1000711 ]
+
+	* doc/redboot_main.sgml: Update copyright notice.
+
+	* src/main.c (do_baud_rate): Wait for 10s when changing serial
+	baud to accommodate terminal emulators which do not provide
+	rapid access to this parameter.
+
+	* src/main.c (do_version): Tidy RAM availability message.
+	[ Bugzilla 1000712 ]
+
 2009-03-09  Gary Thomas  <gary@mlbassoc.com>
 
 	* src/io.c: Better handling of history - commands now have

--- a/packages/redboot/current/doc/redboot_cmds.sgml
+++ b/packages/redboot/current/doc/redboot_cmds.sgml
@@ -1436,6 +1436,17 @@ ELF executable program format,
 Motorola S-record (SREC)
 format or raw data.
       </para>
+      <note>
+        <title>Note</title>
+        <para>
+When downloading an ELF image, RedBoot will forcibly terminate the transfer
+once all the relevant (loadable) ELF sections have been received. This
+behaviour reduces download time when using the X/Y modem protocol
+over a slow serial connection. However, the terminal emulator may report
+that the transfer is incomplete and has been cancelled. Such messages
+are normal and may be ignored.
+        </para>
+      </note>
     </refsect1>
     <refsect1>
       <title>Examples</title>

--- a/packages/redboot/current/doc/redboot_main.sgml
+++ b/packages/redboot/current/doc/redboot_main.sgml
@@ -24,6 +24,10 @@
       <year>2002</year>
       <year>2003</year>
       <year>2004</year>
+      <year>2005</year>
+      <year>2006</year>
+      <year>2007</year>
+      <year>2009</year>
       <holder>Free Software Foundation, Inc.</holder>
     </copyright>
 

--- a/packages/redboot/current/src/main.c
+++ b/packages/redboot/current/src/main.c
@@ -8,7 +8,7 @@
 // ####ECOSGPLCOPYRIGHTBEGIN####                                            
 // -------------------------------------------                              
 // This file is part of eCos, the Embedded Configurable Operating System.   
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
 //
 // eCos is free software; you can redistribute it and/or modify it under    
 // the terms of the GNU General Public License as published by the Free     
@@ -186,15 +186,13 @@ do_version(int argc, char *argv[])
                 "copies of it under certain conditions. Under the license terms, RedBoot's\n"
                 "source code and full license terms must have been made available to you.\n"
                 "Redboot comes with ABSOLUTELY NO WARRANTY.\n\n");
-    diag_printf("RAM: %p-%p, ", (void*)ram_start, (void*)ram_end);
-    diag_printf("[%p-%p]", mem_segments[0].start, mem_segments[0].end);
-    diag_printf(" available\n");
+    diag_printf("RAM: %p-%p ", (void*)ram_start, (void*)ram_end);
+    diag_printf("[%p-%p available]\n", mem_segments[0].start, mem_segments[0].end);
 #if CYGBLD_REDBOOT_MAX_MEM_SEGMENTS > 1
     for (seg = 1;  seg < CYGBLD_REDBOOT_MAX_MEM_SEGMENTS;  seg++) {
         if (mem_segments[seg].start != NO_MEMORY) {
-            diag_printf("     %p-%p, ", mem_segments[seg].start, mem_segments[seg].end);
-            diag_printf("[%p-%p]", mem_segments[seg].start, mem_segments[seg].end);
-            diag_printf(" available\n");
+            diag_printf("     %p-%p ", mem_segments[seg].start, mem_segments[seg].end);
+            diag_printf("[%p-%p available]\n", mem_segments[seg].start, mem_segments[seg].end);
         }
     }
 #endif
@@ -730,7 +728,7 @@ do_baud_rate(int argc, char *argv[])
         }
         // Make sure this new rate works or back off to previous value
         // Sleep for a few seconds, then prompt to see if it works
-        _sleep(3000);  // Give serial time to flush
+        _sleep(10000);  // Give serial time to flush
         if (!verify_action_with_timeout(5000, "Baud rate changed to %d", new_rate)) {
             _sleep(500);  // Give serial time to flush
             set_console_baud_rate(old_rate);