From 5e1f3db463f036e1573498882cfe6cf3c8bdbc23 Mon Sep 17 00:00:00 2001
From: Roger Sheen <roger@infotexture.net>
Date: Sat, 26 Oct 2024 00:05:32 +0200
Subject: [PATCH] Mark DITA-OT Users as archive & reorder Resources

See https://github.com/dita-ot/website/pull/850

Signed-off-by: Roger Sheen <roger@infotexture.net>
---
 resources/common-toc.ditamap    |  3 ++-
 topics/dita-ot-day-videos.dita  |  2 +-
 topics/dita-resources.ditamap   | 38 ++++++++++++++-------------------
 topics/web-based-resources.dita | 33 +++++++++++++++-------------
 4 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/resources/common-toc.ditamap b/resources/common-toc.ditamap
index dd72ea09f..0309a3f09 100644
--- a/resources/common-toc.ditamap
+++ b/resources/common-toc.ditamap
@@ -42,8 +42,9 @@
     <mapref href="../reference/reference.ditamap"/>
   </topicref>
   <topicref keyref="dita-and-dita-ot-resources">
-    <mapref href="../topics/dita-ot-day-videos.ditamap"/>
     <mapref href="../topics/dita-resources.ditamap" toc="no"/>
+    <mapref href="../topics/dita-ot-day-videos.ditamap"/>
+    <topicref keyref="books" toc="yes"/>
   </topicref>
 
   <topicgroup processing-role="resource-only">
diff --git a/topics/dita-ot-day-videos.dita b/topics/dita-ot-day-videos.dita
index 6286bf1cd..c0339bc36 100644
--- a/topics/dita-ot-day-videos.dita
+++ b/topics/dita-ot-day-videos.dita
@@ -6,7 +6,7 @@
   <titlealts>
     <navtitle>DITA-OT Day Videos</navtitle>
   </titlealts>
-  <shortdesc>All video recordings from each DITA-OT Day conference from 2014 onward.</shortdesc>
+  <shortdesc>Video recordings from each DITA-OT Day conference from 2014 onward.</shortdesc>
   <conbody>
     <p/>
   </conbody>
diff --git a/topics/dita-resources.ditamap b/topics/dita-resources.ditamap
index 9ff124663..760ced50c 100644
--- a/topics/dita-resources.ditamap
+++ b/topics/dita-resources.ditamap
@@ -4,11 +4,12 @@
 <map>
   <title>DITA and DITA-OT resources</title>
 
-  <topicref format="html" href="https://www.dita-ot.org" scope="external">
+  <topicref format="html" href="https://groups.io/g/dita-users" scope="external">
     <topicmeta>
-      <linktext>DITA-OT project website: dita-ot.org</linktext>
-      <shortdesc>The DITA-OT project website at dita-ot.org provides information about the latest toolkit releases,
-        including download links, release notes, and documentation for recent DITA-OT versions.</shortdesc>
+      <linktext>DITA Users group</linktext>
+      <shortdesc>The original dita-users group was founded in 2004 as a Yahoo! Group and moved to Groups.io in November
+        2019. The mailing list addresses the needs of DITA users at all levels of experience, from beginners to experts,
+        and serves as a vital resource for the DITA community.</shortdesc>
     </topicmeta>
   </topicref>
   <topicref format="html" href="https://github.com/orgs/dita-ot/discussions" scope="external">
@@ -19,25 +20,13 @@
         as answered.</shortdesc>
     </topicmeta>
   </topicref>
-  <topicref format="html" href="https://groups.io/g/dita-users" scope="external">
-    <topicmeta>
-      <linktext>DITA Users group</linktext>
-      <shortdesc>The original dita-users group was founded in 2004 as a Yahoo! Group and moved to Groups.io in November
-        2019. The mailing list addresses the needs of DITA users at all levels of experience, from beginners to experts,
-        and serves as a vital resource for the DITA community.</shortdesc>
-    </topicmeta>
-  </topicref>
   <topicref format="html" href="https://groups.google.com/d/forum/dita-ot-users" scope="external">
     <topicmeta>
