Updated categories in article metadata.

commit: f46f44d1f7be8b23d08926a34163d01fe1cc3a99 [log] [tgz]
author: wbeaton <wbeaton> Tue Aug 01 17:46:01 2006 +0000
committer: wbeaton <wbeaton> Tue Aug 01 17:46:01 2006 +0000
tree: e30c57df24fd216db4b1013ba4ee844e3f24e141
parent: 495191e71bf92e2e26f843d17dfb36e8902b9639 [diff]
diff --git a/Article-API use/about.xml b/Article-API use/about.xml
index 0ed4820..20b7c17 100644
--- a/Article-API use/about.xml
+++ b/Article-API use/about.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <article link="eclipse-api-usage-rules.html">
 	<title>How to Use the Eclipse API</title>
+	
+	<category>Plug-ins</category>
+	
 	<update>
 		<date>May 18, 2001</date>
 	</update>
-	<category>general</category>
+	
 	<author>
 		<name><![CDATA[Jim des Rivi&egrave;res]]></name>
 		<company>IBM</company>

diff --git a/Article-Accessibility/about.xml b/Article-Accessibility/about.xml
index 247c2f2..88e475d 100644
--- a/Article-Accessibility/about.xml
+++ b/Article-Accessibility/about.xml

@@ -1,7 +1,10 @@
 <article link="accessibility.html">
 	<title>Designing Accessible Plug-ins in Eclipse</title>
 	<date>May 20, 2003</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
+	<category>Accessibility</category>
+	
 	<author>
 		<name>Tod Creasey</name>
 		<company>IBM</company>

diff --git a/Article-ActiveX Support in SWT/about.xml b/Article-ActiveX Support in SWT/about.xml
index ba9ba86..bc71595 100644
--- a/Article-ActiveX Support in SWT/about.xml
+++ b/Article-ActiveX Support in SWT/about.xml

@@ -2,8 +2,8 @@
 <article link="ActiveX%20Support%20in%20SWT.html">
 	<title>ActiveX Support In SWT</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<category>integration</category>
 	<author>
 		<name>Veronika Irvine</name>

diff --git a/Article-Authoring-With-Eclipse/about.xml b/Article-Authoring-With-Eclipse/about.xml
index 562c0f2..03ee834 100644
--- a/Article-Authoring-With-Eclipse/about.xml
+++ b/Article-Authoring-With-Eclipse/about.xml

@@ -1,7 +1,7 @@
 <article link="AuthoringWithEclipse.html">
 	<title>Authoring with Eclipse</title>
 	<date>December 14, 2005</date>
-	<category>general</category>
+	
 	<author>
 		<name>Chris Aniszczyk</name>
 		<company>IBM</company>

diff --git a/Article-Branding/about.xml b/Article-Branding/about.xml
index d0d9a9d..a29416f 100644
--- a/Article-Branding/about.xml
+++ b/Article-Branding/about.xml

@@ -1,7 +1,7 @@
 <article link="branding-your-application.html">
 	<title>Branding Your Application</title>
 	<date>September 16, 2004</date>
-	<category>rcp</category>
+	<category>RCP</category>
 	<author>
 		<name>Andrew Eidsness</name>
 		<company>IBM</company>

diff --git a/Article-Builders/about.xml b/Article-Builders/about.xml
index ebf2bbc..57c1c06 100644
--- a/Article-Builders/about.xml
+++ b/Article-Builders/about.xml

@@ -1,8 +1,12 @@
 <article link="builders.html">
 	<title>Project Builders and Natures</title>
 	<date>January 27, 2003</date>
-	<category>general</category>
-	<category>workbench</category>
+	
+	<category>Workbench</category>
+	<category>Builders</category>
+	<category>Natures</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>

diff --git a/Article-CVS-branching/about.xml b/Article-CVS-branching/about.xml
index 9e56c6e..2a8ad40 100644
--- a/Article-CVS-branching/about.xml
+++ b/Article-CVS-branching/about.xml

@@ -1,8 +1,8 @@
 <article link="eclipse_branch.html">
 	<title>Branching with Eclipse and CVS</title>
 	<date>July 3, 2003</date>
-	<category>general</category>
-	<category>cvs</category>
+	
+	<category>CVS</category>
 	<author>
 		<name>Paul Glezen</name>
 		<company>IBM</company>

diff --git a/Article-Concurrency/about.xml b/Article-Concurrency/about.xml
index 7add60b..070dac7 100644
--- a/Article-Concurrency/about.xml
+++ b/Article-Concurrency/about.xml

@@ -1,10 +1,11 @@
 <article link="jobs-api.html">
 	<title>On the Job: The Eclipse Jobs API</title>
 	<date>September 20, 2004</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>concurrency</category>
-	<category>resources</category>
+	
+	<category>Platform</category>
+	<category>Jobs</category>
+	<category>Resources</category>
+	
 	<author>
 		<name>Michael Valenta</name>
 		<company>IBM</company>

diff --git a/Article-Debugger/about.xml b/Article-Debugger/about.xml
index c877da1..a75a8f9 100644
--- a/Article-Debugger/about.xml
+++ b/Article-Debugger/about.xml

@@ -1,8 +1,9 @@
 <article link="how-to.html">
 	<title>How to Write an Eclipse Debugger</title>
 	<date>August 27, 2004</date>
-	<category>general</category>
-	<category>cvs</category>
+	
+	<category>CVS</category>
+	<category>Debugging</category>
 	<author>
 		<name>Darin Wright</name>
 		<company>IBM</company>

diff --git a/Article-Decorators/about.xml b/Article-Decorators/about.xml
index 2dff2b2..38cf11a 100644
--- a/Article-Decorators/about.xml
+++ b/Article-Decorators/about.xml

@@ -1,25 +1,26 @@
 <article link="decorators.html">
 	<title>Understanding Decorators in Eclipse</title>
 	<date>January 16, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+
+	<category>Platform</category>
+	<category>Decorators</category>
+	<category>Resources</category>
+	<category>Plug-ins</category>
+
 	<author>
 		<name>Balaji Krish-Sampath</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		<![CDATA[Decorators, as the name suggests, are used for
+		Decorators, as the name suggests, are used for
 		adorning/annotating resources with useful information.
 		Decorators can be used by plug-ins to convey more information
 		about a resource and other objects displayed in different
-		workbench views. This article, with the help of a simple plug-in 
-		example, will illustrate the steps involved in decorating resources, 
-		along with some best practice approaches for decorating resources.
-		Finally, we will discuss performance issues that may arise when
-		enabling decorators, and briefly go over the new lightweight decorators
-		found in Eclipse 2.1.
-		<p>
-			We assume the reader already has a basic understanding of
-			Eclipse and knows how to create simple plug-ins.]]>
+		workbench views. This article, with the help of a simple plug-in
+		example, will illustrate the steps involved in decorating
+		resources, along with some best practice approaches for
+		decorating resources. Finally, we will discuss performance
+		issues that may arise when enabling decorators, and briefly go
+		over the new lightweight decorators found in Eclipse 2.1.
 	</description>
 </article>
\ No newline at end of file

diff --git a/Article-EMF-goes-RCP/about.xml b/Article-EMF-goes-RCP/about.xml
index 6a8840a..9838abe 100644
--- a/Article-EMF-goes-RCP/about.xml
+++ b/Article-EMF-goes-RCP/about.xml

@@ -1,9 +1,9 @@
 <article link="rcp.html">
 	<title>EMF goes RCP</title>
 	<date>October 12, 2004</date>
-	<category>modeling</category>
-	<category>rcp</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>RCP</category>
+	<category>EMF</category>
 	<author>
 		<name>Marcelo Paternostro</name>
 		<company>IBM</company>

diff --git a/Article-EclipseDbWebapps/about.xml b/Article-EclipseDbWebapps/about.xml
index 8e4c862..6137b7e 100644
--- a/Article-EclipseDbWebapps/about.xml
+++ b/Article-EclipseDbWebapps/about.xml

@@ -1,9 +1,9 @@
 <article link="article.html">
 	<title>Creating Database Web Applications with Eclipse</title>
 	<date>April 10, 2006</date>
-	<category>webtools</category>
-	<category>derby</category>
-	<category>tutorial</category>
+	<category>Web tools</category>
+	<category>Derby</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Stephen Schaub</name>
 		<company>

diff --git a/Article-EditorContributor/about.xml b/Article-EditorContributor/about.xml
index fe1b191..8e18f41 100644
--- a/Article-EditorContributor/about.xml
+++ b/Article-EditorContributor/about.xml

@@ -1,8 +1,11 @@
 <article link="EditorContributor.html" show="false">
 	<title>Editor Contributors - A Distinct Species</title>
 	<date>January 16, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Editors</category>
+	
 	<author>
 		<name>Dejan Glozic</name>
 		<email>dejan@ca.ibm.com</email>
@@ -11,7 +14,7 @@
 	<description>
 		Why are Eclipse desktop editors using a distinct contribution
 		mechanism instead of simply doing it directly from editors?
-		Eclipse platform desktop offers various ways a plugin can
+		Eclipse platform desktop offers various ways a plug-in can
 		contribute to menus and tool bars. The most natural way for
 		views is to contribute directly (if you own the view, that is).
 		However, editors are somewhat special - their contributors are

diff --git a/Article-Field-Editors/about.xml b/Article-Field-Editors/about.xml
index b296765..98320f3 100644
--- a/Article-Field-Editors/about.xml
+++ b/Article-Field-Editors/about.xml

@@ -1,8 +1,8 @@
 <article link="field_editors.html">
 	<title>Simplifying Preference Pages with Field Editors</title>
 	<date>August 21, 2002</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Ryan Coopero</name>
 		<company>IBM</company>

diff --git a/Article-Folding-in-Eclipse-Text-Editors/about.xml b/Article-Folding-in-Eclipse-Text-Editors/about.xml
index 7979dff..068c4e7 100644
--- a/Article-Folding-in-Eclipse-Text-Editors/about.xml
+++ b/Article-Folding-in-Eclipse-Text-Editors/about.xml

@@ -1,8 +1,8 @@
 <article link="folding.html">
 	<title>Folding in Eclipse Text Editors</title>
 	<date>March 11, 2005</date>
-	<category>platform</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>User interface</category>
 	<author>
 		<name>Prashant Deva</name>
 		<email>prashant.deva@gmail.com</email>

diff --git a/Article-Forms/about.xml b/Article-Forms/about.xml
index e8a313c..a9cbbe1 100644
--- a/Article-Forms/about.xml
+++ b/Article-Forms/about.xml

@@ -1,9 +1,9 @@
 <article link="article.html">
 	<title>Eclipse Forms: Rich UI for the Rich Client</title>
 	<date>January 16, 2006</date>
-	<category>general</category>
-	<category>ui</category>
-	<category>rcp</category>
+	
+	<category>User interface</category>
+	<category>RCP</category>
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>

