From 61fe97b646b048299f17d11351cb0cf45a9cae19 Mon Sep 17 00:00:00 2001
From: James Lu <james@overdrivenetworks.com>
Date: Thu, 5 Oct 2017 19:28:31 -0700
Subject: [PATCH] docs/modelists: drop :data suffix from extbans lists

[skip ci]
---
 docs/modelists/extbans.html         | 68 ++++++++++++++---------------
 docs/modelists/modelists-genhtml.py |  5 ---
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/docs/modelists/extbans.html b/docs/modelists/extbans.html
index 5fa4c71..cb48d1d 100644
--- a/docs/modelists/extbans.html
+++ b/docs/modelists/extbans.html
@@ -80,106 +80,106 @@ td:first-child, th[scope="row"] {
 </tr>
 <tr>
 <th scope="row">ban_account</th>
-<td class="tablecell-yes">$a:<span class="note">data</span></td><td class="tablecell-yes">R:<span class="note">data</span></td><td class="tablecell-yes">~a:<span class="note">data</span></td><td class="tablecell-yes">~a:<span class="note">data</span></td></tr>
+<td class="tablecell-yes">$a:</td><td class="tablecell-yes">R:</td><td class="tablecell-yes">~a:</td><td class="tablecell-yes">~a:</td></tr>
 <tr>
 <th scope="row">ban_account_legacy</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~R:<span class="note">data</span></td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~R:</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_all_opers</th>
-<td class="tablecell-yes2">$o</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$o</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_all_registered</th>
-<td class="tablecell-yes2">$a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_all_ssl</th>
-<td class="tablecell-yes2">$z</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$z</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_banshare</th>
-<td class="tablecell-yes">$j:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~j:<span class="note">data</span></td></tr>
+<td class="tablecell-yes">$j:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~j:</td></tr>
 <tr>
 <th scope="row">ban_blockcaps</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">B:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">B:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_blockcolor</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">c:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">c:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_certfp</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">z:<span class="note">data</span></td><td class="tablecell-yes">~S:<span class="note">data</span></td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">z:</td><td class="tablecell-yes">~S:</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_extgecos</th>
-<td class="tablecell-yes">$x:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$x:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_inchannel</th>
-<td class="tablecell-yes">$c:<span class="note">data</span></td><td class="tablecell-yes">j:<span class="note">data</span></td><td class="tablecell-yes">~c:<span class="note">data</span></td><td class="tablecell-yes">~c:<span class="note">data</span></td></tr>
+<td class="tablecell-yes">$c:</td><td class="tablecell-yes">j:</td><td class="tablecell-yes">~c:</td><td class="tablecell-yes">~c:</td></tr>
 <tr>
 <th scope="row">ban_invites</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">A:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">A:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_mark</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~m:<span class="note">data</span></td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~m:</td></tr>
 <tr>
 <th scope="row">ban_noctcp</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">C:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">C:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_nojoins</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~j:<span class="note">data</span></td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~j:</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_nokicks</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">Q:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">Q:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_nonick</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">N:<span class="note">data</span></td><td class="tablecell-yes">~n:<span class="note">data</span></td><td class="tablecell-yes">~n:<span class="note">data</span></td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">N:</td><td class="tablecell-yes">~n:</td><td class="tablecell-yes">~n:</td></tr>
 <tr>
 <th scope="row">ban_nonotice</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">T:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">T:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_account</th>
-<td class="tablecell-yes">$~a:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~a:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_banshare</th>
-<td class="tablecell-yes">$~j:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~j:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_extgecos</th>
-<td class="tablecell-yes">$~x:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~x:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_inchannel</th>
-<td class="tablecell-yes">$~c:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~c:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_opers</th>
-<td class="tablecell-yes2">$~o</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~o</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_realname</th>
-<td class="tablecell-yes">$~r:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~r:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_server</th>
-<td class="tablecell-yes">$~s:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~s:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_not_ssl</th>
-<td class="tablecell-yes2">$~z</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$~z</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_opertype</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">O:<span class="note">data</span></td><td class="tablecell-yes">~O:<span class="note">data</span></td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">O:</td><td class="tablecell-yes">~O:</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_partmsgs</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">p:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">p:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_realname</th>
-<td class="tablecell-yes">$r:<span class="note">data</span></td><td class="tablecell-yes">r:<span class="note">data</span></td><td class="tablecell-yes">~r:<span class="note">data</span></td><td class="tablecell-yes">~r:<span class="note">data</span></td></tr>
+<td class="tablecell-yes">$r:</td><td class="tablecell-yes">r:</td><td class="tablecell-yes">~r:</td><td class="tablecell-yes">~r:</td></tr>
 <tr>
 <th scope="row">ban_server</th>
-<td class="tablecell-yes">$s:<span class="note">data</span></td><td class="tablecell-yes">s:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-yes">$s:</td><td class="tablecell-yes">s:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_stripcolor</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">S:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">S:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">ban_unregistered_mark</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~M:<span class="note">data</span></td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td><td class="tablecell-yes">~M:</td></tr>
 <tr>
 <th scope="row">ban_unregistered_matching</th>
-<td class="tablecell-na note">n/a</td><td class="tablecell-yes">U:<span class="note">data</span></td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
+<td class="tablecell-na note">n/a</td><td class="tablecell-yes">U:</td><td class="tablecell-na note">n/a</td><td class="tablecell-na note">n/a</td></tr>
 <tr>
 <th scope="row">quiet</th>
-<td class="tablecell-special">+q<br><span class="note">(cmode)</span></td><td class="tablecell-yes">m:<span class="note">data</span></td><td class="tablecell-yes">~q:<span class="note">data</span></td><td class="tablecell-yes">~q:<span class="note">data</span></td></tr>
+<td class="tablecell-special">+q<br><span class="note">(cmode)</span></td><td class="tablecell-yes">m:</td><td class="tablecell-yes">~q:</td><td class="tablecell-yes">~q:</td></tr>
 
 
 </table>
diff --git a/docs/modelists/modelists-genhtml.py b/docs/modelists/modelists-genhtml.py
index 835a2e8..57b9be2 100755
--- a/docs/modelists/modelists-genhtml.py
+++ b/docs/modelists/modelists-genhtml.py
@@ -29,11 +29,6 @@ def _format(articlename, text):
         except ValueError:
             if text.endswith('*'):
                 text = '<td class="tablecell-yes2">%s</td>' % text
-            elif 'extbans' in articlename:
-                if text.endswith(':'):
-                    text = '<td class="tablecell-yes">%s<span class="note">data</span></td>' % text
-                else:  # Arg-less extban
-                    text = '<td class="tablecell-yes2">%s</td>' % text
             else:
                 text = '<td class="tablecell-yes">%s</td>' % text
         else: