diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h
index 962818273..de1aa75a1 100644
--- a/Util/include/Poco/Util/AbstractConfiguration.h
+++ b/Util/include/Poco/Util/AbstractConfiguration.h
@@ -1,7 +1,7 @@
 //
 // AbstractConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/AbstractConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/AbstractConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h
index 297df602e..a1c79f46f 100644
--- a/Util/include/Poco/Util/Application.h
+++ b/Util/include/Poco/Util/Application.h
@@ -1,7 +1,7 @@
 //
 // Application.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/Application.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Application.h#17 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/ConfigurationMapper.h b/Util/include/Poco/Util/ConfigurationMapper.h
index 82a9a3aa4..9dedd97ee 100644
--- a/Util/include/Poco/Util/ConfigurationMapper.h
+++ b/Util/include/Poco/Util/ConfigurationMapper.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationMapper.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/ConfigurationMapper.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationMapper.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/ConfigurationView.h b/Util/include/Poco/Util/ConfigurationView.h
index ae90c37e3..603edff68 100644
--- a/Util/include/Poco/Util/ConfigurationView.h
+++ b/Util/include/Poco/Util/ConfigurationView.h
@@ -1,7 +1,7 @@
 //
 // ConfigurationView.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/ConfigurationView.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ConfigurationView.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/FilesystemConfiguration.h b/Util/include/Poco/Util/FilesystemConfiguration.h
index 0c580e478..d149e33df 100644
--- a/Util/include/Poco/Util/FilesystemConfiguration.h
+++ b/Util/include/Poco/Util/FilesystemConfiguration.h
@@ -1,7 +1,7 @@
 //
 // FilesystemConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/FilesystemConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/FilesystemConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/IniFileConfiguration.h b/Util/include/Poco/Util/IniFileConfiguration.h
index 451413601..e83862f76 100644
--- a/Util/include/Poco/Util/IniFileConfiguration.h
+++ b/Util/include/Poco/Util/IniFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // IniFileConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/IniFileConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/IniFileConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/IntValidator.h b/Util/include/Poco/Util/IntValidator.h
index 704b10359..657538c4c 100644
--- a/Util/include/Poco/Util/IntValidator.h
+++ b/Util/include/Poco/Util/IntValidator.h
@@ -1,7 +1,7 @@
 //
 // IntValidator.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/IntValidator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/IntValidator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/LayeredConfiguration.h b/Util/include/Poco/Util/LayeredConfiguration.h
index 09d5c0d69..f92714d43 100644
--- a/Util/include/Poco/Util/LayeredConfiguration.h
+++ b/Util/include/Poco/Util/LayeredConfiguration.h
@@ -1,7 +1,7 @@
 //
 // LayeredConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/LayeredConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/LayeredConfiguration.h#3 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h
index b9943e038..b7830bed1 100644
--- a/Util/include/Poco/Util/LoggingConfigurator.h
+++ b/Util/include/Poco/Util/LoggingConfigurator.h
@@ -1,7 +1,7 @@
 //
 // LoggingConfigurator.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/LoggingConfigurator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/LoggingConfigurator.h#3 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/LoggingSubsystem.h b/Util/include/Poco/Util/LoggingSubsystem.h
index cbc5e1848..02852d8cf 100644
--- a/Util/include/Poco/Util/LoggingSubsystem.h
+++ b/Util/include/Poco/Util/LoggingSubsystem.h
@@ -1,7 +1,7 @@
 //
 // LoggingSubsystem.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/LoggingSubsystem.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/LoggingSubsystem.h#2 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/MapConfiguration.h b/Util/include/Poco/Util/MapConfiguration.h
index 1853a6012..d8dae8881 100644
--- a/Util/include/Poco/Util/MapConfiguration.h
+++ b/Util/include/Poco/Util/MapConfiguration.h
@@ -1,7 +1,7 @@
 //
 // MapConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/MapConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/MapConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h
index ee5ae5133..6fd6e72dc 100644
--- a/Util/include/Poco/Util/Option.h
+++ b/Util/include/Poco/Util/Option.h
@@ -1,7 +1,7 @@
 //
 // Option.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/Option.h#2 $
+// $Id: //poco/Main/Util/include/Poco/Util/Option.h#6 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionCallback.h b/Util/include/Poco/Util/OptionCallback.h
index 488c224ef..b119d5708 100644
--- a/Util/include/Poco/Util/OptionCallback.h
+++ b/Util/include/Poco/Util/OptionCallback.h
@@ -1,7 +1,7 @@
 //
 // OptionCallback.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/OptionCallback.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionCallback.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionException.h b/Util/include/Poco/Util/OptionException.h
index f51089409..cad2bb65b 100644
--- a/Util/include/Poco/Util/OptionException.h
+++ b/Util/include/Poco/Util/OptionException.h
@@ -1,7 +1,7 @@
 //
 // OptionException.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/OptionException.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionException.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionProcessor.h b/Util/include/Poco/Util/OptionProcessor.h
index 78a9d82d3..45e24351b 100644
--- a/Util/include/Poco/Util/OptionProcessor.h
+++ b/Util/include/Poco/Util/OptionProcessor.h
@@ -1,7 +1,7 @@
 //
 // OptionProcessor.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/OptionProcessor.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionProcessor.h#3 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/OptionSet.h b/Util/include/Poco/Util/OptionSet.h
