diff options
| author | Elliott Hughes <enh@google.com> | 2013-04-10 16:51:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-10 16:51:36 -0700 |
| commit | b6e7f16b4ce07636b04f8164c6ae980080b6bb3a (patch) | |
| tree | c6a8460413c6ff65bbeab61d87ab0655b084cc93 /luni | |
| parent | fc6299edd28f088f90006cfe6350fe8b1c837dd3 (diff) | |
| parent | 8ce8f43778da295855bb1718b545f0b382d5ba12 (diff) | |
| download | libcore-b6e7f16b4ce07636b04f8164c6ae980080b6bb3a.zip libcore-b6e7f16b4ce07636b04f8164c6ae980080b6bb3a.tar.gz libcore-b6e7f16b4ce07636b04f8164c6ae980080b6bb3a.tar.bz2 | |
am 8ce8f437: Merge "Fix Formatter documentation."
* commit '8ce8f43778da295855bb1718b545f0b382d5ba12':
Fix Formatter documentation.
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/java/util/Formatter.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/luni/src/main/java/java/util/Formatter.java b/luni/src/main/java/java/util/Formatter.java index 6ca8733..d6b772a 100644 --- a/luni/src/main/java/java/util/Formatter.java +++ b/luni/src/main/java/java/util/Formatter.java @@ -318,6 +318,7 @@ format("%6.0E", 123.456f);</td> * <br> * Calendar, Date, and Long (representing milliseconds past the epoch) are all acceptable * as date/time arguments. Any other type is an error. The epoch is 1970-01-01 00:00:00 UTC. + * <font color="red">Use {@link java.text.SimpleDateFormat} instead.</font> * </TD> * </tr> * <tr> @@ -388,14 +389,14 @@ format("%6.0E", 123.456f);</td> * </tr> * <tr> * <td width="5%">{@code tH}</td> - * <td width="25%">24-hour hour of day (00-23).</td> + * <td width="25%">2-digit 24-hour hour of day (00-23).</td> * <td width="30%">{@code format("%tH", cal);}</td> * <td width="30%">{@code 16}</td> * </tr> * <tr> * <td width="5%">{@code tI}</td> - * <td width="25%">12-hour hour of day (01-12).</td> - * <td width="30%">{@code format("%tH", cal);}</td> + * <td width="25%">2-digit 12-hour hour of day (01-12).</td> + * <td width="30%">{@code format("%tI", cal);}</td> * <td width="30%">{@code 04}</td> * </tr> * <tr> @@ -407,13 +408,13 @@ format("%6.0E", 123.456f);</td> * <tr> * <td width="5%">{@code tk}</td> * <td width="25%">24-hour hour of day (0-23).</td> - * <td width="30%">{@code format("%tH", cal);}</td> + * <td width="30%">{@code format("%tk", cal);}</td> * <td width="30%">{@code 16}</td> * </tr> * <tr> * <td width="5%">{@code tl}</td> * <td width="25%">12-hour hour of day (1-12).</td> - * <td width="30%">{@code format("%tH", cal);}</td> + * <td width="30%">{@code format("%tl", cal);}</td> * <td width="30%">{@code 4}</td> * </tr> * <tr> |