diff --git a/snapshot.bat b/snapshot.bat
new file mode 100644
index 0000000..3c07b0b
--- /dev/null
+++ b/snapshot.bat
@@ -0,0 +1,17 @@
+rem  Run POSIX and Windows snapshots
+
+rem  Copyright 2008 Beman Dawes
+
+rem  Distributed under the Boost Software License, Version 1.0.
+rem  See http://www.boost.org/LICENSE_1_0.txt
+
+rem  Must be run in a directory devoted to boost release snapshots
+
+echo Using %BOOST_TRUNK% as boost trunk
+time /t
+call %BOOST_TRUNK%\tools\release\snapshot_posix.bat
+time /t
+call %BOOST_TRUNK%\tools\release\snapshot_windows.bat
+time /t
+call %BOOST_TRUNK%\tools/release\snapshot_inspection.bat
+time /t
diff --git a/snapshot.sh b/snapshot.sh
index 76a4d33..8e45abb 100755
--- a/snapshot.sh
+++ b/snapshot.sh
@@ -4,6 +4,7 @@
 # Distributed under the Boost Software License, Version 1.0.
 # See http://www.boost.org/LICENSE_1_0.txt
 
+sleep 5s
 echo Using $BOOST_TRUNK as boost trunk
 date
 $BOOST_TRUNK/tools/release/snapshot_posix.sh
@@ -12,3 +13,4 @@ $BOOST_TRUNK/tools/release/snapshot_windows.sh
 date
 $BOOST_TRUNK/tools/release/snapshot_inspect.sh
 date
+sleep 5s
diff --git a/snapshot_inspection.bat b/snapshot_inspection.bat
new file mode 100644
index 0000000..c7c4118
--- /dev/null
+++ b/snapshot_inspection.bat
@@ -0,0 +1,30 @@
+rem Inspect snapshot
+
+rem Copyright 2008 Beman Dawes
+
+rem Distributed under the Boost Software License, Version 1.0.
+rem See http://www.boost.org/LICENSE_1_0.txt
+
+pushd posix\tools\inspect\build
+bjam
+popd
+echo inspect...
+pushd posix
+dist\bin\inspect >..\inspect.html
+popd
+
+echo Create ftp script...
+copy user.txt inspect.ftp
+echo dir >>inspect.ftp
+echo binary >>inspect.ftp
+echo put inspect.html >>inspect.ftp
+echo dir >>inspect.ftp
+echo mdelete inspect-snapshot.html >>inspect.ftp
+echo rename inspect.html inspect-snapshot.html >>inspect.ftp
+echo dir >>inspect.ftp
+echo bye >>inspect.ftp
+
+echo Run ftp script...
+ftp -n -i -s:inspect.ftp boost.cowic.de
+
+echo Inspect script complete
diff --git a/snapshot_posix.bat b/snapshot_posix.bat
new file mode 100644
index 0000000..6ced0d0
--- /dev/null
+++ b/snapshot_posix.bat
@@ -0,0 +1,71 @@
+rem  Build a branches/release snapshot for POSIX, using LF line termination
+
+rem  Copyright 2008 Beman Dawes
+
+rem  Distributed under the Boost Software License, Version 1.0.
+rem  See http://www.boost.org/LICENSE_1_0.txt
+
+echo Build a branches/release snapshot for POSIX, using LF line termination...
+
+echo "Removing old files..."
+rmdir /s /q posix >nul
+rmdir /s /q svn_info >nul
+del posix.tar.gz >nul
+del posix.tar.bz2 >nul
+
+echo "Exporting files from subversion..."
+rem  leave an audit trail, which is used by inspect to determine revision number
+svn co --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
+svn export --non-interactive --native-eol LF http://svn.boost.org/svn/boost/branches/release posix
+
+rem echo "Building docs..."
+rem pushd posix/doc
+rem TODO
+rem popd
+
+echo Setting SNAPSHOT_DATE
+strftime "%%Y-%%m-%%d" >date.txt
+set /p SNAPSHOT_DATE= <date.txt
+echo SNAPSHOT_DATE is %SNAPSHOT_DATE%
+
+echo "Renaming..."
+ren posix boost-posix-%SNAPSHOT_DATE%
+
+echo Building .gz file...
+tar cfz posix.tar.gz boost-posix-%SNAPSHOT_DATE%
+echo Building .bz2 file...
+gzip -d -c posix.tar.gz | bzip2 >posix.tar.bz2
+
+ren boost-posix-%SNAPSHOT_DATE% posix
+
+echo The ftp transfer will be done in two steps because that has proved more
+echo reliable on Beman's Windows XP 64-bit system.
+
+echo "Creating ftp script 1 ..."
+copy user.txt posix.ftp
+echo dir >>posix.ftp
+echo binary >>posix.ftp
+
+rem echo put posix.tar.gz >>posix.ftp
+rem echo mdelete boost-posix*.gz >>posix.ftp
+rem echo rename posix.tar.gz boost-posix-%SNAPSHOT_DATE%.tar.gz >>posix.ftp
+
+echo put posix.tar.bz2 >>posix.ftp
+echo bye >>posix.ftp
+
+echo Running ftp script 1 ...
+ftp -n -i -s:posix.ftp boost.cowic.de
+
+echo "Creating ftp script 2 ..."
+copy user.txt posix.ftp
+echo dir >>posix.ftp
+echo mdelete boost-posix*.bz2 >>posix.ftp
+echo rename posix.tar.bz2 boost-posix-%SNAPSHOT_DATE%.tar.bz2 >>posix.ftp
+
+echo dir >>posix.ftp
+echo bye >>posix.ftp
+
+echo Running ftp script 2 ...
+ftp -n -i -s:posix.ftp boost.cowic.de
+
+echo POSIX snapshot complete!
diff --git a/snapshot_posix.sh b/snapshot_posix.sh
index 4d27194..4824c5c 100755
--- a/snapshot_posix.sh
+++ b/snapshot_posix.sh
@@ -62,4 +62,4 @@ echo "Running ftp script..."
 # use cygwin ftp rather than Windows ftp
 /usr/bin/ftp -v -i boost.cowic.de <posix.ftp
 