diff --git a/Article-FromFrontendToCode-MDSDInPractice/about.xml b/Article-FromFrontendToCode-MDSDInPractice/about.xml
index 99f6a88..bc005ad 100644
--- a/Article-FromFrontendToCode-MDSDInPractice/about.xml
+++ b/Article-FromFrontendToCode-MDSDInPractice/about.xml

@@ -1,9 +1,9 @@
 <article link="article.html">
 	<title>From Front End To Code - MDSD in Practice</title>
 	<date>June 15, 2006</date>
-	<category>modeling</category>
-	<category>emf</category>
-	<category>gmf</category>
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>GMF</category>
 	<author>
 		<name>Markus Voelter</name>
 	</author>

diff --git a/Article-GEF-Draw2d/about.xml b/Article-GEF-Draw2d/about.xml
index 1668ebe..d2e3b66 100644
--- a/Article-GEF-Draw2d/about.xml
+++ b/Article-GEF-Draw2d/about.xml

@@ -1,8 +1,12 @@
 <article link="GEF-Draw2d.html">
 	<title>Display a UML Diagram using Draw2D</title>
 	<date>August 25, 2003</date>
-	<category>modeling</category>
-	<category>gef</category>
+	
+	<category>Modeling</category>
+	<category>GEF</category>
+	<category>Draw 2D</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Daniel Lee</name>
 		<company>IBM</company>

diff --git a/Article-GEF-EMF/about.xml b/Article-GEF-EMF/about.xml
index a125726..e1f7666 100644
--- a/Article-GEF-EMF/about.xml
+++ b/Article-GEF-EMF/about.xml

@@ -1,9 +1,9 @@
 <article link="gef-emf.html">
 	<title>Using GEF with EMF</title>
 	<date>June 8, 2005</date>
-	<category>modeling</category>
-	<category>gef</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>GEF</category>
+	<category>EMF</category>
 	<author>
 		<name>Chris Aniszczyk</name>
 		<company>IBM</company>

diff --git a/Article-GEF-diagram-editor/about.xml b/Article-GEF-diagram-editor/about.xml
index 1b90358..8f29573 100644
--- a/Article-GEF-diagram-editor/about.xml
+++ b/Article-GEF-diagram-editor/about.xml

@@ -11,8 +11,8 @@
 		</author>
 	</translation>
 	<date>December 8, 2004</date>
-	<category>modeling</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>GEF</category>
 	<author>
 		<name>Bo Majewski</name>
 		<company>Cisco Systems, Inc.</company>

diff --git a/Article-GEF-dnd/about.xml b/Article-GEF-dnd/about.xml
index 3c896ad..2c149a7 100644
--- a/Article-GEF-dnd/about.xml
+++ b/Article-GEF-dnd/about.xml

@@ -1,9 +1,9 @@
 <article link="GEF-dnd.html">
 	<title>Using Native Drag and Drop with GEF</title>
 	<date>August 25, 2003</date>
-	<category>modeling</category>
-	<category>ui</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>User interface</category>
+	<category>GEF</category>
 	<author>
 		<name>Eric Bordeau</name>
 		<company>IBM</company>

diff --git a/Article-GEF-editor/about.xml b/Article-GEF-editor/about.xml
index 4067f51..ff7a39c 100644
--- a/Article-GEF-editor/about.xml
+++ b/Article-GEF-editor/about.xml

@@ -3,8 +3,8 @@
 		Building a Database Schema Diagram Editor with GEF
 	</title>
 	<date>September 27, 2004</date>
-	<category>modeling</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>GEF</category>
 	<author>
 		<name>Phil Zoio</name>
 		<company>Realsolve Solutions Ltd.</company>

diff --git a/Article-Image-Viewer/about.xml b/Article-Image-Viewer/about.xml
index 6cc5faf..e435f9b 100644
--- a/Article-Image-Viewer/about.xml
+++ b/Article-Image-Viewer/about.xml

@@ -1,8 +1,10 @@
 <article link="Image_viewer.html">
 	<title>A Basic Image Viewer</title>
 	<date>March 15, 2004</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Chengdong Li</name>
 		<email>cdli@ccs.uky.edu</email>

diff --git a/Article-Internationalization/about.xml b/Article-Internationalization/about.xml
index 009e4ba..2e44e50 100644
--- a/Article-Internationalization/about.xml
+++ b/Article-Internationalization/about.xml

@@ -1,9 +1,11 @@
 <article link="how2I18n.html">
 	<title>How to Internationalize your Eclipse Plug-In</title>
 	<date>August 23, 2002</date>
-	<category>platform</category>
-	<category>general</category>
-	<category>rcp</category>
+	<category>Platform</category>
+	<category>RCP</category>
+	<category>Plug-ins</category>
+	<category>Internationalization</category>
+
 	<author>
 		<name>Dan Kehn</name>
 		<company>IBM</company>
@@ -21,7 +23,6 @@
 		for the international market. We'll begin with a brief review of
 		the motivations and technical challenges of
 		internationalization, followed by step-by-step instructions of
-		how to internationalize your Eclipse plug-in. [Editor's note:
-		This article reflects Eclipse release 2.0.]
+		how to internationalize your Eclipse plug-in.
 	</description>
 </article>
\ No newline at end of file

diff --git a/Article-Introducing-GMF/about.xml b/Article-Introducing-GMF/about.xml
index 19bc7c1..b7aa589 100644
--- a/Article-Introducing-GMF/about.xml
+++ b/Article-Introducing-GMF/about.xml

@@ -1,8 +1,9 @@
 <article link="article.html">
 	<title>Introducing the GMF Runtime</title>
 	<date>January 16, 2006</date>
-	<category>gmf</category>
-	<category>modeling</category>
+	<category>GMF</category>
+	<category>Modeling</category>
+	<category>Plug-ins</category>
 	<author>
 		<name>Frederic Plante</name>
 		<company>IBM</company>

diff --git a/Article-JET/about.xml b/Article-JET/about.xml
index 80f97ef..73db2db 100644
--- a/Article-JET/about.xml
+++ b/Article-JET/about.xml

@@ -5,10 +5,10 @@
 		<date>May 31, 2004</date>
 		<reason>for EMF 2.0 (Eclipse 3.0)</reason>
 	</update>
-	<category>modeling</category>
-	<category>tutorial</category>
-	<category>jet</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>Tutorial</category>
+	<category>JET</category>
+	<category>EMF</category>
 	<author>
 		<name>Remko Popma</name>
 		<email>remko.popma@azzurri.jp</email>

diff --git a/Article-JET2/about.xml b/Article-JET2/about.xml
index f2dd573..88148dc 100644
--- a/Article-JET2/about.xml
+++ b/Article-JET2/about.xml

@@ -5,10 +5,11 @@
 		<date>May 31, 2004</date>
 		<reason>for EMF 2.0 (Eclipse 3.0)</reason>
 	</update>
-	<category>modeling</category>
-	<category>tutorial</category>
-	<category>jet</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>Tutorial</category>
+	<category>JET</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
 	<author>
 		<name>Remko Popma</name>
 		<email>remko.popma@azzurri.jp</email>

diff --git a/Article-JFace Wizards/about.xml b/Article-JFace Wizards/about.xml
index 9a151d4..4e8dc0e 100644
--- a/Article-JFace Wizards/about.xml
+++ b/Article-JFace Wizards/about.xml

@@ -4,9 +4,9 @@
 	<update>
 		<date>January 18, 2006</date>
 	</update>
-	<category>ui</category>
-	<category>jface</category>
-	<category>platform</category>
+	<category>User interface</category>
+	<category>JFace</category>
+	<category>Platform</category>
 	<author>
 		<name>Doina Klinger</name>
 		<email>dklinger@uk.ibm.com</email>

diff --git a/Article-Java-launch/about.xml b/Article-Java-launch/about.xml
index 0616f20..fa8e7ef 100644
--- a/Article-Java-launch/about.xml
+++ b/Article-Java-launch/about.xml

@@ -1,7 +1,10 @@
 <article link="launching-java.html">
 	<title>Launching Java Applications Programmatically</title>
 	<date>August 26, 2003</date>
-	<category>general</category>
+	
+	<category>Java</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Darin Wright</name>
 		<company>IBM</company>

diff --git a/Article-LTK/about.xml b/Article-LTK/about.xml
index 6a795a1..f676e5e 100644
--- a/Article-LTK/about.xml
+++ b/Article-LTK/about.xml

@@ -5,8 +5,8 @@
 	</title>
 	<date>April 12, 2006</date>
 	<category>ltk</category>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Leif Frenzel</name>
 		<company>Innoopract</company>

diff --git a/Article-Launch-Framework/about.xml b/Article-Launch-Framework/about.xml
index 129fc77..e8d1fb5 100644
--- a/Article-Launch-Framework/about.xml
+++ b/Article-Launch-Framework/about.xml

@@ -1,8 +1,11 @@
 <article link="launch.html">
 	<title>We Have Lift-off: The Launching Framework in Eclipse</title>
 	<date>January 8, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
+	<category>Debugging</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Joe Szurszewski</name>
 		<company>IBM</company>

diff --git a/Article-Levels-Of-Integration/about.xml b/Article-Levels-Of-Integration/about.xml
index 09b56ad..00a431a 100644
--- a/Article-Levels-Of-Integration/about.xml
+++ b/Article-Levels-Of-Integration/about.xml

@@ -4,8 +4,8 @@
 		Eclipse Platform
 	</title>
 	<date>March 25, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Jim Amsden</name>
 		<company>IBM</company>

diff --git a/Article-Mark My Words/about.xml b/Article-Mark My Words/about.xml
index 898823e..ac131db 100644
--- a/Article-Mark My Words/about.xml
+++ b/Article-Mark My Words/about.xml

@@ -4,8 +4,8 @@
 		tasks
 	</title>
 	<date>April 1, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>

diff --git a/Article-Monitor/about.xml b/Article-Monitor/about.xml
index 7d06ac3..4939a1c 100644
--- a/Article-Monitor/about.xml
+++ b/Article-Monitor/about.xml

@@ -1,8 +1,8 @@
 <article link="monitorArticle.html">
 	<title>Building Administrative Applications in Eclipse</title>
 	<date>November 12, 2004</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Doina Klinger</name>
 		<email>dklinger@uk.ibm.com</email>

diff --git a/Article-Mutatis-mutandis/about.xml b/Article-Mutatis-mutandis/about.xml
index c251859..40ac687 100644
--- a/Article-Mutatis-mutandis/about.xml
+++ b/Article-Mutatis-mutandis/about.xml

@@ -3,8 +3,8 @@
 		Mutatis mutandis - Using Preference Pages as Property Pages
 	</title>
 	<date>October 24, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Berthold Daum</name>
 		<company>bdaum industrial communications</company>

diff --git a/Article-Online Help for 1_0/about.xml b/Article-Online Help for 1_0/about.xml
index 71da668..13bbe79 100644
--- a/Article-Online Help for 1_0/about.xml
+++ b/Article-Online Help for 1_0/about.xml

