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 01057755..9841993f 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
@@ -24,7 +24,7 @@ The following table lists format conversion codes.
 | day - numeric (padded with '0' to 2 figures)
 |- 
 | ddd
-| day - text (3 letters e.g "Mon", "Tue")
+| day - text (3 letters e.g "MON", "TUE")
 |- 
 | yyyy
 | year - numeric (4 figures)
@@ -39,7 +39,7 @@ The following table lists format conversion codes.
 | month - numeric (padded with '0' to 2 figures)
 |- 
 | mmm
-| month - text (3 letters e.g "Dec", "Jan")
+| month - text (3 letters e.g "DEC", "JAN")
 |- 
 | hh
 | hour - numeric (24 hour clock scale by default)
@@ -66,7 +66,7 @@ The following table lists format conversion codes.
 | fractional seconds - numeric (precise to <n> figures)
 |- 
 | ':', '/', '-' and ','
-| separators e.g. "03/Aug/97"
+| separators e.g. "03/AUG/97"
 |}
 These are some examples of output with their associated format code: 
 {| 
@@ -78,10 +78,10 @@ These are some examples of output with their associated format code:
 | 97/8/18
 |- 
 | mmm-dd-yy
-| Aug-18-97
+| AUG-18-97
 |- 
 | dd,mm,yyyy
-| 18,Aug,1997
+| 18,8,1997
 |- 
 | hh-mi-ss
 | 13-06-32
diff --git a/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-sample.wiki b/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-sample.wiki
index 364e788e..158e9d38 100644
--- a/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-sample.wiki
+++ b/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-sample.wiki
@@ -26,11 +26,11 @@ In order to run properly you need to read [[Eiffel2Java|the library requirement]
 
 ===Compiling the example===
 
-Since the example is using the `test.java' class, the first step is to compile the java class using the `javac' command line utility from the JDK. Once it is done, copy the `test.class' either in $ISE_EIFFEL\examples\Eiffel2Java\EIFGENs\classic\W_code or in $ISE_EIFFEL\examples\Eiffel2Java\EIFGENs\classic\F_code depending on your compilation mode (freezing vs. finalizing).
+Since the example is using the `test.java' class, the first step is to compile the java class using the `javac' command line utility from the JDK. Once it is done, copy the `test.class' either into $ISE_EIFFEL\examples\Eiffel2Java\EIFGENs\classic\W_code or else into $ISE_EIFFEL\examples\Eiffel2Java\EIFGENs\classic\F_code, depending on your compilation mode (freezing vs. finalizing).
 
 ===Running the example===
 
-One the example is compiled, you can run it and here is the expected output:
+Once the example is compiled, you can run it and here is the expected output:
 <code>
 $ sample
 Creating instance of class `test'