From 9db22d734a71c16b44d88bbc781ea8e5c301d21f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 17 Mar 2023 22:53:27 -0700
Subject: [PATCH] Added links to the wiki

---
 README.md                                     | 10 ++---
 lib/src/main/java/rife/render/Uptime.java     | 39 +------------------
 lib/src/test/java/rife/render/TestFormat.java |  2 +-
 .../test/resources/templates/dateTimeUtc.html |  2 +-
 lib/src/test/resources/templates/uptime.html  |  2 +-
 lib/src/test/resources/templates/uptime2.txt  | 12 +++---
 6 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/README.md b/README.md
index d8efbd9..0c43ad1 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,11 @@ This project provides a collection of template renderers.
 
 ## Format Renderers
 
-| Renderer                       | Description                                                      |
-|:-------------------------------|:-----------------------------------------------------------------|
-| `rife.render.formatCreditcard` | Formats a template credit card number value to the last 4 digits |
-| `rife.render.ShorteUrl`        | Shortens a template value using [is./gd](https://is.gd/)         |
-| `rife.render.Uptime`           | Renders the server uptime in various customizable formats        |
+| Renderer                                                                                        | Description                                                      |
+|:------------------------------------------------------------------------------------------------|:-----------------------------------------------------------------|
+| `rife.render.formatCreditcard`                                                                  | Formats a template credit card number value to the last 4 digits |
+| `rife.render.ShorteUrl`                                                                         | Shortens a template value using [is./gd](https://is.gd/)         |
+| [rife.render.Uptime](https://github.com/rife2/rife2-template-renderers/wiki/rife.render.Uptime) | Renders the server uptime in various customizable formats        |
 
 
 ## Text Renderers
diff --git a/lib/src/main/java/rife/render/Uptime.java b/lib/src/main/java/rife/render/Uptime.java
index f416aeb..ee4dabc 100644
--- a/lib/src/main/java/rife/render/Uptime.java
+++ b/lib/src/main/java/rife/render/Uptime.java
@@ -28,44 +28,7 @@ import java.util.Properties;
 /**
  * Renders the server uptime.
  *
- * <p>Usage:</p>
- *
- * <pre>
- *   &lt;!--v render:rife.render.Uptime/--&gt;
- *   {{v render:rife.render.Uptime:valueId/}}
- * </pre>
- *
- * <p>You can also specify custom formatting using the following properties:</p>
- *
- * <pre>
- *   {{v: render:rife.renader.Uptime}}
- *   year=Y-
- *   years=Y-
- *   month=M-
- *   months=M-
- *   week=W-
- *   weeks=W-
- *   day=D-
- *   days=D-
- *   hour=H-
- *   hours=H-
- *   minute=M-
- *   minutes=M-
- *   {{/v}}
- * </pre>
- *
- * <p>which would render something like</p>
- *
- * <pre>
- *   17Y-2M-2W-1D-9H-33M
- * </pre>
- *
- * <p>You can also specify the uptime via a template attribute</p>
- *
- * <pre>
- *   template.setAttribute(Uptime.class.getName(), 120000L);
- * </pre>
- *
+ * @see <a href="https://github.com/rife2/rife2-template-renderers/wiki/rife.render.Uptime">rife.render.Uptime</a>
  * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
diff --git a/lib/src/test/java/rife/render/TestFormat.java b/lib/src/test/java/rife/render/TestFormat.java
index 06b6155..5446097 100644
--- a/lib/src/test/java/rife/render/TestFormat.java
+++ b/lib/src/test/java/rife/render/TestFormat.java
@@ -66,7 +66,7 @@ class TestFormat {
 
         t = TemplateFactory.TXT.get("uptime2");
         t.setAttribute(Uptime.class.getName(), 547800388076L);
-        assertThat(t.getContent()).matches("17Y-4M-2W-1D-6H-46M");
+        assertThat(t.getContent()).matches("17YRS-4MOS-2WKS-1D-6H-46M");
 
     }
 }
diff --git a/lib/src/test/resources/templates/dateTimeUtc.html b/lib/src/test/resources/templates/dateTimeUtc.html
index 4329899..1efff41 100644
--- a/lib/src/test/resources/templates/dateTimeUtc.html
+++ b/lib/src/test/resources/templates/dateTimeUtc.html
@@ -1,3 +1,3 @@
-<!--v render:rife.render.DateTimeIso -->
+<!--v render:rife.render.DateTimeIso-->
 tz=UTC
 <!--/v-->
\ No newline at end of file
diff --git a/lib/src/test/resources/templates/uptime.html b/lib/src/test/resources/templates/uptime.html
index f8232e7..7d878d1 100644
--- a/lib/src/test/resources/templates/uptime.html
+++ b/lib/src/test/resources/templates/uptime.html
@@ -1,4 +1,4 @@
-<!--v render:rife.render.Uptime -->
+<!--v render:rife.render.Uptime-->
 year=\ année,\u0020
 years=\ années,\u0020
 month=\ moi,\u0020
diff --git a/lib/src/test/resources/templates/uptime2.txt b/lib/src/test/resources/templates/uptime2.txt
index 635467c..6bd1d18 100644
--- a/lib/src/test/resources/templates/uptime2.txt
+++ b/lib/src/test/resources/templates/uptime2.txt
@@ -1,10 +1,10 @@
 {{v render:rife.render.Uptime}}
-year=Y-
-years=Y-
-month=M-
-months=M-
-week=W-
-weeks=W-
+year=YR-
+years=YRS-
+month=M0-
+months=MOS-
+week=WK-
+weeks=WKS-
 day=D-
 days=D-
 hour=H-