@@ -3,9 +3,11 @@
 		has been replaced with a new version for Eclipse 2.1 -->
 	<title>Help Part 1: Contributing a Little Help</title>
 	<date>May 28, 2001</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>help</category>
+	
+	<category>Platform</category>
+	<category>Help</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Greg Adams</name>
 		<company>IBM</company>

diff --git a/Article-Online Help for 2_0/about.xml b/Article-Online Help for 2_0/about.xml
index 81963d6..20b3e3c 100644
--- a/Article-Online Help for 2_0/about.xml
+++ b/Article-Online Help for 2_0/about.xml

@@ -1,9 +1,11 @@
 <article link="help1.htm">
 	<title>Help Part 1: Contributing a Little Help</title>
 	<date>August 9, 2002</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>help</category>
+	
+	<category>Platform</category>
+	<category>Help</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Greg Adams</name>
 		<company>IBM</company>

diff --git a/Article-PDE-Automation/about.xml b/Article-PDE-Automation/about.xml
index 694a8a7..c2d979c 100644
--- a/Article-PDE-Automation/about.xml
+++ b/Article-PDE-Automation/about.xml

@@ -1,21 +1,20 @@
-<!DOCTYPE doc [
-	<!ENTITY trade  "&#153;">
-	<!ENTITY reg "&#174;">
-]>
-
 <article link="automation.html">
 	<title>Build and Test Automation for plug-ins and features</title>
 	<date>May 29, 2005</date>
-	<category>general</category>
-	<category>build</category>
-	<category>pde</category>
+	
+	<category>Build</category>
+	<category>PDE</category>
+	<category>Plug-ins</category>
+	<category>Building</category>
+	<category>Test and performance</category>
+	
 	<author>
 		<name>Markus Barchfeld</name>
 		<company>Zuehlke Engineering</company>
 	</author>
 	<description>
 		Eclipse offers the possibility to build plug-ins automatically
-		outside the Eclipse IDE, which is called "headless build".
+		outside the Eclipse IDE, which is called &quot;headless build&quot;.
 		Eclipse itself is built headless and since Eclipse is an
 		assembly of plug-ins, this feature is also available for any
 		other plug-in. Although the set up of automatic building and

diff --git a/Article-PDE-does-plugins/about.xml b/Article-PDE-does-plugins/about.xml
index 5b107d2..60313e2 100644
--- a/Article-PDE-does-plugins/about.xml
+++ b/Article-PDE-does-plugins/about.xml

@@ -6,8 +6,10 @@
 <article link="PDE-intro.html">
 	<title>PDE Does Plug-ins</title>
 	<date>September 8, 2003</date>
-	<category>general</category>
-	<category>pde</category>
+	
+	<category>PDE</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Wassim Melhem</name>
 		<company>IBM</company>

diff --git a/Article-Plug-in-architecture/about.xml b/Article-Plug-in-architecture/about.xml
index d50f7f7..ceeb59d 100644
--- a/Article-Plug-in-architecture/about.xml
+++ b/Article-Plug-in-architecture/about.xml

@@ -1,13 +1,10 @@
-<!DOCTYPE doc [
-	<!ENTITY trade  "&#153;">
-	<!ENTITY reg "&#174;">
-]>
-
 <article link="plugin_architecture.html">
 	<title>Notes on the Eclipse Plug-in Architecture</title>
 	<date>July 3, 2003</date>
-	<category>platform</category>
-	<category>general</category>
+	
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Azad Bolour</name>
 		<company>Bolour Computing</company>

diff --git a/Article-Plugging-into-SourceForge/about.xml b/Article-Plugging-into-SourceForge/about.xml
index f45e7f0..d5ae1ff 100644
--- a/Article-Plugging-into-SourceForge/about.xml
+++ b/Article-Plugging-into-SourceForge/about.xml

@@ -1,12 +1,8 @@
-<!DOCTYPE doc [
-	<!ENTITY trade  "&#153;">
-	<!ENTITY reg "&#174;">
-]>
-
 <article link="sourceforge.html">
 	<title>Plugging into SourceForge.net</title>
 	<date>October 15, 2005</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
 	<author>
 		<name>David Biesack</name>
 		<company>SAS</company>

diff --git a/Article-Preferences/about.xml b/Article-Preferences/about.xml
index 5f625c2..613d907 100644
--- a/Article-Preferences/about.xml
+++ b/Article-Preferences/about.xml

@@ -1,8 +1,10 @@
 <article link="preferences.htm">
 	<title>Preferences in the Eclipse Workbench UI</title>
 	<date>August 15, 2002</date>
-	<category>platform</category>
-	<category>general</category>
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Preferences</category>
+	
 	<author>
 		<name>Tod Creasey</name>
 		<company>IBM</company>

diff --git a/Article-Progress-Monitors/about.xml b/Article-Progress-Monitors/about.xml
index 4c5f52b..1f7240a 100644
--- a/Article-Progress-Monitors/about.xml
+++ b/Article-Progress-Monitors/about.xml

@@ -1,8 +1,8 @@
 <article link="article.html">
 	<title>How to Correctly and Uniformly Use Progress Monitors</title>
 	<date>January 18, 2006</date>
-	<category>platform</category>
-	<category>general</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>
 			<![CDATA[Kenneth &Ouml;lwing]]>

diff --git a/Article-Properties-View/about.xml b/Article-Properties-View/about.xml
index 5af32f7..6687b88 100644
--- a/Article-Properties-View/about.xml
+++ b/Article-Properties-View/about.xml

@@ -6,7 +6,7 @@
 <article link="properties-view.html">
 	<title>Take control of your properties</title>
 	<date>May 20, 2003</date>
-	<category>platform</category>
+	<category>Platform</category>
 	<author>
 		<name>Dicky Johan</name>
 		<email>dicky.johan@broadvision.com</email>

diff --git a/Article-RCP-1/about.xml b/Article-RCP-1/about.xml
index 7fb155a..4c5fb7a 100644
--- a/Article-RCP-1/about.xml
+++ b/Article-RCP-1/about.xml

@@ -10,8 +10,8 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>

diff --git a/Article-RCP-2/about.xml b/Article-RCP-2/about.xml
index 0667ef5..e686626 100644
--- a/Article-RCP-2/about.xml
+++ b/Article-RCP-2/about.xml

@@ -10,8 +10,10 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
+	<category>Jobs</category>
+	
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>

diff --git a/Article-RCP-3/about.xml b/Article-RCP-3/about.xml
index c2f5c97..2478f44 100644
--- a/Article-RCP-3/about.xml
+++ b/Article-RCP-3/about.xml

@@ -11,8 +11,8 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>

diff --git a/Article-Resource-deltas/about.xml b/Article-Resource-deltas/about.xml
index 548deb1..c90aa2b 100644
--- a/Article-Resource-deltas/about.xml
+++ b/Article-Resource-deltas/about.xml

@@ -1,8 +1,3 @@
-<!DOCTYPE doc [
-	<!ENTITY trade  "&#153;">
-	<!ENTITY reg "&#174;">
-]>
-
 <article link="resource-deltas.html">
 	<title>
 		How You've Changed!: Responding to resource changes in the
@@ -13,8 +8,12 @@
 		<date>November 23, 2004</date>
 		<reason>for Eclipse 3.0</reason>
 	</update>
-	<category>platform</category>
-	<category>resource</category>
+	
+	<category>Platform</category>
+	<category>Resources</category>
+	<category>Jobs</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>

diff --git a/Article-Rule Modeling With EMF/about.xml b/Article-Rule Modeling With EMF/about.xml
index 4571611..eff2c7f 100644
--- a/Article-Rule Modeling With EMF/about.xml
+++ b/Article-Rule Modeling With EMF/about.xml

@@ -1,9 +1,9 @@
 <article link="article.html">
 	<title>Modeling Rule-Based Systems with EMF</title>
 	<date>November 30, 2004</date>
-	<category>modeling</category>
-	<category>emf</category>
-	<category>jet</category>
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>JET</category>
 	<author>
 		<name>Chaur G. Wu</name>
 		<email>cha_urwu@hotmail.com</email>

diff --git a/Article-SWT-Color-Model/about.xml b/Article-SWT-Color-Model/about.xml
index bf8f66a..7076204 100644
--- a/Article-SWT-Color-Model/about.xml
+++ b/Article-SWT-Color-Model/about.xml

@@ -1,8 +1,8 @@
 <article link="swt-color-model.htm">
 	<title>SWT Color Model</title>
 	<date>April 24, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>James Moody</name>
 		<company>IBM</company>

diff --git a/Article-SWT-DND/about.xml b/Article-SWT-DND/about.xml
index 10ffbfa..5fd96c4 100644
--- a/Article-SWT-DND/about.xml
+++ b/Article-SWT-DND/about.xml

@@ -9,10 +9,10 @@
 	<update>
 		<date>November 2, 2005</date>
 	</update>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
-	<category>dnd</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
+	<category>Drag and drop</category>
 	<author>
 		<name>Veronika Irvine</name>
 		<company>IBM</company>

diff --git a/Article-SWT-Design-1/about.xml b/Article-SWT-Design-1/about.xml
index 4a42379..334a49c 100644
--- a/Article-SWT-Design-1/about.xml
+++ b/Article-SWT-Design-1/about.xml

@@ -6,8 +6,8 @@
 		]]>
 	</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Steve Northover</name>
 		<company>IBM</company>

diff --git a/Article-SWT-OpenGL/about.xml b/Article-SWT-OpenGL/about.xml
index 8b73c1d..5ada8ef 100644
--- a/Article-SWT-OpenGL/about.xml
+++ b/Article-SWT-OpenGL/about.xml

@@ -1,8 +1,8 @@
 <article link="opengl.html">
 	<title>Using OpenGL with SWT</title>
 	<date>April 15, 2005</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Bo Majewski</name>
 		<company>Cisco Systems, Inc.</company>

diff --git a/Article-SWT-Virtual/about.xml b/Article-SWT-Virtual/about.xml
index 58d41d5..05c97b2 100644
--- a/Article-SWT-Virtual/about.xml
+++ b/Article-SWT-Virtual/about.xml

@@ -1,8 +1,8 @@
 <article link="Virtual-in-SWT.html">
 	<title>Virtual Tables and Trees</title>
 	<date>June 5, 2006</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Beatriz Iaderoza</name>
 		<company>IBM Ottawa Lab</company>

diff --git a/Article-SWT-browser-widget/about.xml b/Article-SWT-browser-widget/about.xml
index 01d1244..c4b348f 100644
--- a/Article-SWT-browser-widget/about.xml
+++ b/Article-SWT-browser-widget/about.xml

@@ -1,9 +1,9 @@
 <article link="browser.html">
 	<title>Viewing HTML pages with SWT Browser widget</title>
 	<date>August 26, 2004</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Christophe Cornu</name>
 		<company>IBM</company>

