Skip to content

Commit

Permalink
Merge branch 'issue/213' into hotfix/3.1.1
Browse files Browse the repository at this point in the history
* issue/213:
  Clarify project archive for legacy versions
  Revise link text to reduce redundancy
  Demote link to project archive
  Update link to project archive
  • Loading branch information
infotexture committed Jul 5, 2018
2 parents a4f65d0 + f15e66d commit d172487
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 23 deletions.
23 changes: 11 additions & 12 deletions topics/dita-resources.ditamap
Expand Up @@ -7,18 +7,11 @@

<topicref format="html" href="https://www.dita-ot.org" scope="external">
<topicmeta>
<linktext>DITA-OT project website at dita-ot.org</linktext>
<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>
</topicmeta>
</topicref>
<topicref format="html" href="http://dita.xml.org/wiki/the-dita-open-toolkit" scope="external">
<topicmeta>
<linktext>DITA-OT project archive at dita.xml.org</linktext>
<shortdesc>The DITA-OT project archive at dita.xml.org provides news about earlier toolkit releases, and release
notes for all past releases.</shortdesc>
</topicmeta>
</topicref>
<topicref format="html" href="http://groups.yahoo.com/group/dita-users/" scope="external">
<topicmeta>
<linktext>Yahoo! dita-users group</linktext>
Expand All @@ -30,7 +23,7 @@
<topicref format="html" href="https://groups.google.com/d/forum/dita-ot-users" scope="external">
<topicmeta>
<linktext>DITA-OT Users Google Group</linktext>
<shortdesc>General interest DITA-OT product forum, for questions on any aspect of the toolkit - from installation
<shortdesc>General interest DITA-OT product forum, for questions on any aspect of the toolkit — from installation
and getting started to questions about specific overrides, plug-ins, and customizations.</shortdesc>
</topicmeta>
</topicref>
Expand All @@ -39,14 +32,20 @@
<linktext>DITA-OT Development Slack team</linktext>
<shortdesc>Forum for discussion related to DITA-OT development and design. Topics in this forum are more technical
in nature, covering upcoming design or code changes. To request an invitation and join in the discussion, visit
<xref href="http://slack.dita-ot.org" format="html" scope="external">slack.dita-ot.org</xref>.</shortdesc>
<xref href="http://slack.dita-ot.org" format="html" scope="external">slack.dita-ot.org</xref>.</shortdesc>
</topicmeta>
</topicref>
<topicref format="html" href="http://www.oasis-open.org/committees/dita/" scope="external">
<topicmeta>
<linktext>Home page for the OASIS DITA Technical Committee</linktext>
<linktext>Home page for the DITA Technical Committee</linktext>
<shortdesc>The OASIS DITA Technical Committee develops the DITA standard.</shortdesc>
</topicmeta>
</topicref>

<topicref format="html" href="http://dita-archive.xml.org/wiki/the-dita-open-toolkit" scope="external">
<topicmeta>
<linktext>DITA-OT project archive</linktext>
<shortdesc>The DITA-OT project archive at dita-archive.xml.org provides news about earlier toolkit releases, and
release notes for legacy versions.</shortdesc>
</topicmeta>
</topicref>
</map>
22 changes: 11 additions & 11 deletions topics/web-based-resources.dita
Expand Up @@ -11,18 +11,11 @@
<dl>
<dlentry>
<dt>
<xref href="https://www.dita-ot.org" format="html" scope="external">DITA-OT project website at
<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.</dd>
</dlentry>
<dlentry>
<dt>
<xref href="http://dita.xml.org/wiki/the-dita-open-toolkit" format="html" scope="external">DITA-OT project
archive at dita.xml.org</xref></dt>
<dd>The DITA-OT project archive at dita.xml.org provides news about earlier toolkit releases, and release
notes for all past releases.</dd>
</dlentry>
<dlentry>
<dt>
<xref href="http://groups.yahoo.com/group/dita-users/" format="html" scope="external">Yahoo! dita-users
Expand All @@ -36,7 +29,7 @@
<xref format="html" href="https://groups.google.com/d/forum/dita-ot-users" scope="external">DITA-OT Users
Google Group</xref>
</dt>
<dd>General interest DITA-OT product forum, for questions on any aspect of the toolkit - from installation and
<dd>General interest DITA-OT product forum, for questions on any aspect of the toolkit — from installation and
getting started to questions about specific overrides, plug-ins, and customizations.</dd>
</dlentry>
<dlentry>
Expand All @@ -45,14 +38,21 @@
</dt>
<dd>Forum for discussion related to DITA-OT development and design. Topics in this forum are more technical in
nature, covering upcoming design or code changes. To request an invitation and join in the discussion, visit
<xref href="http://slack.dita-ot.org" format="html" scope="external">slack.dita-ot.org</xref>.</dd>
<xref href="http://slack.dita-ot.org" format="html" scope="external">slack.dita-ot.org</xref>.</dd>
</dlentry>
<dlentry>
<dt>
<xref href="http://www.oasis-open.org/committees/dita/" format="html" scope="external">Home page for the
OASIS DITA Technical Committee</xref></dt>
DITA Technical Committee</xref></dt>
<dd>The OASIS DITA Technical Committee develops the DITA standard.</dd>
</dlentry>
<dlentry>
<dt>
<xref href="http://dita-archive.xml.org/wiki/the-dita-open-toolkit" format="html" scope="external">DITA-OT
project archive</xref></dt>
<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>
</dl>
</section>
</refbody>
Expand Down

0 comments on commit d172487

Please sign in to comment.