From f734a5773838a0838e0b4bcec75436ae3c817f6f Mon Sep 17 00:00:00 2001
From: Li-aung 'Lewis' Yip <liaung@gmail.com>
Date: Sun, 26 Jul 2015 18:15:01 +0800
Subject: [PATCH 1/2] Update documentation for UDAM tag, following code change
 CODE-2866.

---
 .../globalfilestagpages/globalfilesother.html | 71 +++++++++++++------
 1 file changed, 51 insertions(+), 20 deletions(-)

diff --git a/docs/listfilepages/globalfilestagpages/globalfilesother.html b/docs/listfilepages/globalfilestagpages/globalfilesother.html
index c97a9b2aef1..edbe44e361e 100644
--- a/docs/listfilepages/globalfilestagpages/globalfilesother.html
+++ b/docs/listfilepages/globalfilestagpages/globalfilesother.html
@@ -1733,27 +1733,58 @@ <h4>Remarks</h4>
 <p class="indent2"><code>TEMPLATE:Lycanthrope.REMOVE</code></p>
 <p class="indent3">Removes the "Lycanthrope" template..</p>
 <hr />
-<p class="indent0"><strong><a name="UDAM" id="UDAM">Tag
-Name:</a></strong> UDAM:x,x,x,x,x,x,x,x,x</p>
-<p class="indent1"><strong>Variables Used (x):</strong> Text
-(Damage)</p>
-<p class="indent1"><strong>What it does:</strong></p>
-<ul class="indent2">
-<li>This tag indicates the unarmed damage the character does by
-size category.</li>
-<li>If nine (9) fields are included, they will represent the damage
-done for each size, from left to right, "Fine" to "Colossal".</li>
-<li>If only one (1) field is included, it will represent the damage
-done irrespective of the creature's size.</li>
+<h3 id="UDAM">UDAM</h3>
+<p>Sets the the character&#39;s unarmed damage.</p>
+<h4>Status:</h4>
+<ul class="incremental">
+<li>6.05.04 - JIRA issue 
+<a href="http://jira.pcgen.org/browse/CODE-2866">CODE-2866</a> / Github 
+<a href="https://github.com/PCGen/pcgen/pull/385">PR #385</a>
+<ul class="incremental">
+<li>The &#39;damage by size category&#39; syntax, with multiple arguments, now
+takes as many arguments as there are size categories in the 
+<code>sizeAdjustment.lst</code>. 
+<em>Typically</em> this is nine arguments. (Formerly took 
+<em>exactly</em> nine arguments, ignoring 
+<code>sizeAdjustment.lst</code>.)</li>
+</ul></li>
 </ul>
-<p class="indent1"><strong>Example:</strong></p>
-<p class="indent2">
-<code>UDAM:1,1d2,1d3,1d4,1d6,1d8,1d10,1d12,2d8</code></p>
-<p class="indent3">This sets unarmed damage done to "1" for size
-"Fine" to "2d8" for size "Colossal".</p>
-<p class="indent2"><code>UDAM:2d8</code></p>
-<p class="indent3">This sets unarmed damage done to "2d8"
-irrespective of size.</p>
+<h4>Syntax</h4>
+<ul class="incremental">
+<li>
+<code>UDAM:XdY</code>
+<ul class="incremental">
+<li>Sets the character&#39;s unarmed attack damage to 
+<code>XdY</code> regardless of the character&#39;s current size.</li>
+</ul>
+</li>
+<li>
+<code>UDAM:XdY,XdY, ... ,XdY</code>
+<ul class="incremental">
+<li>Sets the character&#39;s unarmed attack damage by size.</li>
+<li>The arguments 
+<code>XdY</code> are in ascending order of size.</li>
+<li>The number of arguments 
+<code>XdY</code> must match the number of sizes listed in the game mode&#39;s 
+<code>sizeAdjustment.lst</code>.</li>
+<li>For the 
+<code>35e</code> game mode, there are nine sizes - 
+<em>fine, diminutive, tiny, small, medium, large, huge, gargantuan, colossal,
+colossal+</em>.</li>
+</ul>
+</li>
+</ul>
+<h4>Examples</h4>
+<ol class="incremental">
+<li>
+<code>UDAM:1d3</code> - sets un-armed damage to be 
+<code>1d3</code>, no matter what size the creature is.</li>
+<li>
+<code>UDAM:1,1d2,1d3,1d4,1d6,1d8,1d10,1d12,2d8</code> - sets a damage
+progression for nine creature sizes, increasing from 
+<code>1</code> point at the smallest size, to 
+<code>2d8</code> at the largest size.</li>
+</ol>
 <hr />
 <p class="indent0"><strong><a name="UMULT" id="UMULT">Tag
 Name:</a></strong> UMULT</p>