diff --git a/Article-SWT-graphics/about.xml b/Article-SWT-graphics/about.xml
index bf1b1cd..f1a98d8 100644
--- a/Article-SWT-graphics/about.xml
+++ b/Article-SWT-graphics/about.xml

@@ -6,9 +6,9 @@
 <article link="SWT_graphics.html">
 	<title>Graphics Context - Quick on the draw</title>
 	<date>July 3, 2003</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Joe Winchester</name>
 		<company>IBM</company>

diff --git a/Article-SWT-images/about.xml b/Article-SWT-images/about.xml
index 6f50f47..4e1a6e2 100644
--- a/Article-SWT-images/about.xml
+++ b/Article-SWT-images/about.xml

@@ -1,9 +1,9 @@
 <article link="graphics-resources.html">
 	<title>Taking a look at SWT Images</title>
 	<date>September 10th, 2003</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Joe Winchester</name>
 		<company>IBM</company>

diff --git a/Article-Speak-The-Local-Language/about.xml b/Article-Speak-The-Local-Language/about.xml
index 462e84d..e462eb8 100644
--- a/Article-Speak-The-Local-Language/about.xml
+++ b/Article-Speak-The-Local-Language/about.xml

@@ -1,9 +1,9 @@
 <article link="article.html">
 	<title>Teach Your Eclipse to Speak the Local Lingo</title>
 	<date>March 9, 2006</date>
-	<category>platform</category>
-	<category>general</category>
-	<category>ui</category>
+	<category>Platform</category>
+	
+	<category>User interface</category>
 	<author>
 		<name>Kit Lo</name>
 		<company>IBM</company>

diff --git a/Article-TPTP-Profiling-Tool/about.xml b/Article-TPTP-Profiling-Tool/about.xml
index 33736b1..997a83c 100644
--- a/Article-TPTP-Profiling-Tool/about.xml
+++ b/Article-TPTP-Profiling-Tool/about.xml

@@ -1,8 +1,9 @@
 <article link="tptpProfilingArticle.html">
 	<title>Java Application Profiling using TPTP</title>
 	<date>February 21, 2006</date>
-	<category>tptp</category>
-	<category>general</category>
+	<category>Test and performance</category>
+	<category>Profiling</category>
+	
 	<author>
 		<name>Valentina Popescu</name>
 		<company>IBM</company>

diff --git a/Article-TVT/about.xml b/Article-TVT/about.xml
index cf571a4..4bfa0b5 100644
--- a/Article-TVT/about.xml
+++ b/Article-TVT/about.xml

@@ -1,9 +1,12 @@
 <article link="how2TestI18n.html">
 	<title>How to Test Your Internationalized Eclipse Plug-In</title>
 	<date>August 23, 2002</date>
-	<category>rcp</category>
-	<category>platform</category>
-	<category>general</category>
+	
+	<category>RCP</category>
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Internationalization</category>
+	
 	<author>
 		<name>Dan Kehn</name>
 		<company>IBM</company>

diff --git a/Article-Tabbed-Properties/about.xml b/Article-Tabbed-Properties/about.xml
index a10ae8f..ecee438 100644
--- a/Article-Tabbed-Properties/about.xml
+++ b/Article-Tabbed-Properties/about.xml

@@ -1,8 +1,8 @@
 <article link="tabbed_properties_view.html">
 	<title>The Eclipse Tabbed Properties View</title>
 	<date>February 19, 2006</date>
-	<category>workbench</category>
-	<category>general</category>
+	<category>Workbench</category>
+	
 	<author>
 		<name>Anthony Hunter</name>
 		<company>IBM</company>

diff --git a/Article-Table-viewer/about.xml b/Article-Table-viewer/about.xml
index 8a21818..568681d 100644
--- a/Article-Table-viewer/about.xml
+++ b/Article-Table-viewer/about.xml

@@ -1,9 +1,9 @@
 <article link="table_viewer.html">
 	<title>Building and delivering a table editor with SWT/JFace</title>
 	<date>July 3, 2003</date>
-	<category>rcp</category>
-	<category>jface</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>JFace</category>
+	<category>User interface</category>
 	<author>
 		<name>Laurent Gauthier</name>
 		<email>lgauthier@opnworks.com</email>

diff --git a/Article-TreeViewer/about.xml b/Article-TreeViewer/about.xml
index 0c9f6b6..929183c 100644
--- a/Article-TreeViewer/about.xml
+++ b/Article-TreeViewer/about.xml

@@ -1,8 +1,11 @@
 <article link="TreeViewerArticle.htm">
 	<title>How to use the JFace Tree Viewer</title>
 	<date>May 5, 2002</date>
-	<category>jface</category>
-	<category>ui</category>
+	
+	<category>JFace</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Chris Grindstaff</name>
 		<email>chrisg@appliedReasoning.com</email>

diff --git a/Article-UI-Guidelines/about.xml b/Article-UI-Guidelines/about.xml
index 7658cf0..527880a 100644
--- a/Article-UI-Guidelines/about.xml
+++ b/Article-UI-Guidelines/about.xml

@@ -15,9 +15,9 @@
 	<update>
 		<date>February 1, 2004</date>
 	</update>
-	<category>workbench</category>
-	<category>platform</category>
-	<category>general</category>
+	<category>Workbench</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>Nick Edgar</name>
 		<company>IBM</company>

diff --git a/Article-UI-Workbench/about.xml b/Article-UI-Workbench/about.xml
index facfa18..fc5edc0 100644
--- a/Article-UI-Workbench/about.xml
+++ b/Article-UI-Workbench/about.xml

@@ -3,9 +3,9 @@
 		Inside the Workbench: A guide to the workbench internals
 	</title>
 	<date>October 20, 2005</date>
-	<category>workbench</category>
-	<category>platform</category>
-	<category>general</category>
+	<category>Workbench</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>Stefan Xenos</name>
 		<company>IBM</company>

diff --git a/Article-Understanding-Layouts/about.xml b/Article-Understanding-Layouts/about.xml
index 0314d3e..420e1db 100644
--- a/Article-Understanding-Layouts/about.xml
+++ b/Article-Understanding-Layouts/about.xml

@@ -1,10 +1,10 @@
 <article link="Understanding-Layouts.htm">
 	<title>Understanding Layouts in SWT</title>
 	<date>March 22, 2001</date>
-	<category>platform</category>
-	<category>swt</category>
-	<category>rcp</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>SWT</category>
+	<category>RCP</category>
+	<category>User interface</category>
 	<author>
 		<name>Carolyn MacLeod</name>
 		<company>IBM</company>

diff --git a/Article-Update/about.xml b/Article-Update/about.xml
index 1a83bb6..f2927f7 100644
--- a/Article-Update/about.xml
+++ b/Article-Update/about.xml

@@ -5,10 +5,13 @@
 		<date>January 13, 2004</date>
 		<reason>to add appendix</reason>
 	</update>
-	<category>platform</category>
-	<category>general</category>
-	<category>update</category>
-	<category>rcp</category>
+	<category>Platform</category>
+	
+	<category>Update</category>
+	<category>RCP</category>
+	<category>Plug-ins</category>
+	<category>Features</category>
+	
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>

diff --git a/Article-Using EMF/about.xml b/Article-Using EMF/about.xml
index 9fce8c4..3c7e77b 100644
--- a/Article-Using EMF/about.xml
+++ b/Article-Using EMF/about.xml

@@ -5,14 +5,17 @@
 		<date>May 1, 2003</date>
 		<reason>for EMF 1.1.0</reason>
 	</update>
-	<category>modeling</category>
-	<category>emf</category>
+	
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Catherine Griffin</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		This article introduces EMF, the Eclipse Modelling Framework,
+		This article introduces EMF, the Eclipse Modeling Framework,
 		and will help you get started using EMF in your own Eclipse
 		plug-ins.
 	</description>

diff --git a/Article-Using Images In Eclipse/about.xml b/Article-Using Images In Eclipse/about.xml
index 3fc1ccc..bf400b6 100644
--- a/Article-Using Images In Eclipse/about.xml
+++ b/Article-Using Images In Eclipse/about.xml

@@ -5,17 +5,19 @@
 		<date>September 12, 2002</date>
 		<reason>for Eclipse 2.0</reason>
 	</update>
-	<category>swt</category>
-	<category>rcp</category>
-	<category>ui</category>
+	
+	<category>SWT</category>
+	<category>RCP</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		<![CDATA[
 		Managing images in a large graphical application can be a
-		daunting task. Since modern operating systems such as Windows&reg;
+		daunting task. Since modern operating systems such as Windows&amp;reg;
 		only support a small number of images in memory at once, an
 		application's icons and background images must be carefully
 		managed and sometimes shared between widgets. This article
@@ -25,6 +27,6 @@
 		assume the reader already has a basic understanding of Eclipse,
 		the UI extension points defined by the Eclipse Platform, and the
 		Standard Widget Toolkit (SWT).
-		]]>
+		
 	</description>
 </article>
\ No newline at end of file

diff --git a/Article-VE-Custom-Widget/about.xml b/Article-VE-Custom-Widget/about.xml
index 287b337..1ba0883 100644
--- a/Article-VE-Custom-Widget/about.xml
+++ b/Article-VE-Custom-Widget/about.xml

@@ -4,9 +4,9 @@
 		widget
 	</title>
 	<date>June 20, 2005</date>
-	<category>ui</category>
-	<category>ve</category>
-	<category>emf</category>
+	<category>User interface</category>
+	<category>Visual editor</category>
+	<category>EMF</category>
 	<author>
 		<name>Dave Orme</name>
 		<company>db4objects</company>

diff --git a/Article-WTP-Persisting-EMF/about.xml b/Article-WTP-Persisting-EMF/about.xml
index 126cf8a..81ef1e4 100644
--- a/Article-WTP-Persisting-EMF/about.xml
+++ b/Article-WTP-Persisting-EMF/about.xml

@@ -1,16 +1,19 @@
 <article link="persisting.html">
 	<title>Persisting EMF models with WTP</title>
 	<date>October 10, 2005</date>
-	<category>modeling</category>
-	<category>webtools</category>
-	<category>emf</category>
+	
+	<category>Modeling</category>
+	<category>Web tools</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Daniel Rohe</name>
 	</author>
 	<description>
 		This article guides you through an example where an EMF
 		model is created without serialization and the serialization is
-		done with the framework from the WTP plugin
+		done with the framework from the web tools plug-in
 		org.eclipse.wst.common.emf.
 	</description>
 </article>
\ No newline at end of file

diff --git a/Article-Workbench-DND/about.xml b/Article-Workbench-DND/about.xml
index 0678227..fac0fe8 100644
--- a/Article-Workbench-DND/about.xml
+++ b/Article-Workbench-DND/about.xml

@@ -1,10 +1,10 @@
 <article link="drag_drop.html">
 	<title>Drag and Drop in the Eclipse UI</title>
 	<date>August 25, 2003</date>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>dnd</category>
-	<category>ui</category>
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>Drag and drop</category>
+	<category>User interface</category>
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>