-echo "POSIX snapshot complete!
+echo POSIX snapshot complete!
diff --git a/snapshot_windows.bat b/snapshot_windows.bat
new file mode 100644
index 0000000..eef332d
--- /dev/null
+++ b/snapshot_windows.bat
@@ -0,0 +1,74 @@
+rem  Build a branches/release snapshot for Windows, using CRLF line termination
+
+rem  Copyright 2008 Beman Dawes
+
+rem  Distributed under the Boost Software License, Version 1.0.
+rem  See http://www.boost.org/LICENSE_1_0.txt
+
+echo Build a branches/release snapshot for Windows, using CRLF line termination...
+
+echo "Removing old files..."
+rmdir /s /q windows >nul
+rmdir /s /q svn_info >nul
+del windows.7z >nul
+del windows.zip >nul
+
+echo "Exporting files from subversion..."
+rem  leave an audit trail, which is used by inspect to determine revision number
+svn co --depth=files http://svn.boost.org/svn/boost/branches/release svn_info
+svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
+
+rem echo "Building docs..."
+rem pushd windows/doc
+rem TODO
+rem popd
+
+echo Setting SNAPSHOT_DATE
+strftime "%%Y-%%m-%%d" >date.txt
+set /p SNAPSHOT_DATE= <date.txt
+echo SNAPSHOT_DATE is %SNAPSHOT_DATE%
+
+echo "Renaming..."
+ren windows boost-windows-%SNAPSHOT_DATE%
+
+echo Building .7z file...
+rem On Windows, 7z comes from the 7-Zip package, not Cygwin,
+rem so path must include C:\Program Files\7-Zip
+7z a -r windows.7z boost-windows-%SNAPSHOT_DATE%
+
+rem Building .zip file...
+rem zip -r windows.zip boost-windows-%SNAPSHOT_DATE%
+
+ren boost-windows-%SNAPSHOT_DATE% windows
+
+echo The ftp transfer will be done in two steps because that has proved more
+echo reliable on Beman's Windows XP 64-bit system.
+
+echo Creating ftp script 1 ...
+copy user.txt windows.ftp
+echo dir >>windows.ftp
+echo binary >>windows.ftp
+
+rem echo put windows.zip >>windows.ftp
+rem echo mdelete boost-windows*.zip >>windows.ftp
+rem echo rename windows.zip boost-windows-%SNAPSHOT_DATE%.zip >>windows.ftp
+
+echo put windows.7z >>windows.ftp
+echo bye >>windows.ftp
+
+echo Running ftp script 1 ...
+ftp -n -i -s:windows.ftp boost.cowic.de
+
+echo Creating ftp script 2 ...
+copy user.txt windows.ftp
+echo dir >>windows.ftp
+echo mdelete boost-windows*.7z >>windows.ftp
+echo rename windows.7z boost-windows-%SNAPSHOT_DATE%.7z >>windows.ftp
+
+echo dir >>windows.ftp
+echo bye >>windows.ftp
+
+echo Running ftp script 2 ...
+ftp -n -i -s:windows.ftp boost.cowic.de
+
+echo Windows snapshot complete!
diff --git a/snapshot_windows.sh b/snapshot_windows.sh
index 4562c0e..14de67f 100755
--- a/snapshot_windows.sh
+++ b/snapshot_windows.sh
@@ -16,16 +16,10 @@ rm -r -f windows
 echo "Exporting files from subversion..."
 svn export --non-interactive --native-eol CRLF http://svn.boost.org/svn/boost/branches/release windows
 
