Merge jv
authorMerge Script
Thu, 07 Jul 2016 07:03:06 +0200
branchjv
changeset 16719 909111047a1d
parent 16717 814e3fa20205 (current diff)
parent 16718 cc9f5b0ac2bd (diff)
child 16727 639ebd184cf4
Merge
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Tue Jun 28 08:06:44 2016 +0100
+++ b/AbstractSettingsApplication.st	Thu Jul 07 07:03:06 2016 +0200
@@ -6256,8 +6256,8 @@
 !
 
 serverClass
-    "answer the default class for instanciating servers.
-     Note that we may instanciate FCGIServer as well"
+    "answer the default class for instantiating servers.
+     Note that we may instantiate FCGIServer as well"
 
     ^ HTTPServer
 !