diff --git a/Article-WorkbenchSelections/about.xml b/Article-WorkbenchSelections/about.xml
index 0cc93a1..4311399 100644
--- a/Article-WorkbenchSelections/about.xml
+++ b/Article-WorkbenchSelections/about.xml

@@ -1,10 +1,14 @@
 <article link="article.html">
 	<title>Eclipse Workbench: Using the Selection Service</title>
 	<date>April 14, 2006</date>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>workbench</category>
-	<category>ui</category>
+	
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>Workbench</category>
+	<category>User interface</category>
+	<category>Selections</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Marc R. Hoffmann</name>
 		<company>Mountainminds GmbH &amp; Co. KG</company>

diff --git a/Article-Writing Your Own Widget/about.xml b/Article-Writing Your Own Widget/about.xml
index b9946a3..de16b59 100644
--- a/Article-Writing Your Own Widget/about.xml
+++ b/Article-Writing Your Own Widget/about.xml

@@ -1,8 +1,8 @@
 <article link="Writing%20Your%20Own%20Widget.htm">
 	<title>Creating Your Own Widgets using SWT</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Steve Northover</name>
 		<company>IBM</company>

diff --git a/Article-Your First Plug-in/about.xml b/Article-Your First Plug-in/about.xml
index af15abd..5b42838 100644
--- a/Article-Your First Plug-in/about.xml
+++ b/Article-Your First Plug-in/about.xml

@@ -3,9 +3,15 @@
 		Your First Plug-in: Developing the Eclipse &quot;Hello
 		World&quot; plug-in
 	</title>
+	
+	<category>Plug-ins</category>
+	<category>Platform</category>
+	<category>Debugging</category>
+	<category>Java</category>
+	
 	<date>March 22, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Jim Amsden</name>
 		<company>IBM</company>

diff --git a/Article-action-contribution/about.xml b/Article-action-contribution/about.xml
index 67c085b..5523c2a 100644
--- a/Article-action-contribution/about.xml
+++ b/Article-action-contribution/about.xml

@@ -1,7 +1,11 @@
 <article link="Contributing%20Actions%20to%20the%20Eclipse%20Workbench.html">
 	<title>Contributing Actions to the Eclipse Workbench</title>
 	<date>October 18, 2001</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
+	<category>Actions</category>
+	<category>Workbench</category>
+	
 	<author>
 		<name>Simon Arsenault</name>
 		<company>IBM</company>

diff --git a/Article-small-cup-of-swt/about.xml b/Article-small-cup-of-swt/about.xml
index bccafed..7d11605 100644
--- a/Article-small-cup-of-swt/about.xml
+++ b/Article-small-cup-of-swt/about.xml

@@ -4,12 +4,12 @@
 		developing SWT apps on the Pocket PC
 	</title>
 	<date>September 19, 2003</date>
-	<category>embedded</category>
-	<category>ercp</category>
-	<category>rcp</category>
-	<category>eswt</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>Embedded</category>
+	<category>eRCP</category>
+	<category>RCP</category>
+	<category>eSWT</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Christophe Cornu</name>
 		<company>IBM</company>

diff --git a/StyledText 1/about.xml b/StyledText 1/about.xml
index 7fc1201..ae5c547 100644
--- a/StyledText 1/about.xml
+++ b/StyledText 1/about.xml

@@ -1,8 +1,8 @@
 <article link="article1.html">
 	<title>Getting Your Feet Wet with the SWT StyledText Widget</title>
 	<date>May 7, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Lynne Kues</name>
 		<company>IBM</company>

diff --git a/StyledText 2/about.xml b/StyledText 2/about.xml
index 36aeaac..e386d2e 100644
--- a/StyledText 2/about.xml
+++ b/StyledText 2/about.xml

@@ -1,8 +1,8 @@
 <article link="article2.html">
 	<title>Into the Deep End of the SWT StyledText Widget</title>
 	<date>October 17, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Lynne Kues</name>
 		<company>IBM</company>

diff --git a/Whitepaper-Platform-3.1/about.xml b/Whitepaper-Platform-3.1/about.xml
index 205598a..e5f9f4b 100644
--- a/Whitepaper-Platform-3.1/about.xml
+++ b/Whitepaper-Platform-3.1/about.xml

@@ -8,8 +8,8 @@
 		<date>April 19, 2006</date>
 		<reason>for Eclipse 3.1</reason>
 	</update>
-	<category>whitepaper</category>
-	<category>platform</category>
+	<category>Whitepaper</category>
+	<category>Platform</category>
 	<description>
 		The Eclipse Platform is designed for building applications,
 		integrated development environments (IDEs)and arbitrary tools.

diff --git a/Whitepaper/about.xml b/Whitepaper/about.xml
index 8b0dd08..0ce6b36 100644
--- a/Whitepaper/about.xml
+++ b/Whitepaper/about.xml

@@ -4,7 +4,7 @@
 		<update>
 			<date>February 1, 2003</date>
 		</update>
-		<category>whitepaper</category>
+		<category>Whitepaper</category>
 		<description>
 			The Eclipse Platform is designed for building integrated
 			development environments (IDEs) that can be used to create

diff --git a/articles.rss b/articles.rss
index b7e946a..56bd4eb 100644
--- a/articles.rss
+++ b/articles.rss