From 774098143660180fdd324560505e9dd5eade7d25 Mon Sep 17 00:00:00 2001
From: Li-aung 'Lewis' Yip <liaung@gmail.com>
Date: Sun, 26 Jul 2015 22:46:57 +0800
Subject: [PATCH 2/2] Deprecate FEAT tags and friends

---
 .../datafilestagpages/datafilesdomains.html   | 24 +++++--
 .../datafilestagpages/datafilesfeats.html     | 37 ++++++++--
 .../datafilestagpages/datafilespcc.html       | 22 +++++-
 .../datafilestagpages/datafilesraces.html     | 23 ++++++-
 .../datafilesstartingkits.html                | 18 +++--
 .../datafilestagpages/datafilestemplates.html | 23 ++++++-
 .../globalfilestagpages/globalfilesbonus.html | 22 +++++-
 .../globalfilestagpages/globalfilesother.html | 67 +++++++++++++++++--
 .../globalfilesprexxx.html                    | 23 ++++++-
 docs/pcgen.css                                | 23 +++++++
 10 files changed, 255 insertions(+), 27 deletions(-)

diff --git a/docs/listfilepages/datafilestagpages/datafilesdomains.html b/docs/listfilepages/datafilestagpages/datafilesdomains.html
index f468a9c089a..34450a4a3c2 100644
--- a/docs/listfilepages/datafilestagpages/datafilesdomains.html
+++ b/docs/listfilepages/datafilestagpages/datafilesdomains.html
@@ -51,6 +51,25 @@ <h2><a name="tagdictionary" id="tagdictionary">Domain File Tag
 Dictionary</a></h2>
 <hr />
 <p class="lststatus"><a name="FEAT" id="FEAT">*** Updated
