diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/index.wiki
index c362f55c..618d0674 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/index.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Browsing tools]]
 [[Property:weight|-13]]
 [[Property:uuid|b4e840c3-a635-b5dd-fbd2-0db69b3d6ce1]]
-The browsing tools are the address bars as well as all the tools that are in the left panel of development windows in normal mode. They help find an item in the system, such as a class, a cluster, a feature, some text, ... They include the [[Address bars|address bars]], the [[Cluster tool|cluster tool]], the [[Feature tool|feature tool]], the [[Favorites tool|favorites tool]], the [[Windows tool|windows tool]], and the [[Search tool|search tool]] . 
+The browsing tools are the address bars as well as all the tools that are in the left panel of development windows in normal mode. They help find an item in the system, such as a class, a cluster, a feature, some text, ... They include the [[Address bars|address bars]], the [[Groups tool|groups tool]], the [[Feature tool|feature tool]], the [[Favorites tool|favorites tool]], the [[Windows tool|windows tool]], and the [[Search tool|search tool]] . 
 
 {{seealso|<br/>
 [[EiffelStudio window overview|General window overview]]  }}
diff --git a/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/date-time-string-conversion.wiki b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/date-time-string-conversion.wiki
index b6aa43ec..01057755 100644
--- a/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/date-time-string-conversion.wiki
+++ b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/date-time-string-conversion.wiki
@@ -1,7 +1,7 @@
 [[Property:title|DATE / TIME to STRING Conversion]]
 [[Property:weight|3]]
 [[Property:uuid|88972ba4-694b-8558-b0c8-87b1fc40afc4]]
-The classes <eiffel>TIME</eiffel>, <eiffel>DATE</eiffel>, and <eiffel>DATE_TIME</eiffel> provide a query <eiffel>formatted_out</eiffel> which can be used to retrieve a string containing the date or time in a format specified by a string or format conversion codes that the caller provides as an argument. So for example, if a <eiffel>DATE</eiffel> instance referenced by <eiffel>my_date</eiffel> has a value of February 3, 2008, then applying the query:
+The classes <eiffel>TIME</eiffel>, <eiffel>DATE</eiffel>, and <eiffel>DATE_TIME</eiffel> provide a query <eiffel>formatted_out</eiffel> which can be used to retrieve a string containing the date or time in a format specified by a string or format conversion codes that the caller provides as an argument. The conversion is done in the <eiffel>DATE_TIME_CODE_STRING</eiffel> class. So for example, if a <eiffel>DATE</eiffel> instance referenced by <eiffel>my_date</eiffel> has a value of February 3, 2008, then applying the query:
 <eiffel>
             my_date.formatted_out ("[0]dd mmm yyyy")
 </eiffel>