@@ -28,6 +28,16 @@
 	if (!$filter) $filter = 'recent';
 	
 	/*
+	 * For backwards compatibility. The categories have
+	 * been changed, but the old ones may still be referenced
+	 */
+	$filter = strtoupper($filter);
+	if ($filter == 'UI') $filter = 'User interface';
+	if ($filter == 'USER INTERFACE') $filter = 'User interface';
+	if ($filter == 'WHITEPAPER') $filter = 'Whitepaper';
+	if ($filter == 'TUTORIAL') $filter = 'Tutorial';
+	
+	/*
 	 * Find the desired category. If no category
 	 * can be found using the specified filter, obtain
 	 * the 'recent' category.

diff --git a/articles.xml b/articles.xml
index cceb472..eaa946b 100644
--- a/articles.xml
+++ b/articles.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><!--This document is automatically generated. Do not manually edit.--><articles><article link="ViewArticle2.html">
 	<title>Creating an Eclipse View</title>
 	<date>November 2, 2001</date>
-	<category>platform</category>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>User interface</category>
 	<author>
 		<name>Dave Springgay</name>
 		<company>IBM</company>
@@ -23,9 +23,9 @@
 <base>/articles/viewArticle</base></article><article link="PerspectiveArticle.html">
 	<title>Using Perspectives in the Eclipse UI</title>
 	<date>August 27, 2001</date>
-	<category>platform</category>
-	<category>rcp</category>
-	<category>general</category>
+	<category>Platform</category>
+	<category>RCP</category>
+	
 	<author>
 		<name>Dave Springgay</name>
 		<company>IBM</company>
@@ -46,8 +46,8 @@
 		System Resources
 	</title>
 	<date>November 27, 2001</date>
-	<category>ui</category>
-	<category>swt</category>
+	<category>User interface</category>
+	<category>SWT</category>
 	<author>
 		<name>Carolyn MacLeod</name>
 		<company>IBM</company>
@@ -81,8 +81,8 @@
 		<date>April 19, 2006</date>
 		<reason>for Eclipse 3.1</reason>
 	</update>
-	<category>whitepaper</category>
-	<category>platform</category>
+	<category>Whitepaper</category>
+	<category>Platform</category>
 	<description>
 		The Eclipse Platform is designed for building applications,
 		integrated development environments (IDEs)and arbitrary tools.
@@ -102,7 +102,7 @@
 		<update>
 			<date>February 1, 2003</date>
 		</update>
-		<category>whitepaper</category>
+		<category>Whitepaper</category>
 		<description>
 			The Eclipse Platform is designed for building integrated
 			development environments (IDEs) that can be used to create
@@ -117,8 +117,8 @@
 	<base>/articles/Whitepaper</base></article><article link="article2.html">
 	<title>Into the Deep End of the SWT StyledText Widget</title>
 	<date>October 17, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Lynne Kues</name>
 		<company>IBM</company>
@@ -140,8 +140,8 @@
 <base>/articles/StyledText 2</base></article><article link="article1.html">
 	<title>Getting Your Feet Wet with the SWT StyledText Widget</title>
 	<date>May 7, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Lynne Kues</name>
 		<company>IBM</company>
@@ -167,12 +167,12 @@
 		developing SWT apps on the Pocket PC
 	</title>
 	<date>September 19, 2003</date>
-	<category>embedded</category>
-	<category>ercp</category>
-	<category>rcp</category>
-	<category>eswt</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>Embedded</category>
+	<category>eRCP</category>
+	<category>RCP</category>
+	<category>eSWT</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Christophe Cornu</name>
 		<company>IBM</company>
@@ -189,7 +189,11 @@
 <base>/articles/Article-small-cup-of-swt</base></article><article link="Contributing%20Actions%20to%20the%20Eclipse%20Workbench.html">
 	<title>Contributing Actions to the Eclipse Workbench</title>
 	<date>October 18, 2001</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
+	<category>Actions</category>
+	<category>Workbench</category>
+	
 	<author>
 		<name>Simon Arsenault</name>
 		<company>IBM</company>
@@ -205,9 +209,15 @@
 		Your First Plug-in: Developing the Eclipse "Hello
 		World" plug-in
 	</title>
+	
+	<category>Plug-ins</category>
+	<category>Platform</category>
+	<category>Debugging</category>
+	<category>Java</category>
+	
 	<date>March 22, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Jim Amsden</name>
 		<company>IBM</company>
@@ -241,8 +251,8 @@
 <base>/articles/Article-Your First Plug-in</base></article><article link="Writing%20Your%20Own%20Widget.htm">
 	<title>Creating Your Own Widgets using SWT</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Steve Northover</name>
 		<company>IBM</company>
@@ -263,10 +273,14 @@
 <base>/articles/Article-Writing Your Own Widget</base></article><article link="article.html">
 	<title>Eclipse Workbench: Using the Selection Service</title>
 	<date>April 14, 2006</date>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>workbench</category>
-	<category>ui</category>
+	
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>Workbench</category>
+	<category>User interface</category>
+	<category>Selections</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Marc R. Hoffmann</name>
 		<company>Mountainminds GmbH &amp; Co. KG</company>
@@ -282,10 +296,10 @@
 <base>/articles/Article-WorkbenchSelections</base></article><article link="drag_drop.html">
 	<title>Drag and Drop in the Eclipse UI</title>
 	<date>August 25, 2003</date>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>dnd</category>
-	<category>ui</category>
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>Drag and drop</category>
+	<category>User interface</category>
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>
@@ -304,16 +318,19 @@
 <base>/articles/Article-Workbench-DND</base></article><article link="persisting.html">
 	<title>Persisting EMF models with WTP</title>
 	<date>October 10, 2005</date>
-	<category>modeling</category>
-	<category>webtools</category>
-	<category>emf</category>
+	
+	<category>Modeling</category>
+	<category>Web tools</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Daniel Rohe</name>
 	</author>
 	<description>
 		This article guides you through an example where an EMF
 		model is created without serialization and the serialization is
-		done with the framework from the WTP plugin
+		done with the framework from the web tools plug-in
 		org.eclipse.wst.common.emf.
 	</description>
 <base>/articles/Article-WTP-Persisting-EMF</base></article><article link="customwidget.html">
@@ -322,9 +339,9 @@
 		widget
 	</title>
 	<date>June 20, 2005</date>
-	<category>ui</category>
-	<category>ve</category>
-	<category>emf</category>
+	<category>User interface</category>
+	<category>Visual editor</category>
+	<category>EMF</category>
 	<author>
 		<name>Dave Orme</name>
 		<company>db4objects</company>
@@ -350,17 +367,19 @@
 		<date>September 12, 2002</date>
 		<reason>for Eclipse 2.0</reason>
 	</update>
-	<category>swt</category>
-	<category>rcp</category>
-	<category>ui</category>
+	
+	<category>SWT</category>
+	<category>RCP</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		<![CDATA[
 		Managing images in a large graphical application can be a
-		daunting task. Since modern operating systems such as Windows&reg;
+		daunting task. Since modern operating systems such as Windows&amp;reg;
 		only support a small number of images in memory at once, an
 		application's icons and background images must be carefully
 		managed and sometimes shared between widgets. This article
@@ -370,7 +389,7 @@
 		assume the reader already has a basic understanding of Eclipse,
 		the UI extension points defined by the Eclipse Platform, and the
 		Standard Widget Toolkit (SWT).
-		]]>
+		
 	</description>
 <base>/articles/Article-Using Images In Eclipse</base></article><article link="using-emf.html">
 	<title>Using EMF</title>
@@ -379,14 +398,17 @@
 		<date>May 1, 2003</date>
 		<reason>for EMF 1.1.0</reason>
 	</update>
-	<category>modeling</category>
-	<category>emf</category>
+	
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Catherine Griffin</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		This article introduces EMF, the Eclipse Modelling Framework,
+		This article introduces EMF, the Eclipse Modeling Framework,
 		and will help you get started using EMF in your own Eclipse
 		plug-ins.
 	</description>
@@ -397,10 +419,13 @@
 		<date>January 13, 2004</date>
 		<reason>to add appendix</reason>
 	</update>
-	<category>platform</category>
-	<category>general</category>
-	<category>update</category>
-	<category>rcp</category>
+	<category>Platform</category>
+	
+	<category>Update</category>
+	<category>RCP</category>
+	<category>Plug-ins</category>
+	<category>Features</category>
+	
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>
@@ -421,10 +446,10 @@
 <base>/articles/Article-Update</base></article><article link="Understanding-Layouts.htm">
 	<title>Understanding Layouts in SWT</title>
 	<date>March 22, 2001</date>
-	<category>platform</category>
-	<category>swt</category>
-	<category>rcp</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>SWT</category>
+	<category>RCP</category>
+	<category>User interface</category>
 	<author>
 		<name>Carolyn MacLeod</name>
 		<company>IBM</company>
@@ -442,9 +467,9 @@
 		Inside the Workbench: A guide to the workbench internals
 	</title>
 	<date>October 20, 2005</date>
-	<category>workbench</category>
-	<category>platform</category>
-	<category>general</category>
+	<category>Workbench</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>Stefan Xenos</name>
 		<company>IBM</company>
@@ -473,9 +498,9 @@
 	<update>
 		<date>February 1, 2004</date>
 	</update>
-	<category>workbench</category>
-	<category>platform</category>
-	<category>general</category>
+	<category>Workbench</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>Nick Edgar</name>
 		<company>IBM</company>
@@ -501,8 +526,11 @@
 <base>/articles/Article-UI-Guidelines</base></article><article link="TreeViewerArticle.htm">
 	<title>How to use the JFace Tree Viewer</title>
 	<date>May 5, 2002</date>
-	<category>jface</category>
-	<category>ui</category>
+	
+	<category>JFace</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Chris Grindstaff</name>
 		<email>chrisg@appliedReasoning.com</email>
@@ -517,9 +545,9 @@
 <base>/articles/Article-TreeViewer</base></article><article link="table_viewer.html">
 	<title>Building and delivering a table editor with SWT/JFace</title>
 	<date>July 3, 2003</date>
-	<category>rcp</category>
-	<category>jface</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>JFace</category>
+	<category>User interface</category>
 	<author>
 		<name>Laurent Gauthier</name>
 		<email>lgauthier@opnworks.com</email>
@@ -537,8 +565,8 @@
 <base>/articles/Article-Table-viewer</base></article><article link="tabbed_properties_view.html">
 	<title>The Eclipse Tabbed Properties View</title>
 	<date>February 19, 2006</date>
-	<category>workbench</category>
-	<category>general</category>
+	<category>Workbench</category>
+	
 	<author>
 		<name>Anthony Hunter</name>
 		<company>IBM</company>
@@ -552,9 +580,12 @@
 <base>/articles/Article-Tabbed-Properties</base></article><article link="how2TestI18n.html">
 	<title>How to Test Your Internationalized Eclipse Plug-In</title>
 	<date>August 23, 2002</date>
-	<category>rcp</category>
-	<category>platform</category>
-	<category>general</category>
+	
+	<category>RCP</category>
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Internationalization</category>
+	
 	<author>
 		<name>Dan Kehn</name>
 		<company>IBM</company>
@@ -569,8 +600,9 @@
 <base>/articles/Article-TVT</base></article><article link="tptpProfilingArticle.html">
 	<title>Java Application Profiling using TPTP</title>
 	<date>February 21, 2006</date>
-	<category>tptp</category>
-	<category>general</category>
+	<category>Test and performance</category>
+	<category>Profiling</category>
+	
 	<author>
 		<name>Valentina Popescu</name>
 		<company>IBM</company>
@@ -589,9 +621,9 @@
 <base>/articles/Article-TPTP-Profiling-Tool</base></article><article link="article.html">
 	<title>Teach Your Eclipse to Speak the Local Lingo</title>
 	<date>March 9, 2006</date>
-	<category>platform</category>
-	<category>general</category>
-	<category>ui</category>
+	<category>Platform</category>
+	
+	<category>User interface</category>
 	<author>
 		<name>Kit Lo</name>
 		<company>IBM</company>
@@ -607,9 +639,9 @@
 <base>/articles/Article-Speak-The-Local-Language</base></article><article link="graphics-resources.html">
 	<title>Taking a look at SWT Images</title>
 	<date>September 10th, 2003</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Joe Winchester</name>
 		<company>IBM</company>
@@ -631,9 +663,9 @@
 <base>/articles/Article-SWT-images</base></article><article link="SWT_graphics.html">
 	<title>Graphics Context - Quick on the draw</title>
 	<date>July 3, 2003</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Joe Winchester</name>
 		<company>IBM</company>
@@ -659,9 +691,9 @@
 <base>/articles/Article-SWT-graphics</base></article><article link="browser.html">
 	<title>Viewing HTML pages with SWT Browser widget</title>
 	<date>August 26, 2004</date>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Christophe Cornu</name>
 		<company>IBM</company>
@@ -674,8 +706,8 @@
 <base>/articles/Article-SWT-browser-widget</base></article><article link="Virtual-in-SWT.html">
 	<title>Virtual Tables and Trees</title>
 	<date>June 5, 2006</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Beatriz Iaderoza</name>
 		<company>IBM Ottawa Lab</company>
@@ -692,8 +724,8 @@
 <base>/articles/Article-SWT-Virtual</base></article><article link="opengl.html">
 	<title>Using OpenGL with SWT</title>
 	<date>April 15, 2005</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Bo Majewski</name>
 		<company>Cisco Systems, Inc.</company>
@@ -716,8 +748,8 @@
 		]]>
 	</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>Steve Northover</name>
 		<company>IBM</company>
@@ -746,10 +778,10 @@
 	<update>
 		<date>November 2, 2005</date>
 	</update>
-	<category>rcp</category>
-	<category>swt</category>
-	<category>ui</category>
-	<category>dnd</category>
+	<category>RCP</category>
+	<category>SWT</category>
+	<category>User interface</category>
+	<category>Drag and drop</category>
 	<author>
 		<name>Veronika Irvine</name>
 		<company>IBM</company>
@@ -764,8 +796,8 @@
 <base>/articles/Article-SWT-DND</base></article><article link="swt-color-model.htm">
 	<title>SWT Color Model</title>
 	<date>April 24, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<author>
 		<name>James Moody</name>
 		<company>IBM</company>
@@ -787,9 +819,9 @@
 <base>/articles/Article-SWT-Color-Model</base></article><article link="article.html">
 	<title>Modeling Rule-Based Systems with EMF</title>
 	<date>November 30, 2004</date>
-	<category>modeling</category>
-	<category>emf</category>
-	<category>jet</category>
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>JET</category>
 	<author>
 		<name>Chaur G. Wu</name>
 		<email>cha_urwu@hotmail.com</email>
@@ -812,8 +844,12 @@
 		<date>November 23, 2004</date>
 		<reason>for Eclipse 3.0</reason>
 	</update>
-	<category>platform</category>
-	<category>resource</category>
+	
+	<category>Platform</category>
+	<category>Resources</category>
+	<category>Jobs</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>
@@ -837,8 +873,8 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>
@@ -859,8 +895,10 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
+	<category>Jobs</category>
+	
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>
@@ -882,8 +920,8 @@
 		<date>February 6, 2006</date>
 		<reason>for Eclipse 3.1.2</reason>
 	</update>
-	<category>rcp</category>
-	<category>tutorial</category>
+	<category>RCP</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Ed Burnette</name>
 		<company>SAS</company>
@@ -898,7 +936,7 @@
 <base>/articles/Article-RCP-1</base></article><article link="properties-view.html">
 	<title>Take control of your properties</title>
 	<date>May 20, 2003</date>
-	<category>platform</category>
+	<category>Platform</category>
 	<author>
 		<name>Dicky Johan</name>
 		<email>dicky.johan@broadvision.com</email>
@@ -913,8 +951,8 @@
 <base>/articles/Article-Properties-View</base></article><article link="article.html">
 	<title>How to Correctly and Uniformly Use Progress Monitors</title>
 	<date>January 18, 2006</date>
-	<category>platform</category>
-	<category>general</category>
+	<category>Platform</category>
+	
 	<author>
 		<name>
 			<![CDATA[Kenneth &Ouml;lwing]]>
@@ -936,8 +974,10 @@
 <base>/articles/Article-Progress-Monitors</base></article><article link="preferences.htm">
 	<title>Preferences in the Eclipse Workbench UI</title>
 	<date>August 15, 2002</date>
-	<category>platform</category>
-	<category>general</category>
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Preferences</category>
+	
 	<author>
 		<name>Tod Creasey</name>
 		<company>IBM</company>
@@ -952,7 +992,8 @@
 <base>/articles/Article-Preferences</base></article><article link="sourceforge.html">
 	<title>Plugging into SourceForge.net</title>
 	<date>October 15, 2005</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
 	<author>
 		<name>David Biesack</name>
 		<company>SAS</company>
@@ -970,8 +1011,10 @@
 <base>/articles/Article-Plugging-into-SourceForge</base></article><article link="plugin_architecture.html">
 	<title>Notes on the Eclipse Plug-in Architecture</title>
 	<date>July 3, 2003</date>
-	<category>platform</category>
-	<category>general</category>
+	
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Azad Bolour</name>
 		<company>Bolour Computing</company>
@@ -989,8 +1032,10 @@
 <base>/articles/Article-Plug-in-architecture</base></article><article link="PDE-intro.html">
 	<title>PDE Does Plug-ins</title>
 	<date>September 8, 2003</date>
-	<category>general</category>
-	<category>pde</category>
+	
+	<category>PDE</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Wassim Melhem</name>
 		<company>IBM</company>
@@ -1010,9 +1055,13 @@
 <base>/articles/Article-PDE-does-plugins</base></article><article link="automation.html">
 	<title>Build and Test Automation for plug-ins and features</title>
 	<date>May 29, 2005</date>
-	<category>general</category>
-	<category>build</category>
-	<category>pde</category>
+	
+	<category>Build</category>
+	<category>PDE</category>
+	<category>Plug-ins</category>
+	<category>Building</category>
+	<category>Test and performance</category>
+	
 	<author>
 		<name>Markus Barchfeld</name>
 		<company>Zuehlke Engineering</company>
@@ -1032,9 +1081,11 @@
 <base>/articles/Article-PDE-Automation</base></article><article link="help1.htm">
 	<title>Help Part 1: Contributing a Little Help</title>
 	<date>August 9, 2002</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>help</category>
+	
+	<category>Platform</category>
+	<category>Help</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Greg Adams</name>
 		<company>IBM</company>
@@ -1056,9 +1107,11 @@
 		has been replaced with a new version for Eclipse 2.1 -->
 	<title>Help Part 1: Contributing a Little Help</title>
 	<date>May 28, 2001</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>help</category>
+	
+	<category>Platform</category>
+	<category>Help</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Greg Adams</name>
 		<company>IBM</company>
@@ -1080,8 +1133,8 @@
 		Mutatis mutandis - Using Preference Pages as Property Pages
 	</title>
 	<date>October 24, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Berthold Daum</name>
 		<company>bdaum industrial communications</company>
@@ -1102,8 +1155,8 @@
 <base>/articles/Article-Mutatis-mutandis</base></article><article link="monitorArticle.html">
 	<title>Building Administrative Applications in Eclipse</title>
 	<date>November 12, 2004</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Doina Klinger</name>
 		<email>dklinger@uk.ibm.com</email>
@@ -1134,8 +1187,8 @@
 		tasks
 	</title>
 	<date>April 1, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>
@@ -1157,8 +1210,8 @@
 		Eclipse Platform
 	</title>
 	<date>March 25, 2001</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Jim Amsden</name>
 		<company>IBM</company>
@@ -1178,8 +1231,11 @@
 <base>/articles/Article-Levels-Of-Integration</base></article><article link="launch.html">
 	<title>We Have Lift-off: The Launching Framework in Eclipse</title>
 	<date>January 8, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
+	<category>Debugging</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Joe Szurszewski</name>
 		<company>IBM</company>
@@ -1199,8 +1255,8 @@
 	</title>
 	<date>April 12, 2006</date>
 	<category>ltk</category>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Leif Frenzel</name>
 		<company>Innoopract</company>
@@ -1217,7 +1273,10 @@
 <base>/articles/Article-LTK</base></article><article link="launching-java.html">
 	<title>Launching Java Applications Programmatically</title>
 	<date>August 26, 2003</date>
-	<category>general</category>
+	
+	<category>Java</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Darin Wright</name>
 		<company>IBM</company>
@@ -1239,9 +1298,9 @@
 	<update>
 		<date>January 18, 2006</date>
 	</update>
-	<category>ui</category>
-	<category>jface</category>
-	<category>platform</category>
+	<category>User interface</category>
+	<category>JFace</category>
+	<category>Platform</category>
 	<author>
 		<name>Doina Klinger</name>
 		<email>dklinger@uk.ibm.com</email>
@@ -1261,10 +1320,11 @@
 		<date>May 31, 2004</date>
 		<reason>for EMF 2.0 (Eclipse 3.0)</reason>
 	</update>
-	<category>modeling</category>
-	<category>tutorial</category>
-	<category>jet</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>Tutorial</category>
+	<category>JET</category>
+	<category>EMF</category>
+	<category>Plug-ins</category>
 	<author>
 		<name>Remko Popma</name>
 		<email>remko.popma@azzurri.jp</email>
@@ -1289,10 +1349,10 @@
 		<date>May 31, 2004</date>
 		<reason>for EMF 2.0 (Eclipse 3.0)</reason>
 	</update>
-	<category>modeling</category>
-	<category>tutorial</category>
-	<category>jet</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>Tutorial</category>
+	<category>JET</category>
+	<category>EMF</category>
 	<author>
 		<name>Remko Popma</name>
 		<email>remko.popma@azzurri.jp</email>
@@ -1313,8 +1373,9 @@
 <base>/articles/Article-JET</base></article><article link="article.html">
 	<title>Introducing the GMF Runtime</title>
 	<date>January 16, 2006</date>
-	<category>gmf</category>
-	<category>modeling</category>
+	<category>GMF</category>
+	<category>Modeling</category>
+	<category>Plug-ins</category>
 	<author>
 		<name>Frederic Plante</name>
 		<company>IBM</company>
@@ -1335,9 +1396,11 @@
 <base>/articles/Article-Introducing-GMF</base></article><article link="how2I18n.html">
 	<title>How to Internationalize your Eclipse Plug-In</title>
 	<date>August 23, 2002</date>
-	<category>platform</category>
-	<category>general</category>
-	<category>rcp</category>
+	<category>Platform</category>
+	<category>RCP</category>
+	<category>Plug-ins</category>
+	<category>Internationalization</category>
+
 	<author>
 		<name>Dan Kehn</name>
 		<company>IBM</company>
@@ -1355,14 +1418,15 @@
 		for the international market. We'll begin with a brief review of
 		the motivations and technical challenges of
 		internationalization, followed by step-by-step instructions of
-		how to internationalize your Eclipse plug-in. [Editor's note:
-		This article reflects Eclipse release 2.0.]
+		how to internationalize your Eclipse plug-in.
 	</description>
 <base>/articles/Article-Internationalization</base></article><article link="Image_viewer.html">
 	<title>A Basic Image Viewer</title>
 	<date>March 15, 2004</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Chengdong Li</name>
 		<email>cdli@ccs.uky.edu</email>
@@ -1384,8 +1448,8 @@
 		Building a Database Schema Diagram Editor with GEF
 	</title>
 	<date>September 27, 2004</date>
-	<category>modeling</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>GEF</category>
 	<author>
 		<name>Phil Zoio</name>
 		<company>Realsolve Solutions Ltd.</company>
@@ -1403,9 +1467,9 @@
 <base>/articles/Article-GEF-editor</base></article><article link="GEF-dnd.html">
 	<title>Using Native Drag and Drop with GEF</title>
 	<date>August 25, 2003</date>
-	<category>modeling</category>
-	<category>ui</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>User interface</category>
+	<category>GEF</category>
 	<author>
 		<name>Eric Bordeau</name>
 		<company>IBM</company>
@@ -1432,8 +1496,8 @@
 		</author>
 	</translation>
 	<date>December 8, 2004</date>
-	<category>modeling</category>
-	<category>gef</category>
+	<category>Modeling</category>
+	<category>GEF</category>
 	<author>
 		<name>Bo Majewski</name>
 		<company>Cisco Systems, Inc.</company>
@@ -1454,9 +1518,9 @@
 <base>/articles/Article-GEF-diagram-editor</base></article><article link="gef-emf.html">
 	<title>Using GEF with EMF</title>
 	<date>June 8, 2005</date>
-	<category>modeling</category>
-	<category>gef</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>GEF</category>
+	<category>EMF</category>
 	<author>
 		<name>Chris Aniszczyk</name>
 		<company>IBM</company>
@@ -1476,8 +1540,12 @@
 <base>/articles/Article-GEF-EMF</base></article><article link="GEF-Draw2d.html">
 	<title>Display a UML Diagram using Draw2D</title>
 	<date>August 25, 2003</date>
-	<category>modeling</category>
-	<category>gef</category>
+	
+	<category>Modeling</category>
+	<category>GEF</category>
+	<category>Draw 2D</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>Daniel Lee</name>
 		<company>IBM</company>
@@ -1494,9 +1562,9 @@
 <base>/articles/Article-GEF-Draw2d</base></article><article link="article.html">
 	<title>From Front End To Code - MDSD in Practice</title>
 	<date>June 15, 2006</date>
-	<category>modeling</category>
-	<category>emf</category>
-	<category>gmf</category>
+	<category>Modeling</category>
+	<category>EMF</category>
+	<category>GMF</category>
 	<author>
 		<name>Markus Voelter</name>
 	</author>
@@ -1523,9 +1591,9 @@
 <base>/articles/Article-FromFrontendToCode-MDSDInPractice</base></article><article link="article.html">
 	<title>Eclipse Forms: Rich UI for the Rich Client</title>
 	<date>January 16, 2006</date>
-	<category>general</category>
-	<category>ui</category>
-	<category>rcp</category>
+	
+	<category>User interface</category>
+	<category>RCP</category>
 	<author>
 		<name>Dejan Glozic</name>
 		<company>IBM</company>
@@ -1543,8 +1611,8 @@
 <base>/articles/Article-Forms</base></article><article link="folding.html">
 	<title>Folding in Eclipse Text Editors</title>
 	<date>March 11, 2005</date>
-	<category>platform</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>User interface</category>
 	<author>
 		<name>Prashant Deva</name>
 		<email>prashant.deva@gmail.com</email>
@@ -1559,8 +1627,8 @@
 <base>/articles/Article-Folding-in-Eclipse-Text-Editors</base></article><article link="field_editors.html">
 	<title>Simplifying Preference Pages with Field Editors</title>
 	<date>August 21, 2002</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
 	<author>
 		<name>Ryan Coopero</name>
 		<company>IBM</company>
@@ -1576,8 +1644,11 @@
 <base>/articles/Article-Field-Editors</base></article><article link="EditorContributor.html" show="false">
 	<title>Editor Contributors - A Distinct Species</title>
 	<date>January 16, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+	
+	<category>Platform</category>
+	<category>Plug-ins</category>
+	<category>Editors</category>
+	
 	<author>
 		<name>Dejan Glozic</name>
 		<email>dejan@ca.ibm.com</email>
@@ -1586,7 +1657,7 @@
 	<description>
 		Why are Eclipse desktop editors using a distinct contribution
 		mechanism instead of simply doing it directly from editors?
-		Eclipse platform desktop offers various ways a plugin can
+		Eclipse platform desktop offers various ways a plug-in can
 		contribute to menus and tool bars. The most natural way for
 		views is to contribute directly (if you own the view, that is).
 		However, editors are somewhat special - their contributors are
@@ -1599,9 +1670,9 @@
 <base>/articles/Article-EditorContributor</base></article><article link="article.html">
 	<title>Creating Database Web Applications with Eclipse</title>
 	<date>April 10, 2006</date>
-	<category>webtools</category>
-	<category>derby</category>
-	<category>tutorial</category>
+	<category>Web tools</category>
+	<category>Derby</category>
+	<category>Tutorial</category>
 	<author>
 		<name>Stephen Schaub</name>
 		<company>
@@ -1618,9 +1689,9 @@
 <base>/articles/Article-EclipseDbWebapps</base></article><article link="rcp.html">
 	<title>EMF goes RCP</title>
 	<date>October 12, 2004</date>
-	<category>modeling</category>
-	<category>rcp</category>
-	<category>emf</category>
+	<category>Modeling</category>
+	<category>RCP</category>
+	<category>EMF</category>
 	<author>
 		<name>Marcelo Paternostro</name>
 		<company>IBM</company>
@@ -1634,32 +1705,34 @@
 <base>/articles/Article-EMF-goes-RCP</base></article><article link="decorators.html">
 	<title>Understanding Decorators in Eclipse</title>
 	<date>January 16, 2003</date>
-	<category>general</category>
-	<category>platform</category>
+
+	<category>Platform</category>
+	<category>Decorators</category>
+	<category>Resources</category>
+	<category>Plug-ins</category>
+
 	<author>
 		<name>Balaji Krish-Sampath</name>
 		<company>IBM</company>
 	</author>
 	<description>
-		<![CDATA[Decorators, as the name suggests, are used for
+		Decorators, as the name suggests, are used for
 		adorning/annotating resources with useful information.
 		Decorators can be used by plug-ins to convey more information
 		about a resource and other objects displayed in different
-		workbench views. This article, with the help of a simple plug-in 
-		example, will illustrate the steps involved in decorating resources, 
-		along with some best practice approaches for decorating resources.
-		Finally, we will discuss performance issues that may arise when
-		enabling decorators, and briefly go over the new lightweight decorators
-		found in Eclipse 2.1.
-		<p>
-			We assume the reader already has a basic understanding of
-			Eclipse and knows how to create simple plug-ins.]]>
+		workbench views. This article, with the help of a simple plug-in
+		example, will illustrate the steps involved in decorating
+		resources, along with some best practice approaches for
+		decorating resources. Finally, we will discuss performance
+		issues that may arise when enabling decorators, and briefly go
+		over the new lightweight decorators found in Eclipse 2.1.
 	</description>
 <base>/articles/Article-Decorators</base></article><article link="how-to.html">
 	<title>How to Write an Eclipse Debugger</title>
 	<date>August 27, 2004</date>
-	<category>general</category>
-	<category>cvs</category>
+	
+	<category>CVS</category>
+	<category>Debugging</category>
 	<author>
 		<name>Darin Wright</name>
 		<company>IBM</company>
@@ -1680,10 +1753,11 @@
 <base>/articles/Article-Debugger</base></article><article link="jobs-api.html">
 	<title>On the Job: The Eclipse Jobs API</title>
 	<date>September 20, 2004</date>
-	<category>general</category>
-	<category>platform</category>
-	<category>concurrency</category>
-	<category>resources</category>
+	
+	<category>Platform</category>
+	<category>Jobs</category>
+	<category>Resources</category>
+	
 	<author>
 		<name>Michael Valenta</name>
 		<company>IBM</company>
@@ -1700,8 +1774,8 @@
 <base>/articles/Article-Concurrency</base></article><article link="eclipse_branch.html">
 	<title>Branching with Eclipse and CVS</title>
 	<date>July 3, 2003</date>
-	<category>general</category>
-	<category>cvs</category>
+	
+	<category>CVS</category>
 	<author>
 		<name>Paul Glezen</name>
 		<company>IBM</company>
@@ -1719,8 +1793,12 @@
 <base>/articles/Article-CVS-branching</base></article><article link="builders.html">
 	<title>Project Builders and Natures</title>
 	<date>January 27, 2003</date>
-	<category>general</category>
-	<category>workbench</category>
+	
+	<category>Workbench</category>
+	<category>Builders</category>
+	<category>Natures</category>
+	<category>Plug-ins</category>
+	
 	<author>
 		<name>John Arthorne</name>
 		<company>IBM</company>
@@ -1745,7 +1823,7 @@
 <base>/articles/Article-Builders</base></article><article link="branding-your-application.html">
 	<title>Branding Your Application</title>
 	<date>September 16, 2004</date>
-	<category>rcp</category>
+	<category>RCP</category>
 	<author>
 		<name>Andrew Eidsness</name>
 		<company>IBM</company>
@@ -1764,7 +1842,7 @@
 <base>/articles/Article-Branding</base></article><article link="AuthoringWithEclipse.html">
 	<title>Authoring with Eclipse</title>
 	<date>December 14, 2005</date>
-	<category>general</category>
+	
 	<author>
 		<name>Chris Aniszczyk</name>
 		<company>IBM</company>
@@ -1786,8 +1864,8 @@
 <base>/articles/Article-Authoring-With-Eclipse</base></article><article link="ActiveX%20Support%20in%20SWT.html">
 	<title>ActiveX Support In SWT</title>
 	<date>March 22, 2001</date>
-	<category>swt</category>
-	<category>ui</category>
+	<category>SWT</category>
+	<category>User interface</category>
 	<category>integration</category>
 	<author>
 		<name>Veronika Irvine</name>
@@ -1804,7 +1882,10 @@
 <base>/articles/Article-ActiveX Support in SWT</base></article><article link="accessibility.html">
 	<title>Designing Accessible Plug-ins in Eclipse</title>
 	<date>May 20, 2003</date>
-	<category>general</category>
+	
+	<category>Plug-ins</category>
+	<category>Accessibility</category>
+	
 	<author>
 		<name>Tod Creasey</name>
 		<company>IBM</company>
@@ -1824,10 +1905,13 @@
 	</description>
 <base>/articles/Article-Accessibility</base></article><article link="eclipse-api-usage-rules.html">
 	<title>How to Use the Eclipse API</title>
+	
+	<category>Plug-ins</category>
+	
 	<update>
 		<date>May 18, 2001</date>
 	</update>
-	<category>general</category>
+	
 	<author>
 		<name><![CDATA[Jim des Rivi&egrave;res]]></name>
 		<company>IBM</company>

diff --git a/categories.xml b/categories.xml
index 306a002..03743b3 100644
--- a/categories.xml
+++ b/categories.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <categories version="1.0">
-	<category id="whitepaper">
+	<category id="Whitepaper">
 		<title>Whitepapers</title>
 		<description/>
 	</category>
@@ -12,7 +12,7 @@
 			in the last year.</description>
 	</category>
 	
-	<category id="rcp">
+	<category id="RCP">
 		<title>Eclipse Rich Client Platform (RCP)</title>
 		<description>
 			<![CDATA[
@@ -23,7 +23,7 @@
 		</description>
 	</category>
 	
-	<category id="ui">
+	<category id="User interface">
 		<title>User Interface</title>
 		<description>
 			<![CDATA[
@@ -34,7 +34,7 @@
 		</description>
 	</category>
 	
-	<category id="swt">
+	<category id="SWT">
 		<title>Standard Widget Toolkit (SWT)</title>
 		<description>
 			<![CDATA[
@@ -44,17 +44,17 @@
 		</description>
 	</category>
 	
-	<category id="emf">
+	<category id="EMF">
 		<title>Eclipse Modeling Framework (EMF)</title>
 		<description/>
 	</category>
 	
-	<category id="gef">
+	<category id="GEF">
 		<title>Graphical Editing Framework (GEF)</title>
 		<description/>
 	</category>
 		
-	<category id="gmf">
+	<category id="GMF">
 		<title>Graphical Modeling Framework (GMF)</title>
 		<description>
 			<![CDATA[
@@ -63,13 +63,8 @@
 			]]>
 		</description>
 	</category>
-
-	<category id="general">
-		<title>General</title>
-		<description/>
-	</category>
 	
-	<category id="tutorial">
+	<category id="Tutorial">
 		<title>Tutorials</title>
 		<description/>
 	</category>

diff --git a/swt-design-2/about.xml b/swt-design-2/about.xml
index 9ae15b8..1c21475 100644
--- a/swt-design-2/about.xml
+++ b/swt-design-2/about.xml

@@ -4,8 +4,8 @@
 		System Resources
 	</title>
 	<date>November 27, 2001</date>
-	<category>ui</category>
-	<category>swt</category>
+	<category>User interface</category>
+	<category>SWT</category>
 	<author>
 		<name>Carolyn MacLeod</name>
 		<company>IBM</company>

diff --git a/using-perspectives/about.xml b/using-perspectives/about.xml
index 74ddecd..bb0e961 100644
--- a/using-perspectives/about.xml
+++ b/using-perspectives/about.xml

@@ -1,9 +1,9 @@
 <article link="PerspectiveArticle.html">
 	<title>Using Perspectives in the Eclipse UI</title>
 	<date>August 27, 2001</date>
-	<category>platform</category>
-	<category>rcp</category>
-	<category>general</category>
+	<category>Platform</category>
+	<category>RCP</category>
+	
 	<author>
 		<name>Dave Springgay</name>
 		<company>IBM</company>

diff --git a/viewArticle/about.xml b/viewArticle/about.xml
index c6dd0fa..2411e7e 100644
--- a/viewArticle/about.xml
+++ b/viewArticle/about.xml

@@ -1,10 +1,10 @@
 <article link="ViewArticle2.html">
 	<title>Creating an Eclipse View</title>
 	<date>November 2, 2001</date>
-	<category>platform</category>
-	<category>jface</category>
-	<category>rcp</category>
-	<category>ui</category>
+	<category>Platform</category>
+	<category>JFace</category>
+	<category>RCP</category>
+	<category>User interface</category>
 	<author>
 		<name>Dave Springgay</name>
 		<company>IBM</company>
commit	f46f44d1f7be8b23d08926a34163d01fe1cc3a99	[log] [tgz]
author	wbeaton <wbeaton>	Tue Aug 01 17:46:01 2006 +0000
committer	wbeaton <wbeaton>	Tue Aug 01 17:46:01 2006 +0000
tree	e30c57df24fd216db4b1013ba4ee844e3f24e141
parent	495191e71bf92e2e26f843d17dfb36e8902b9639 [diff]