-#echo "Building documentation..."
-#pushd windows/doc
-#bjam-cygwin --v2 --toolset=gcc &>../../windows-bjam.log
-#popd
-#
 #echo "Copying docs from posix tree..."
 #cp --recursive posix/doc/html windows/doc
 
-echo "Cleaning up and renaming..."
-#rm -r windows/bin.v2
+echo "Renaming..."
 SNAPSHOT_DATE=`eval date +%Y-%m-%d`
 echo SNAPSHOT_DATE is $SNAPSHOT_DATE
 mv windows boost-windows-$SNAPSHOT_DATE
@@ -35,13 +29,16 @@ mv windows boost-windows-$SNAPSHOT_DATE
 
 echo "Building .7z..."
 rm -f windows.7z
+# On Windows, 7z comes from the 7-Zip package, not Cygwin,
+# so path must include C:\Program Files\7-Zip.
 7z a -r windows.7z boost-windows-$SNAPSHOT_DATE
 
 echo "Reverting name..."
 mv boost-windows-$SNAPSHOT_DATE windows
 
 echo "Creating ftp script..."
-echo "dir" >windows.ftp
+cat <user.txt >>windows.ftp
+echo "dir" >>windows.ftp
 echo "binary" >>windows.ftp
 
 #echo "put windows.zip" >>windows.ftp
@@ -55,7 +52,7 @@ echo "dir" >>windows.ftp
 echo "bye" >>windows.ftp
 
 echo "Running ftp script..."
-# use cygwin ftp rather than windows ftp
-/usr/bin/ftp -v -i boost.cowic.de <windows.ftp
+# This is the Windows ftp client
+ftp -n -i -d -s:windows.ftp boost.cowic.de
 
-echo "Windows snapshot complete!
+echo "Windows snapshot complete!"
diff --git a/strftime.cpp b/strftime.cpp
index 4cb2fa0..57d6609 100644
--- a/strftime.cpp
+++ b/strftime.cpp
@@ -20,27 +20,27 @@ int main(int argc, char * argv[])
   {
     cerr <<
       "Invoke: strftime format\n"
-      "Example: strftime \"The date is %Y?%m?%d in ISO format\""
+      "Example: strftime \"The date is %Y-%m-%d in ISO format\""
       "The format codes are:\n" 
       "  %a  Abbreviated weekday name\n" 
       "  %A  Full weekday name\n"
       "  %b  Abbreviated month name\n"
       "  %B  Full month name\n"
       "  %c  Date and time representation appropriate for locale\n"
-      "  %d  Day of month as decimal number (01 – 31)\n"
-      "  %H  Hour in 24-hour format (00 – 23)\n"
-      "  %I  Hour in 12-hour format (01 – 12)\n"
-      "  %j  Day of year as decimal number (001 – 366)\n"
-      "  %m  Month as decimal number (01 – 12)\n"
-      "  %M  Minute as decimal number (00 – 59)\n"
+      "  %d  Day of month as decimal number (01 - 31)\n"
+      "  %H  Hour in 24-hour format (00 - 23)\n"
+      "  %I  Hour in 12-hour format (01 - 12)\n"
+      "  %j  Day of year as decimal number (001 - 366)\n"
+      "  %m  Month as decimal number (01 - 12)\n"
+      "  %M  Minute as decimal number (00 - 59)\n"
       "  %p  Current locale's A.M./P.M. indicator for 12-hour clock\n"
-      "  %S  Second as decimal number (00 – 59)\n"
-      "  %U  Week of year as decimal number, with Sunday as first day of week (00 – 53)\n"
-      "  %w  Weekday as decimal number (0 – 6; Sunday is 0)\n"
-      "  %W  Week of year as decimal number, with Monday as first day of week (00 – 53)\n"
+      "  %S  Second as decimal number (00 - 59)\n"
+      "  %U  Week of year as decimal number, with Sunday as first day of week (00 - 53)\n"
+      "  %w  Weekday as decimal number (0 - 6; Sunday is 0)\n"
+      "  %W  Week of year as decimal number, with Monday as first day of week (00 - 53)\n"
       "  %x  Date representation for current locale\n"
       "  %X  Time representation for current locale\n"
-      "  %y  Year without century, as decimal number (00 – 99)\n"
+      "  %y  Year without century, as decimal number (00 - 99)\n"
       "  %Y  Year with century, as decimal number\n"
       "  %z, %Z  Either the time-zone name or time zone abbreviation, depending on registry settings; no characters if time zone is unknown\n"
       "  %%  Percent sign\n"
@@ -62,5 +62,7 @@ int main(int argc, char * argv[])
     cerr << "error: buffer overflow\n";
     return 1;
   }
+
+  cout << s;
   return 0;
 }