diff --git a/contrib/library/network/server/nino/library/http_encoding_facilities.e b/contrib/library/network/server/nino/library/http_encoding_facilities.e
index 0b53cd12..60b30a54 100644
--- a/contrib/library/network/server/nino/library/http_encoding_facilities.e
+++ b/contrib/library/network/server/nino/library/http_encoding_facilities.e
@@ -4,8 +4,8 @@ note
 	]"
 	legal: "See notice at end of class."
 	status: "Community Preview 1.0"
-	date: "$Date: 2009-09-01 19:15:37 -0300 (mar 01 de sep de 2009) $"
-	revision: "$Revision: 80577 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	HTTP_ENCODING_FACILITIES
diff --git a/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e b/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
index 2e2339a3..7281fcd9 100644
--- a/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
+++ b/contrib/library/network/server/nino/library/spec/until_16_05/tcp_stream_socket.e
@@ -1,7 +1,7 @@
 note
 	description: "Summary description for {TCP_STREAM_SOCKET}."
-	date: "$Date: 2015-02-16 19:53:13 +0100 (lun., 16 févr. 2015) $"
-	revision: "$Revision: 96642 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	TCP_STREAM_SOCKET
diff --git a/draft/src/gewf/template/basic/launcher/any/application_launcher.e b/draft/src/gewf/template/basic/launcher/any/application_launcher.e
index 7754546d..46586a02 100644
--- a/draft/src/gewf/template/basic/launcher/any/application_launcher.e
+++ b/draft/src/gewf/template/basic/launcher/any/application_launcher.e
@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER
diff --git a/draft/src/gewf/template/basic/launcher/any/application_launcher_i.e b/draft/src/gewf/template/basic/launcher/any/application_launcher_i.e
index 2e63ce7e..3b0f4dbf 100644
--- a/draft/src/gewf/template/basic/launcher/any/application_launcher_i.e
+++ b/draft/src/gewf/template/basic/launcher/any/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I
diff --git a/draft/src/gewf/template/basic/launcher/default/application_launcher.e b/draft/src/gewf/template/basic/launcher/default/application_launcher.e
index 7754546d..46586a02 100644
--- a/draft/src/gewf/template/basic/launcher/default/application_launcher.e
+++ b/draft/src/gewf/template/basic/launcher/default/application_launcher.e
@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER
diff --git a/draft/src/gewf/template/basic/launcher/default/application_launcher_i.e b/draft/src/gewf/template/basic/launcher/default/application_launcher_i.e
index 6110e4fa..2b85cf9c 100644
--- a/draft/src/gewf/template/basic/launcher/default/application_launcher_i.e
+++ b/draft/src/gewf/template/basic/launcher/default/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I
diff --git a/examples/debug/launcher/any/application_launcher.e b/examples/debug/launcher/any/application_launcher.e
index bb184d0a..095fdc17 100644
--- a/examples/debug/launcher/any/application_launcher.e
+++ b/examples/debug/launcher/any/application_launcher.e
@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
diff --git a/examples/debug/launcher/any/application_launcher_i.e b/examples/debug/launcher/any/application_launcher_i.e
index 570f8e20..4f351dff 100644
--- a/examples/debug/launcher/any/application_launcher_i.e
+++ b/examples/debug/launcher/any/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
diff --git a/examples/debug/launcher/default/application_launcher.e b/examples/debug/launcher/default/application_launcher.e
index bb184d0a..095fdc17 100644
--- a/examples/debug/launcher/default/application_launcher.e
+++ b/examples/debug/launcher/default/application_launcher.e
@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
diff --git a/examples/debug/launcher/default/application_launcher_i.e b/examples/debug/launcher/default/application_launcher_i.e
index ef8f0037..f2a3e77f 100644
--- a/examples/debug/launcher/default/application_launcher_i.e
+++ b/examples/debug/launcher/default/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
diff --git a/examples/desktop_app/src/desktop_app.e b/examples/desktop_app/src/desktop_app.e
index 4e506670..5e239591 100644
--- a/examples/desktop_app/src/desktop_app.e
+++ b/examples/desktop_app/src/desktop_app.e
@@ -4,8 +4,8 @@ note
 	generator: "EiffelBuild"
 	legal: "See notice at end of class."
 	status: "See notice at end of class."
-	date: "$Date: 2012-09-29 01:29:13 +0200 (sam., 29 sept. 2012) $"
-	revision: "$Revision: 89488 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 
 class
