From 508d532f28ffe84c333cd7b6c2bb13565bd096e5 Mon Sep 17 00:00:00 2001
From: Frank Becker <Frank@Frank-Becker.de>
Date: Sun, 27 May 2012 20:34:12 +0200
Subject: Bug 690873: config.cgi should include keyword descriptions
 r/a=LpSolit

---
 config.cgi                          |  2 +-
 template/en/default/config.rdf.tmpl | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/config.cgi b/config.cgi
index 891a2f8a3..bb6a47349 100755
--- a/config.cgi
+++ b/config.cgi
@@ -44,7 +44,7 @@ $vars->{'priority'}  = get_legal_field_values('priority');
 $vars->{'severity'}  = get_legal_field_values('bug_severity');
 $vars->{'platform'}  = get_legal_field_values('rep_platform');
 $vars->{'op_sys'}    = get_legal_field_values('op_sys');
-$vars->{'keyword'}    = [map($_->name, Bugzilla::Keyword->get_all)];
+$vars->{'keywords'}  = [Bugzilla::Keyword->get_all];
 $vars->{'resolution'} = get_legal_field_values('resolution');
 $vars->{'status'}    = get_legal_field_values('bug_status');
 $vars->{'custom_fields'} =
diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index c6ecac7ce..afc511054 100644
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -54,13 +54,18 @@
     </Seq>
   </bz:resolution>
 
-  <bz:keyword>
+  <bz:keywords>
     <Seq>
-      [% FOREACH item = keyword %]
-        <li>[% item FILTER html %]</li>
+      [% FOREACH keyword = keywords %]
+        <li>
+          <bz:keyword rdf:about="[% escaped_urlbase %]keyword.cgi?name=[% keyword.name FILTER uri %]">
+            <bz:name>[% keyword.name FILTER html %]</bz:name>
+            <bz:description>[% keyword.description FILTER html %]</bz:description>
+          </bz:keyword>
+        </li>
       [% END %]
     </Seq>
-  </bz:keyword>
+  </bz:keywords>
 
   <bz:platform>
     <Seq>
-- 
cgit v1.2.1