-      <linktext>DITA-OT Users group</linktext>
-      <shortdesc>General interest DITA-OT mailing list, for questions on any aspect of the toolkit — from installation
-        and getting started to specific overrides, plug-ins, and customizations.</shortdesc>
-    </topicmeta>
-  </topicref>
-  <topicref format="html" href="http://www.oasis-open.org/committees/dita/" scope="external">
-    <topicmeta>
-      <linktext>Home page for the DITA Technical Committee</linktext>
-      <shortdesc>The OASIS DITA Technical Committee develops the DITA standard.</shortdesc>
+      <linktext>DITA-OT Users group archive</linktext>
+      <shortdesc>From 2013 to 2024, the DITA-OT Users group served as a general interest DITA-OT mailing list, for
+        questions ranging from installation and getting started to specific overrides, plug-ins, and
+        customizations. <i>(Archived in favor of the DITA-OT Discussions forum.)</i>
+      </shortdesc>
     </topicmeta>
   </topicref>
   <topicref format="html" href="http://dita-archive.xml.org/wiki/the-dita-open-toolkit" scope="external">
@@ -47,5 +36,10 @@
         release notes for legacy versions.</shortdesc>
     </topicmeta>
   </topicref>
-  <topicref keyref="books" toc="yes"/>
+  <topicref format="html" href="http://www.oasis-open.org/committees/dita/" scope="external">
+    <topicmeta>
+      <linktext>DITA Technical Committee</linktext>
+      <shortdesc>The OASIS DITA Technical Committee develops the DITA standard.</shortdesc>
+    </topicmeta>
+  </topicref>
 </map>
diff --git a/topics/web-based-resources.dita b/topics/web-based-resources.dita
index 704d80b8f..0b8ad219a 100644
--- a/topics/web-based-resources.dita
+++ b/topics/web-based-resources.dita
@@ -10,10 +10,9 @@
       <dl>
         <dlentry>
           <dt>
-            <xref href="https://www.dita-ot.org" format="html" scope="external">DITA-OT project website:
-              dita-ot.org</xref></dt>
-          <dd>The DITA-OT project website at dita-ot.org provides information about the latest toolkit releases,
-            including download links, release notes, and documentation for recent DITA-OT versions.
+            <xref href="https://www.dita-ot.org" format="html" scope="external">dita-ot.org</xref></dt>
+          <dd>The DITA-OT project website provides information about the latest toolkit releases, including download
+            links, release notes, and documentation for recent DITA-OT versions.
             <indexterm>dita-ot.org</indexterm>
             <indexterm>project website
               <index-see>dita-ot.org</index-see></indexterm></dd>
@@ -44,22 +43,15 @@
         <dlentry>
           <dt>
             <xref format="html" href="https://groups.google.com/d/forum/dita-ot-users" scope="external">DITA-OT Users
-              group</xref>
+              group archive</xref>
           </dt>
-          <dd>General interest DITA-OT mailing list, for questions on any aspect of the toolkit — from installation and
-            getting started to specific overrides, plug-ins, and customizations.
+          <dd>From 2013 to 2024, the DITA-OT Users group served as a general interest DITA-OT mailing list, for
+            questions ranging from installation and getting started to specific overrides, plug-ins, and
+            customizations. <i>(Archived in favor of the DITA-OT Discussions forum.)</i>
             <indexterm>DITA-OT Users group</indexterm>
             <indexterm>Google Group
               <index-see>DITA-OT Users group</index-see></indexterm></dd>
         </dlentry>
-        <dlentry>
-          <dt>
-            <xref href="http://www.oasis-open.org/committees/dita/" format="html" scope="external">Home page for the
-              DITA Technical Committee</xref></dt>
-          <dd>The OASIS DITA Technical Committee develops the DITA standard.
-            <indexterm>OASIS</indexterm>
-            <indexterm>DITA Technical Committee</indexterm></dd>
-        </dlentry>
         <dlentry>
           <dt>
             <xref href="http://dita-archive.xml.org/wiki/the-dita-open-toolkit" format="html" scope="external">DITA-OT
@@ -67,6 +59,17 @@
           <dd>The DITA-OT project archive at dita-archive.xml.org provides news about earlier toolkit releases, and
             release notes for legacy versions.</dd>
         </dlentry>
+        <dlentry>
+          <dt>
+            <xref
+              href="http://www.oasis-open.org/committees/dita/"
+              format="html"
+              scope="external"
+            >DITA Technical Committee</xref></dt>
+          <dd>The OASIS DITA Technical Committee develops the DITA standard.
+            <indexterm>OASIS</indexterm>
+            <indexterm>DITA Technical Committee</indexterm></dd>
+        </dlentry>
       </dl>
     </section>
   </refbody>