+<ul class="incremental">
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a>
+<ul class="incremental">
+<li>The <code>FEAT</code> tag is deprecated. Use <a href=
+"../globalfilestagpages/globalfilesother.html#ABILITY"><code>ABILITY</code></a>
+instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lststatus"><a id="FEAT" name="FEAT">*** Updated
 5.17.4</a></p>
 <p class="indent0"><strong>Tag Name:</strong> FEAT:x,x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Text (Feat
@@ -97,9 +116,6 @@ <h2><a name="tagdictionary" id="tagdictionary">Domain File Tag
 FEAT:Alertness,Blind Fight</code>.</p>
 <p class="indent3">The "Alertness" &amp; "Blind-Fight" bonus feats
 are granted to clerics with this domain.</p>
-<hr />
-<p><a href="http://validator.w3.org/check?uri=referer"><img src=
-"../../images/system/valid-html401.png" alt=
-"Valid HTML 4.01 Strict" height="31" width="88" /></a></p>
+</div>
 </body>
 </html>
diff --git a/docs/listfilepages/datafilestagpages/datafilesfeats.html b/docs/listfilepages/datafilestagpages/datafilesfeats.html
index 6e1034ed31e..89828b94b75 100644
--- a/docs/listfilepages/datafilestagpages/datafilesfeats.html
+++ b/docs/listfilepages/datafilestagpages/datafilesfeats.html
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -27,6 +28,37 @@
 </head>
 <body>
 <h1>Feat Files</h1>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li>The feat files described below is deprecated. <a href=
+"file:///C:/Users/lws/gits/pcgen/docs/listfilepages/datafilestagpages/datafilesability.html">
+Use the Ability system instead</a>.</li>
+<li>To implement a feat, write an <a href=
+"file:///C:/Users/lws/gits/pcgen/docs/listfilepages/datafilestagpages/datafilesability.html">
+ability</a> belonging to the <code>FEAT</code> <a href=
+"file:///C:/Users/lws/gits/pcgen/docs/listfilepages/datafilestagpages/datafilesabilitycategory.html">
+ability category</a>, i.e. <code>CATEGORY:FEAT</code>.</li>
+<li>The feats may still be contained in a file called
+<code>feats.lst</code> (see
+<code>/data/35e/wizards_of_the_coast/rsrd/basics/feats.lst</code>
+for an example.) However this file must use the <a href=
+"file:///C:/Users/lws/gits/pcgen/docs/listfilepages/datafilestagpages/datafilesability.html">
+<code>ability.lst</code> format</a>, not the obsolete format
+described below.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
 <p>Each feat takes one line and the first field must be the feat's
 name.</p>
 <hr />
@@ -504,9 +536,6 @@ <h2><a name="TagList" id="TagList">Feat Tag List</a></h2>
 &lt;tab&gt; VISIBLE:DISPLAY</code></p>
 <p class="indent3">Modified feat will appear in the GUI but will
 not appear on the output sheet.</p>
-<hr />
-<p><a href="http://validator.w3.org/check?uri=referer"><img src=
-"../../images/system/valid-html401.png" alt=
-"Valid HTML 4.01 Strict" height="31" width="88" /></a></p>
+</div>
 </body>
 </html>
diff --git a/docs/listfilepages/datafilestagpages/datafilespcc.html b/docs/listfilepages/datafilestagpages/datafilespcc.html
index b410ea4556e..50fe2105c23 100644
--- a/docs/listfilepages/datafilestagpages/datafilespcc.html
+++ b/docs/listfilepages/datafilestagpages/datafilespcc.html
@@ -871,8 +871,25 @@ <h4>Prerequisites on Main Body Tags</h4>
 <p class="indent1"><strong>Example:</strong></p>
 <p class="indent2"><code>EQUIPMOD:fooequipmods.lst</code></p>
 <hr />
-<p class="indent0"><strong><a name="FEAT" id="FEAT">Tag
-Name:</a></strong> FEAT:x</p>
+<h3 id="FEAT">FEAT</h3>
+<ul class="incremental">
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a>
+<ul class="incremental">
+<li>The <code>FEAT</code> file is deprecated. Use <a href=
+"#ABILITYPCC"><code>ABILITY</code></a> instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="indent0"><strong>Tag Name:</strong> FEAT:x</p>
 <p class="indent1"><strong>Variables Used (x):</strong>Text (File
 path)</p>
 <p class="indent1"><strong>What it does:</strong></p>
@@ -880,6 +897,7 @@ <h4>Prerequisites on Main Body Tags</h4>
 specified.</p>
 <p class="indent1"><strong>Example:</strong></p>
 <p class="indent2"><code>FEAT:foofeats.lst</code></p>
+</div>
 <hr />
 <p class="indent0"><strong><a name="KIT" id="KIT">Tag
 Name:</a></strong> KIT:x</p>
diff --git a/docs/listfilepages/datafilestagpages/datafilesraces.html b/docs/listfilepages/datafilestagpages/datafilesraces.html
index 14fb1be8171..c3eeaba1875 100644
--- a/docs/listfilepages/datafilestagpages/datafilesraces.html
+++ b/docs/listfilepages/datafilestagpages/datafilesraces.html
@@ -220,8 +220,26 @@ <h2>Race File Tag Dictionary</h2>
 <p class="indent3">Race may select the "Wizard" base class or any
 of its sub-classes as the favored class.</p>
 <hr />
-<p class="lststatus"><a name="FEAT" id="FEAT">*** Updated
-5.17.4</a></p>
+<h3 id="FEAT">FEAT</h3>
+<ul class="incremental">
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a>
+<ul class="incremental">
+<li>The <code>FEAT</code> tag is deprecated. Use <a href=
+"../globalfilestagpages/globalfilesother.html#ABILITY"><code>ABILITY</code></a>
+instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lststatus">*** Updated 5.17.4</p>
 <p class="indent0"><strong>Tag Name:</strong> FEAT:x|x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Text (Feat
 name)</p>
@@ -266,6 +284,7 @@ <h2>Race File Tag Dictionary</h2>
 FEAT:Blind Fight|Combat Reflexes</code></p>
 <p class="indent3">Race gets the "Blind-Fight" and "Combat
 Reflexes" feats as bonus feats.</p>
+</div>
 <hr />
 <p class="indent0"><strong><a name="HANDS" id="HANDS">Tag
 Name:</a></strong> HANDS:x</p>
diff --git a/docs/listfilepages/datafilestagpages/datafilesstartingkits.html b/docs/listfilepages/datafilestagpages/datafilesstartingkits.html
index 9e11c0e26df..76948230652 100644
--- a/docs/listfilepages/datafilestagpages/datafilesstartingkits.html
+++ b/docs/listfilepages/datafilestagpages/datafilesstartingkits.html
@@ -280,8 +280,19 @@ <h3><a name="LINEHDRTAGS">Line Header Tags</a></h3>
 		<p></p>
 
 <hr>
-
-		<p class="lststatus"><a name="FEAT">*** Updated 5.9.7</a></p>
+    <h3 id="FEAT">FEAT</h3>
+    <ul>
+      <li>6.05.04 (July 2015): JIRA <a href="http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a>
+        / Github <a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+      <ul class="incremental">
+        <li>The <code>FEAT</code> tag is deprecated. Use <a href="#CATEGORY"><code>ABILITY</code></a> instead.</li>
+        <li>All <code>FEAT</code> tags have been <strong>deprecated</strong>
+          and replaced by the <code>ABILITY</code> system, which is more
+          general. The <code>ABILITY</code> system can model feats, racial
+          features, class features, traits, flaws, temporary bonuses, and so on,
+          all using a common format.</li>
+      </ul></ul>
+      <div class="deprecated">** Updated 5.9.7
 		<p class="indent0"><strong>Tag Name:</strong> FEAT:x|x</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> Text (Feat name)</p>
 		<p class="indent1"><strong>Variables Used (x):</strong> TYPE=Text (Feat TYPE)</p>
@@ -300,8 +311,7 @@ <h3><a name="LINEHDRTAGS">Line Header Tags</a></h3>
 		<p class="indent3">Would grant the choice of Dodge or Improved Initiative.</p>
 		<p class="indent2"><code>FEAT:TYPE=ItemCreation</code></p>
 		<p class="indent3">Would grant the choice of an ItemCreation type feat.</p>
-		<p></p>
-
+      </div>
 <hr>
 
 		<p class="lststatus"><a name="FUNDS">*** New 5.8</a></p>
diff --git a/docs/listfilepages/datafilestagpages/datafilestemplates.html b/docs/listfilepages/datafilestagpages/datafilestemplates.html
index 659075c8130..4e80c57fb4e 100644
--- a/docs/listfilepages/datafilestagpages/datafilestemplates.html
+++ b/docs/listfilepages/datafilestagpages/datafilestemplates.html
@@ -263,8 +263,26 @@ <h2>Template File Tag Dictionary</h2>
 <p class="indent3">Darkling's "favored class" is the "Sorcerer" and
 the "Wizard" sub-class, the "Necromancer".</p>
 <hr />
-<p class="indent0"><strong><a name="FEAT" id="FEAT">Tag
-Name:</a></strong> FEAT:x|x</p>
+<h3 id="FEAT">FEAT</h3>
+<ul class="incremental">
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a>
+<ul class="incremental">
+<li>The <code>FEAT</code> tag is deprecated. Use <a href=
+"../globalfilestagpages/globalfilesother.html#ABILITY"><code>ABILITY</code></a>
+instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="indent0"><strong>Tag Name:</strong> FEAT:x|x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Text (Feat
 Name)</p>
 <p class="indent1"><strong>What it does:</strong></p>
@@ -293,6 +311,7 @@ <h2>Template File Tag Dictionary</h2>
 <p class="indent3">Presents the "Blind-Fight" and "Combat Reflexes"
 feats to the user and grants the feat selected to the
 character.</p>
+</div>
 <hr />
 <p class="lststatus"><a name="GENDERLOCK" id="GENDERLOCK">***
 Updated 5.11.13</a></p>
diff --git a/docs/listfilepages/globalfilestagpages/globalfilesbonus.html b/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
index 1e9283c0573..53f56e02140 100644
--- a/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
+++ b/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
@@ -830,7 +830,26 @@ <h2><a name="TAGLIST" id="TAGLIST">BONUS Tag List</a></h2>
 <p class="indent3">Character gains access to three additional
 Domains.</p>
 <hr />
-<p class="lststatus"><a name="FEATPOOL" id="FEATPOOL">*** New
+<h3 id="FEATPOOL">FEATPOOL</h3>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li>The <code>FEATPOOL</code> tag is deprecated. Use <a href=
+"#ABILITYPOOL"><code>ABILITYPOOL</code></a> instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lststatus"><a id="FEATPOOL" name="FEATPOOL">*** New
 5.7.6</a></p>
 <p class="indent0"><strong>Tag Name:</strong> BONUS:FEAT|POOL|x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Number,
@@ -850,6 +869,7 @@ <h2><a name="TAGLIST" id="TAGLIST">BONUS Tag List</a></h2>
 <code>BONUS:FEAT|POOL|-1|PREFEAT:1,Alertness</code></p>
 <p class="indent3">Decreases the feat pool by one if the character
 has the feat Alertness.</p>
+</div>
 <hr />
 <p class="lststatus"><a name="FOLLOWERS" id="FOLLOWERS">*** New
 5.10.1+</a></p>
diff --git a/docs/listfilepages/globalfilestagpages/globalfilesother.html b/docs/listfilepages/globalfilestagpages/globalfilesother.html
index edbe44e361e..701a73f37ff 100644
--- a/docs/listfilepages/globalfilestagpages/globalfilesother.html
+++ b/docs/listfilepages/globalfilestagpages/globalfilesother.html
@@ -213,8 +213,26 @@ <h2>Miscellaneous Tags</h2>
 equipment item if the character has a level of Monk and a DEX score
 of 15 or better.</p>
 <hr />
-<p class="lstupnew"><a name="AUTOFEAT" id="AUTOFEAT">*** Updated
-5.17.4</a></p>
+<h3 id="AUTOFEAT">AUTO:FEAT</h3>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li><code>AUTO:FEAT</code> is deprecated. Use <a href=
+"#ABILITY"><code>ABILITY:FEAT|AUTOMATIC|</code></a> instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lstupnew">*** Updated 5.17.4</p>
 <p class="indent0"><strong>Tag Name:</strong> AUTO:FEAT|x|x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Text (Feat
 name)</p>
@@ -258,6 +276,7 @@ <h2>Miscellaneous Tags</h2>
 AUTO:FEAT|Alertness</code></p>
 <p class="indent3">The feat "Dodge" is cleared and the feat
 "Alertness" is granted as an automatic feat.</p>
+</div>
 <hr />
 <p class="lstnew"><a name="AUTOLANG" id="AUTOLANG">*** New
 5.17.14</a></p>
@@ -1113,8 +1132,24 @@ <h2>Miscellaneous Tags</h2>
 <p class="indent2"><code>REGION:1|Timbuktu</code></p>
 <p class="indent3">The PC is from the "Timbuktu" region.</p>
 <hr />
-<p class="lststatus"><a name="REMOVE" id="REMOVE">*** New
-5.11.13</a></p>
+<h3 id="REMOVE">REMOVE:FEAT</h3>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lststatus">*** New 5.11.13</p>
 <p class="indent0"><strong>Tag Name:</strong> REMOVE:FEAT|x|y,y</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Number
 (Number of feats, Optional)</p>
@@ -1153,6 +1188,7 @@ <h2>Miscellaneous Tags</h2>
 by the Paladin Class.</p>
 <p class="indent1"><strong>Where it can be used:</strong></p>
 <p class="indent2">Works in Ability, Class and Template files.</p>
+</div>
 <hr />
 <h3>SAB - 'special ability'</h3>
 <p><em>Displays a text string in the 'special abilities' section of
@@ -1832,8 +1868,26 @@ <h4>Examples</h4>
 Dwarves ignore encumbrance penalties to movement for heavy armor
 and heavy loads.</p>
 <hr />
-<p class="lststatus"><a name="VFEAT" id="VFEAT">*** Updated
-5.17.4</a></p>
+<h3 id="VFEAT">VFEAT</h3>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li><code>VFEAT</code> is deprecated. Use <a href=
+"#ABILITY"><code>ABILITY:FEAT|VIRTUAL|</code></a> instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="lststatus">*** Updated 5.17.4</p>
 <p class="indent0"><strong>Tag Name:</strong> VFEAT:x|x</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Text (Name
 of feat)</p>
@@ -1891,6 +1945,7 @@ <h4>Examples</h4>
 <p class="indent3">The character gains "Banana Barrage" as a
 virtual feat only if they have at least one level of "Ninja
 Monkey".</p>
+</div>
 <hr />
 <p class="indent0"><strong><a name="VISION" id="VISION">Tag
 Name:</a></strong> VISION:x (y)|x (y)</p>
diff --git a/docs/listfilepages/globalfilestagpages/globalfilesprexxx.html b/docs/listfilepages/globalfilestagpages/globalfilesprexxx.html
index 67bb5792093..e3185b3f989 100644
--- a/docs/listfilepages/globalfilestagpages/globalfilesprexxx.html
+++ b/docs/listfilepages/globalfilestagpages/globalfilesprexxx.html
@@ -1021,8 +1021,26 @@ <h4 id="examples">Examples</h4>
 <p class="indent3">Must have a light weapon equipped for two weapon
 fighting.</p>
 <hr />
-<p class="indent0"><strong><a name="PREFEAT" id="PREFEAT">Tag
-Name:</a></strong> PREFEAT:x,y,z</p>
+<h3 id="PREFEAT">PREFEAT</h3>
+<ul>
+<li>6.05.04 (July 2015): JIRA <a href=
+"http://jira.pcgen.org/browse/NEWTAG-477">NEWTAG-477</a> / Github
+<a href="https://github.com/PCGen/pcgen/pull/380">PR #380</a></li>
+<li style="list-style: none; display: inline">
+<ul class="incremental">
+<li><code>PREFEAT</code> is deprecated. Use <a href=
+"#PREABILITY"><code>PREABILITY</code></a> instead.</li>
+<li>All <code>FEAT</code> tags have been
+<strong>deprecated</strong> and replaced by the
+<code>ABILITY</code> system, which is more general. The
+<code>ABILITY</code> system can model feats, racial features, class
+features, traits, flaws, temporary bonuses, and so on, all using a
+common format.</li>
+</ul>
+</li>
+</ul>
+<div class="deprecated">
+<p class="indent0"><strong>Tag Name:</strong> PREFEAT:x,y,z</p>
 <p class="indent1"><strong>Variables Used (x):</strong> Number
 (Number of required feats)</p>
 <p class="indent1"><strong>Variables Used (y):</strong> CHECKMULT
@@ -1082,6 +1100,7 @@ <h4 id="examples">Examples</h4>
 !PREFEAT:1,Untapped Potential</code></p>
 <p class="indent3">Character must not (!) have one feat called
 "Untapped Potential".</p>
+</div>
 <hr />
 <p class="indent0"><strong><a name="PREGENDER" id="PREGENDER">Tag
 Name:</a></strong> PREGENDER:x</p>
diff --git a/docs/pcgen.css b/docs/pcgen.css
index c494599efa8..e3e5fd85390 100644
--- a/docs/pcgen.css
+++ b/docs/pcgen.css
@@ -324,3 +324,26 @@ div.figure p{
 	font-style: italic;
 	text-align: center;
 }
+
+div.deprecated {
+	color: gray;
+	border: 1px solid silver;
+	border-radius: 0.5em;
+	background-color: #eee;
+	margin: 1em;
+	padding: 1em;
+}
+
+div.deprecated::before{
+	content:"Deprecated";
+	font-weight: bold;
+	font-size: 1.2em;
+	color: red;
+}
+
+div.deprecated::after{
+	content:"Deprecated";
+	font-weight: bold;
+	font-size: 1.2em;
+	color: red;
+}
\ No newline at end of file