Bug 690873: config.cgi should include keyword descriptions

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'} =

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>