diff --git a/examples/desktop_app/src/main_window.e b/examples/desktop_app/src/main_window.e
index 654aace6..b459ac28 100644
--- a/examples/desktop_app/src/main_window.e
+++ b/examples/desktop_app/src/main_window.e
@@ -4,8 +4,8 @@ note
 	generator: "EiffelBuild"
 	legal: "See notice at end of class."
 	status: "See notice at end of class."
-	date: "$Date: 2010-08-17 10:49:12 +0200 (mar., 17 août 2010) $"
-	revision: "$Revision: 84189 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	MAIN_WINDOW
diff --git a/library/server/wsf_html/form/input/wsf_form_hidden_input.e b/library/server/wsf_html/form/input/wsf_form_hidden_input.e
index 73b96c85..b5cf5249 100644
--- a/library/server/wsf_html/form/input/wsf_form_hidden_input.e
+++ b/library/server/wsf_html/form/input/wsf_form_hidden_input.e
@@ -1,6 +1,4 @@
 note
-	description: "Summary description for {WSF_FORM_INPUT}."
-	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
diff --git a/library/server/wsf_html/form/input/wsf_form_password_input.e b/library/server/wsf_html/form/input/wsf_form_password_input.e
index e403beb2..19058b0f 100644
--- a/library/server/wsf_html/form/input/wsf_form_password_input.e
+++ b/library/server/wsf_html/form/input/wsf_form_password_input.e
@@ -1,6 +1,4 @@
 note
-	description: "Summary description for {WSF_FORM_PASSWORD_INPUT}."
-	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
diff --git a/tools/estudio_wizard/rootdir/resources/launcher/any/application_launcher_i.e b/tools/estudio_wizard/rootdir/resources/launcher/any/application_launcher_i.e
index fe0ff855..f59b16cc 100644
--- a/tools/estudio_wizard/rootdir/resources/launcher/any/application_launcher_i.e
+++ b/tools/estudio_wizard/rootdir/resources/launcher/any/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
diff --git a/tools/estudio_wizard/rootdir/resources/launcher/application_launcher.e b/tools/estudio_wizard/rootdir/resources/launcher/application_launcher.e
index 616dbd6f..5615266d 100644
--- a/tools/estudio_wizard/rootdir/resources/launcher/application_launcher.e
+++ b/tools/estudio_wizard/rootdir/resources/launcher/application_launcher.e
@@ -4,8 +4,8 @@ note
 
 				You can put modification in this class
 			]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	APPLICATION_LAUNCHER [G -> WSF_EXECUTION create make end]
diff --git a/tools/estudio_wizard/rootdir/resources/launcher/default/application_launcher_i.e b/tools/estudio_wizard/rootdir/resources/launcher/default/application_launcher_i.e
index 72fb1389..996745fa 100644
--- a/tools/estudio_wizard/rootdir/resources/launcher/default/application_launcher_i.e
+++ b/tools/estudio_wizard/rootdir/resources/launcher/default/application_launcher_i.e
@@ -6,8 +6,8 @@ note
 
 			you can customize APPLICATION_LAUNCHER
 		]"
-	date: "$Date: 2013-06-12 13:55:42 +0200 (mer., 12 juin 2013) $"
-	revision: "$Revision: 36 $"
+	date: "$Date$"
+	revision: "$Revision$"
 
 deferred class
 	APPLICATION_LAUNCHER_I [G -> WSF_EXECUTION create make end]
diff --git a/tools/estudio_wizard/src/gui/ewf_graphical_wizard.e b/tools/estudio_wizard/src/gui/ewf_graphical_wizard.e
index 81bb39a6..80cf38d0 100644
--- a/tools/estudio_wizard/src/gui/ewf_graphical_wizard.e
+++ b/tools/estudio_wizard/src/gui/ewf_graphical_wizard.e
@@ -1,5 +1,5 @@
 note
-	description: "Graphical wizard for EiffelWeb projects."
+	author: "$Author$"
 	date: "$Date$"
 	revision: "$Revision$"
 
@@ -26,7 +26,7 @@ feature {NONE} -- Initialization
 		do
 			default_create
 
-				-- Initialize ISE_PROJECTS variable with expected EiffelStudio value.
+				-- Initialize wizard.
 			if execution_environment.arguments.index_of_word_option ("-console") > 0 then
 				create cons.make
 			else