index ecbb090f2..f68db95dd 100644
--- a/Util/include/Poco/Util/OptionSet.h
+++ b/Util/include/Poco/Util/OptionSet.h
@@ -1,7 +1,7 @@
 //
 // OptionSet.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/OptionSet.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/OptionSet.h#2 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/PropertyFileConfiguration.h b/Util/include/Poco/Util/PropertyFileConfiguration.h
index bb55845f7..d76820fdc 100644
--- a/Util/include/Poco/Util/PropertyFileConfiguration.h
+++ b/Util/include/Poco/Util/PropertyFileConfiguration.h
@@ -1,7 +1,7 @@
 //
 // PropertyFileConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/PropertyFileConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/PropertyFileConfiguration.h#2 $
 //
 // Library: Util
 // Package: Configuration
diff --git a/Util/include/Poco/Util/RegExpValidator.h b/Util/include/Poco/Util/RegExpValidator.h
index 3bd2699e9..3fb443bfd 100644
--- a/Util/include/Poco/Util/RegExpValidator.h
+++ b/Util/include/Poco/Util/RegExpValidator.h
@@ -1,7 +1,7 @@
 //
 // RegExpValidator.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/RegExpValidator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/RegExpValidator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h
index 9e5208c3e..5e260d404 100644
--- a/Util/include/Poco/Util/ServerApplication.h
+++ b/Util/include/Poco/Util/ServerApplication.h
@@ -1,7 +1,7 @@
 //
 // ServerApplication.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/ServerApplication.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/ServerApplication.h#7 $
 //
 // Library: Util
 // Package: Application
@@ -100,14 +100,18 @@ class Util_API ServerApplication: public Application
 	///
 	/// Note that the working directory for an application running as a service
 	/// is the Windows system directory (e.g., C:\Windows\system32). Take this
-	/// into account when working with relative filesystem paths.
+	/// into account when working with relative filesystem paths. Also, services
+	/// run under a different user account, so an application that works when
+	/// started from the command line may fail to run as a service if it depends
+	/// on a certain environment (e.g., the PATH environment variable).
 	///
 	/// An application registered as a Windows service can be started
 	/// with the NET START <name> command and stopped with the NET STOP <name>
 	/// command. Alternatively, the Services MMC applet can be used.
 	///
 	/// On Unix platforms, an application built on top of the ServerApplication
-	/// class can be optionally run as a daemon. A daemon, when launched, immediately
+	/// class can be optionally run as a daemon by giving the --daemon
+	/// command line option. A daemon, when launched, immediately
 	/// forks off a background process that does the actual work. After launching
 	/// the background process, the foreground process exits.
 	/// 
@@ -124,6 +128,11 @@ class Util_API ServerApplication: public Application
 	///     {
 	///         // do daemon specific things
 	///     }
+	///
+	/// When running as a daemon, specifying the --pidfile option (e.g.,
+	/// --pidfile=/var/run/sample.pid) may be useful to record the process ID of 
+	/// the daemon in a file. The PID file will be removed when the daemon process 
+	/// terminates (but not, if it crashes).
 {
 public:
 	ServerApplication();
diff --git a/Util/include/Poco/Util/Subsystem.h b/Util/include/Poco/Util/Subsystem.h
index 3cd86ad01..b0e067ea7 100644
--- a/Util/include/Poco/Util/Subsystem.h
+++ b/Util/include/Poco/Util/Subsystem.h
@@ -1,7 +1,7 @@
 //
 // Subsystem.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/Subsystem.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Subsystem.h#4 $
 //
 // Library: Util
 // Package: Application
diff --git a/Util/include/Poco/Util/Util.h b/Util/include/Poco/Util/Util.h
index fd1389574..f156e6a03 100644
--- a/Util/include/Poco/Util/Util.h
+++ b/Util/include/Poco/Util/Util.h
@@ -1,7 +1,7 @@
 //
 // Util.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/Util.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Util.h#3 $
 //
 // Library: Util
 // Package: Util
diff --git a/Util/include/Poco/Util/Validator.h b/Util/include/Poco/Util/Validator.h
index a448d4f7c..816a87bf1 100644
--- a/Util/include/Poco/Util/Validator.h
+++ b/Util/include/Poco/Util/Validator.h
@@ -1,7 +1,7 @@
 //
 // Validator.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/Validator.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/Validator.h#1 $
 //
 // Library: Util
 // Package: Options
diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h
index 6dbe04e8b..f72c4fa33 100644
--- a/Util/include/Poco/Util/WinRegistryConfiguration.h
+++ b/Util/include/Poco/Util/WinRegistryConfiguration.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryConfiguration.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/WinRegistryConfiguration.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryConfiguration.h#2 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/include/Poco/Util/WinRegistryKey.h b/Util/include/Poco/Util/WinRegistryKey.h
index 2a521ac94..c4de9346f 100644
--- a/Util/include/Poco/Util/WinRegistryKey.h
+++ b/Util/include/Poco/Util/WinRegistryKey.h
@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.h
 //
-// $Id: //poco/1.3/Util/include/Poco/Util/WinRegistryKey.h#2 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryKey.h#4 $
 //
 // Library: Util
 // Package: Windows
diff --git a/Util/include/Poco/Util/WinService.h b/Util/include/Poco/Util/WinService.h
index fce35ae6f..ff585e92a 100644
--- a/Util/include/Poco/Util/WinService.h
+++ b/Util/include/Poco/Util/WinService.h
@@ -1,7 +1,7 @@
 //
 // WinService.h
 //
-// $Id: //poco/svn/Util/include/Poco/Util/WinService.h#1 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinService.h#4 $
 //
 // Library: Util
 // Package: Windows