2005-09-01 Chris Toshok <[email protected]>

	* Button.cs, ButtonField.cs, FontInfo.cs, Style.cs, Xml.cs,
	CommandField.cs, HyperLinkColumn.cs, Table.cs,
	RegularExpressionValidator.cs, DataGridPagerStyle.cs, Label.cs,
	CheckBox.cs, RadioButton.cs, TableStyle.cs, ListControl.cs,
	Image.cs, BaseCompareValidator.cs, BaseDataList.cs, DataList.cs,
	TemplateColumn.cs, RangeValidator.cs, ImageField.cs,
	BaseValidator.cs, CustomValidator.cs, TextBox.cs,
	ButtonFieldBase.cs, BoundField.cs, CheckBoxList.cs,
	RadioButtonList.cs, RequiredFieldValidator.cs, AdRotator.cs,
	Repeater.cs, DropDownList.cs, CheckBoxField.cs, HyperLink.cs,
	XmlDataSource.cs, Panel.cs, DataGrid.cs, ButtonColumn.cs,
	CompareValidator.cs, Calendar.cs, ListBox.cs, TableCell.cs,
	WebControl.cs, Literal.cs, ValidationSummary.cs, ImageButton.cs,
	TableRow.cs, LinkButton.cs, DataGridColumn.cs, BoundColumn.cs,
	TableItemStyle.cs: Add some WebCategory and WebSysDescription
	attributes.


svn path=/trunk/mcs/; revision=49301

mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs

@@ -193,6 +193,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue("")]
 		[Editor("System.Web.UI.Design.XmlUrlEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+		[WebSysDescription("")]
+		[WebCategory("Behavior")]
 		public string AdvertisementFile {
 			get {
 				return ad_file;
@@ -205,6 +207,8 @@ namespace System.Web.UI.WebControls {
 
 #if NET_2_0
 		[DefaultValue ("AlternateText")]
+		[WebSysDescriptionAttribute ("")]
+		[WebCategoryAttribute ("Behavior")]
 		[MonoTODO]
 		public string AlternateTextField 
 		{
@@ -229,6 +233,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[DefaultValue ("ImageUrl")]
 		[MonoTODO]
+		[WebSysDescriptionAttribute ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public string ImageUrlField 
 		{
 			get {
@@ -243,6 +249,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription("")]
+		[WebCategory("Behavior")]
 		public string KeywordFilter {
 			get {
 				return ViewState.GetString ("KeywordFilter", "");
@@ -256,6 +264,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[DefaultValue ("NavigateUrl")]
 		[MonoTODO]
+		[WebSysDescriptionAttribute ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public string NavigateUrlField 
 		{
 			get {
@@ -282,6 +292,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue("_top")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.TargetConverter))]
+		[WebSysDescription("")]
+		[WebCategory("Behavior")]
 		public string Target {
 			get {
 				return ViewState.GetString ("Target", "_top");
@@ -325,7 +337,11 @@ namespace System.Web.UI.WebControls {
 			if (h != null)
 				h (this, e);
 		}
+
 		static readonly object AdCreatedEvent = new object ();
+
+		[WebSysDescription("")]
+		[WebCategory("Action")]
 		public event AdCreatedEventHandler AdCreated {
 			add { Events.AddHandler (AdCreatedEvent, value); }
 			remove { Events.RemoveHandler (AdCreatedEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs

@@ -211,6 +211,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue(ValidationDataType.String)]
+		[WebSysDescription("")]
+		[WebCategory("Behavior")]
 		public ValidationDataType Type {
 			get {
 				return type;

mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs

@@ -63,6 +63,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Accessibility")]
 		public virtual string Caption {
 			get {
 				object o = ViewState ["Caption"];
@@ -94,6 +96,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (-1)]
+		[WebSysDescription("")]
+		[WebCategory("Layout")]
 		public virtual int CellPadding {
 			get {
 				if (!ControlStyleCreated)
@@ -107,6 +111,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (0)]
+		[WebSysDescription("")]
+		[WebCategory("Layout")]
 		public virtual int CellSpacing {
 			get {
 				if (!ControlStyleCreated)
@@ -128,6 +134,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		[MonoTODO ("incomplete")]
+		[WebSysDescription("")]
+		[WebCategory("Data")]
 		public virtual string DataKeyField {
 			get {
 				object o = ViewState ["DataKeyField"];
@@ -143,6 +151,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription("")]
+		[WebCategory("Data")]
 		public DataKeyCollection DataKeys {
 			get {
 				if (keycoll == null) {
@@ -165,6 +175,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription("")]
+		[WebCategory("Data")]
 		public string DataMember {
 			get {
 				object o = ViewState ["DataMember"];
@@ -188,6 +200,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription("")]
+		[WebCategory("Data")]
 		public virtual object DataSource {
 			get { return source; }
 			set {
@@ -217,6 +231,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (GridLines.Both)]
+		[WebSysDescription("")]
+		[WebCategory("Appearance")]
 		public virtual GridLines GridLines {
 			get {
 				if (!ControlStyleCreated)
@@ -231,6 +247,7 @@ namespace System.Web.UI.WebControls {
 #endif
 		[Category ("Layout")]
 		[DefaultValue (HorizontalAlign.NotSet)]
+		[WebSysDescription("")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if (!ControlStyleCreated)
@@ -436,6 +453,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 
+		[WebSysDescription("")]
+		[WebCategory("Action")]
 		public event EventHandler SelectedIndexChanged {
 			add { Events.AddHandler (selectedIndexChangedEvent, value); }
 			remove { Events.RemoveHandler (selectedIndexChangedEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs

@@ -108,6 +108,8 @@ namespace System.Web.UI.WebControls {
 #endif
 		[TypeConverter(typeof(System.Web.UI.WebControls.ValidatedControlConverter))]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string ControlToValidate {
 			get {
 				return ViewState.GetString ("ControlToValidate", String.Empty);
@@ -124,6 +126,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(ValidatorDisplay.Static)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public ValidatorDisplay Display {
 			get {
 				return (ValidatorDisplay)ViewState.GetInt ("Display", (int)ValidatorDisplay.Static);
@@ -137,6 +141,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public bool EnableClientScript {
 			get {
 				return ViewState.GetBool ("EnableClientScript", true);
@@ -162,6 +168,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string ErrorMessage {
 			get {
 				return ViewState.GetString ("ErrorMessage", String.Empty);
@@ -188,6 +196,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual bool IsValid {
 			get {
 				return valid;

mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs

@@ -41,6 +41,8 @@ namespace System.Web.UI.WebControls {
 		public static readonly string thisExpr = "!";
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string DataField 
 		{
 			get {
@@ -52,6 +54,8 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string DataFormatString 
 		{
 			get {
@@ -63,6 +67,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual bool ReadOnly 
 		{
 			get {

mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs

@@ -47,6 +47,7 @@ namespace System.Web.UI.WebControls {
 		PropertyDescriptor boundProperty;
 		
 		[DefaultValueAttribute (true)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ConvertEmptyStringToNull {
 			get {
@@ -61,6 +62,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
 		public virtual string DataField {
@@ -76,6 +78,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Data")]
 		public virtual string DataFormatString {
 			get {
@@ -103,8 +106,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Behavior")]
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public bool ReadOnly {
 			get {
 				object val = ViewState ["ReadOnly"];
@@ -116,8 +120,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("HtmlEncode")]
 		[DefaultValueAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("HtmlEncode")]
 		public virtual bool HtmlEncode {
 			get {
 				object val = ViewState ["HtmlEncode"];

mcs/class/System.Web/System.Web.UI.WebControls/Button.cs

@@ -53,6 +53,8 @@ namespace System.Web.UI.WebControls {
 #if ONLY_1_1
 		[Bindable (false)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		[DefaultValue (true)]
 #if NET_2_0
 		[Themeable (false)]
@@ -72,6 +74,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue ("")]
 		[Bindable (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -88,6 +92,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -107,6 +113,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 		[DefaultValue ("")]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string OnClientClick 
 		{
 			get {
@@ -121,6 +129,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue ("")]
 		[Bindable (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 #if NET_2_0
 		[Localizable (true)]
 		public virtual
@@ -140,6 +150,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (true)]
 		[Themeable (false)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual bool UseSubmitBehavior 
 		{
 			get {
@@ -229,6 +241,8 @@ namespace System.Web.UI.WebControls {
 			base.RenderContents (writer);
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler Click
 		{
 			add {
@@ -239,6 +253,8 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event CommandEventHandler Command
 		{
 			add {
@@ -266,6 +282,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue ("")]
 		[Themeable (false)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public string ValidationGroup {
 			get {
 				return ViewState.GetString ("ValidationGroup", "");

mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumn.cs

@@ -34,6 +34,7 @@ namespace System.Web.UI.WebControls {
 		       
 		[DefaultValue(ButtonColumnType.LinkButton)]
 		[Description("The type of button contained within the column.")]
+		[WebCategory ("Misc")]
 		public virtual ButtonColumnType ButtonType
 		{
 			get {
@@ -47,6 +48,7 @@ namespace System.Web.UI.WebControls {
 		
 		[DefaultValue("")]
 		[Description("The command associated with the button.")]
+		[WebCategory ("Misc")]
 		public virtual string CommandName
 		{
 			get {
@@ -59,6 +61,7 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue("")]
 		[Description("The field bound to the text property of the button.")]
+		[WebCategory ("Misc")]
 		public virtual string DataTextField 
 		{
 			get {
@@ -71,6 +74,7 @@ namespace System.Web.UI.WebControls {
 		
 		[DefaultValue("")]
 		[Description("The formatting applied to the value bound to the Text property.")]
+ 		[WebCategory ("Misc")]
 		public virtual string DataTextFormatString 
 		{
 			get {
@@ -84,6 +88,7 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue("")]
 		[Description("The text used for the button.")]
+		[WebCategory ("Misc")]
 		public virtual string Text 
 		{
 			get {

mcs/class/System.Web/System.Web.UI.WebControls/ButtonField.cs

@@ -44,8 +44,9 @@ namespace System.Web.UI.WebControls {
 	{
 		PropertyDescriptor boundProperty;
 
-	    [WebCategoryAttribute ("Behavior")]
-	    [DefaultValueAttribute ("")]
+		[DefaultValueAttribute ("")]
+		[WebSysDescription ("Raised when a Button Command is executed.")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string CommandName {
 			get {
 				object ob = ViewState ["CommandName"];
@@ -58,9 +59,10 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-	    [WebCategoryAttribute ("Data")]
-	    [DefaultValueAttribute ("")]
+		[DefaultValueAttribute ("")]
 		[TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataTextField {
 			get {
 				object ob = ViewState ["DataTextField"];
@@ -73,8 +75,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-	    [WebCategoryAttribute ("Data")]
-	    [DefaultValueAttribute ("")]
+		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataTextFormatString {
 			get {
 				object ob = ViewState ["DataTextFormatString"];
@@ -87,10 +90,11 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-	    [WebCategoryAttribute ("Appearance")]
-	    [DefaultValueAttribute ("")]
-	    [UrlPropertyAttribute]
+		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
+		[DefaultValueAttribute ("")]
+		[UrlPropertyAttribute]
 		public virtual string ImageUrl {
 			get {
 				object ob = ViewState ["ImageUrl"];
@@ -103,9 +107,10 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 		
-	    [LocalizableAttribute (true)]
-	    [WebCategoryAttribute ("Appearance")]
-	    [DefaultValueAttribute ("")]
+		[LocalizableAttribute (true)]
+		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string Text {
 			get {
 				object ob = ViewState ["Text"];

mcs/class/System.Web/System.Web.UI.WebControls/ButtonFieldBase.cs

@@ -41,8 +41,9 @@ namespace System.Web.UI.WebControls {
 	[AspNetHostingPermissionAttribute (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public abstract class ButtonFieldBase : DataControlField
 	{
-		[WebCategoryAttribute ("Appearance")]
 		[DefaultValueAttribute (ButtonType.Link)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual ButtonType ButtonType {
 			get {
 				object ob = ViewState ["ButtonType"];
@@ -56,6 +57,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool CausesValidation {
 			get {
@@ -69,8 +71,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Behavior")]
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public override bool ShowHeader {
 			get {
 				object val = ViewState ["showHeader"];
@@ -82,8 +85,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Behavior")]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string ValidationGroup {
 			get {
 				object ob = ViewState ["ValidationGroup"];

mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs

@@ -78,6 +78,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string Caption 
 		{
 			get {
@@ -89,6 +91,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue (TableCaptionAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Accessibility")]
 		public virtual TableCaptionAlign CaptionAlign 
 		{
 			get {
@@ -104,6 +108,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(2)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public int CellPadding {
 			get {
 				return ViewState.GetInt ("CellPadding", 2);
@@ -121,6 +127,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public int CellSpacing {
 			get {
 				return ViewState.GetInt ("CellSpacing", 0);
@@ -137,6 +145,8 @@ namespace System.Web.UI.WebControls {
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[NotifyParentProperty(true)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle DayHeaderStyle {
 			get {
 				if (dayHeaderStyle == null)
@@ -153,6 +163,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(DayNameFormat.Short)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public DayNameFormat DayNameFormat {
 			get {
 				return (DayNameFormat) ViewState.GetInt ("DayNameFormat", (int) DayNameFormat.Short);
@@ -171,6 +183,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle DayStyle {
 			get {
 				if (dayStyle == null)
@@ -187,6 +201,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(FirstDayOfWeek.Default)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public FirstDayOfWeek FirstDayOfWeek {
 			get {
 				return (FirstDayOfWeek) ViewState.GetInt ("FirstDayOfWeek", (int) FirstDayOfWeek.Default);
@@ -208,6 +224,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string NextMonthText {
 			get {
 				return ViewState.GetString ("NextMonthText", ">");
@@ -222,6 +240,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(NextPrevFormat.CustomText)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public NextPrevFormat NextPrevFormat {
 			get {
 				return (NextPrevFormat) ViewState.GetInt ("NextPrevFormat", (int) NextPrevFormat.CustomText);
@@ -239,6 +259,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle NextPrevStyle {
 			get {
 				if (nextPrevStyle == null)
@@ -255,6 +277,8 @@ namespace System.Web.UI.WebControls {
 		[NotifyParentProperty(true)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle OtherMonthDayStyle {
 			get {
 				if (otherMonthDayStyle == null)
@@ -274,6 +298,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string PrevMonthText {
 			get {
 				return ViewState.GetString ("PrevMonthText", "<");
@@ -290,6 +316,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue("1/1/0001 12:00:00 AM")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public DateTime SelectedDate {
 			get {
 				if (SelectedDates.Count > 0)
@@ -305,6 +333,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public SelectedDatesCollection SelectedDates {
 			get {
 				if (dateList == null)
@@ -321,6 +351,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle SelectedDayStyle {
 			get {
 				if (selectedDayStyle == null)
@@ -337,6 +369,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(CalendarSelectionMode.Day)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public CalendarSelectionMode SelectionMode {
 			get {
 				return (CalendarSelectionMode) ViewState.GetInt ("SelectionMode", (int) CalendarSelectionMode.Day);
@@ -358,6 +392,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string SelectMonthText {
 			get {
 				return ViewState.GetString ("SelectMonthText", ">>");
@@ -371,6 +407,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle SelectorStyle {
 			get {
 				if (selectorStyle == null)
@@ -390,6 +428,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0		
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string SelectWeekText {
 			get {
 				return ViewState.GetString ("SelectWeekText", ">");
@@ -404,6 +444,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public bool ShowDayHeader {
 			get {
 				return ViewState.GetBool ("ShowDayHeader", true);
@@ -418,6 +460,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public bool ShowGridLines {
 			get {
 				return ViewState.GetBool ("ShowGridLines", false);
@@ -432,6 +476,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public bool ShowNextPrevMonth {
 			get {
 				return ViewState.GetBool ("ShowNextPrevMonth", true);
@@ -446,6 +492,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public bool ShowTitle {
 			get {
 				return ViewState.GetBool ("ShowTitle", true);
@@ -460,6 +508,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(TitleFormat.MonthYear)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public TitleFormat TitleFormat {
 			get {
 				return (TitleFormat) ViewState.GetInt ("TitleFormat", (int) TitleFormat.MonthYear);
@@ -477,6 +527,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle TitleStyle {
 			get {
 				if (titleStyle == null)
@@ -493,6 +545,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle TodayDayStyle {
 			get {
 				if (todayDayStyle == null)
@@ -510,6 +564,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public DateTime TodaysDate {
 			get {
 				object obj = ViewState ["TodaysDate"];
@@ -527,6 +583,8 @@ namespace System.Web.UI.WebControls {
 
 #if NET_2_0
 		[DefaultValue (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Accessibility")]
 		public virtual bool UseAccessibleHeader 
 		{
 			get {
@@ -540,6 +598,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("1/1/0001 12:00:00 AM")]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public DateTime VisibleDate {
 			get {
 				object obj = ViewState ["VisibleDate"];
@@ -558,6 +618,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public TableItemStyle WeekendDayStyle {
 			get {
 				if (weekendDayStyle == null)
@@ -1184,6 +1246,8 @@ namespace System.Web.UI.WebControls {
 			return DateTimeFormatInfo.CurrentInfo.Calendar;
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DayRenderEventHandler DayRender
 		{
 			add {
@@ -1194,6 +1258,8 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler SelectionChanged
 		{
 			add {
@@ -1204,6 +1270,8 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event MonthChangedEventHandler VisibleMonthChanged
 		{
 			add {

mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,22 @@
+2005-09-01  Chris Toshok  <[email protected]>
+
+	* Button.cs, ButtonField.cs, FontInfo.cs, Style.cs, Xml.cs,
+	CommandField.cs, HyperLinkColumn.cs, Table.cs,
+	RegularExpressionValidator.cs, DataGridPagerStyle.cs, Label.cs,
+	CheckBox.cs, RadioButton.cs, TableStyle.cs, ListControl.cs,
+	Image.cs, BaseCompareValidator.cs, BaseDataList.cs, DataList.cs,
+	TemplateColumn.cs, RangeValidator.cs, ImageField.cs,
+	BaseValidator.cs, CustomValidator.cs, TextBox.cs,
+	ButtonFieldBase.cs, BoundField.cs, CheckBoxList.cs,
+	RadioButtonList.cs, RequiredFieldValidator.cs, AdRotator.cs,
+	Repeater.cs, DropDownList.cs, CheckBoxField.cs, HyperLink.cs,
+	XmlDataSource.cs, Panel.cs, DataGrid.cs, ButtonColumn.cs,
+	CompareValidator.cs, Calendar.cs, ListBox.cs, TableCell.cs,
+	WebControl.cs, Literal.cs, ValidationSummary.cs, ImageButton.cs,
+	TableRow.cs, LinkButton.cs, DataGridColumn.cs, BoundColumn.cs,
+	TableItemStyle.cs: Add some WebCategory and WebSysDescription
+	attributes.
+
 2005-09-01  Chris Toshok  <[email protected]>
 
 	* AccessDataSource.cs: corcompare work.

mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs

@@ -66,6 +66,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AutoPostBack 
 		{
 			get {
@@ -81,6 +83,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (false)]
 		[Themeable (false)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool CausesValidation 
 		{
 			get { return ViewState.GetBool ("CausesValidation", false); }
@@ -96,6 +100,8 @@ namespace System.Web.UI.WebControls {
 #else		
 		[Bindable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool Checked 
 		{
 			get {
@@ -147,6 +153,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text 
 		{
 			get {
@@ -162,6 +170,8 @@ namespace System.Web.UI.WebControls {
 #if ONLY_1_1
 		[Bindable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual TextAlign TextAlign
 		{
 			get {
@@ -186,6 +196,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public string ValidationGroup
 		{
 			get { return ViewState.GetString ("ValidationGroup", String.Empty); }
@@ -194,6 +206,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 
 		private static readonly object EventCheckedChanged = new object ();
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler CheckedChanged 
 		{
 			add {

mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxField.cs

@@ -77,9 +77,10 @@ namespace System.Web.UI.WebControls {
 			get { return false; }
 		}
 		
-	    [WebCategoryAttribute ("Appearance")]
-	    [LocalizableAttribute (true)]
-	    [DefaultValueAttribute ("")]
+		[LocalizableAttribute (true)]
+		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string Text {
 			get {
 				object ob = ViewState ["Text"];

mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs

@@ -49,6 +49,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int CellPadding {
 			get { return TableStyle.CellPadding; }
 			set { TableStyle.CellPadding = value; }
@@ -58,6 +60,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int CellSpacing {
 			get { return TableStyle.CellSpacing; }
 			set { TableStyle.CellSpacing = value; }
@@ -67,6 +71,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int RepeatColumns {
 			get { return ViewState.GetInt ("RepeatColumns", 0); }
 			set {
@@ -80,6 +86,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(RepeatDirection.Vertical)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatDirection RepeatDirection {
 			get {
 				return (RepeatDirection) ViewState.GetInt ("RepeatDirection",
@@ -97,6 +105,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(RepeatLayout.Table)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatLayout RepeatLayout {
 			get {
 				return (RepeatLayout) ViewState.GetInt ("RepeatLayout",
@@ -114,6 +124,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(TextAlign.Right)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual TextAlign TextAlign {
 			get {
 				return (TextAlign) ViewState.GetInt ("TextAlign",

mcs/class/System.Web/System.Web.UI.WebControls/CommandField.cs

@@ -42,9 +42,10 @@ namespace System.Web.UI.WebControls {
 	public class CommandField : ButtonFieldBase
 	{
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string CancelImageUrl {
 			get {
 				object ob = ViewState ["CancelImageUrl"];
@@ -57,8 +58,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string CancelText {
 			get {
 				object ob = ViewState ["CancelText"];
@@ -85,9 +87,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string DeleteImageUrl {
 			get {
 				object ob = ViewState ["DeleteImageUrl"];
@@ -100,8 +103,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string DeleteText {
 			get {
 				object ob = ViewState ["DeleteText"];
@@ -115,9 +119,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string EditImageUrl {
 			get {
 				object ob = ViewState ["EditImageUrl"];
@@ -130,8 +135,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string EditText {
 			get {
 				object ob = ViewState ["EditText"];
@@ -145,9 +151,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string InsertImageUrl {
 			get {
 				object ob = ViewState ["InsertImageUrl"];
@@ -160,8 +167,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string InsertText {
 			get {
 				object ob = ViewState ["InsertText"];
@@ -175,9 +183,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string NewImageUrl {
 			get {
 				object ob = ViewState ["NewImageUrl"];
@@ -190,8 +199,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string NewText {
 			get {
 				object ob = ViewState ["NewText"];
@@ -205,9 +215,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string SelectImageUrl {
 			get {
 				object ob = ViewState ["SelectImageUrl"];
@@ -220,8 +231,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string SelectText {
 			get {
 				object ob = ViewState ["SelectText"];
@@ -235,6 +247,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValueAttribute (true)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowCancelButton {
 			get {
@@ -249,6 +262,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowDeleteButton {
 			get {
@@ -263,6 +277,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowEditButton {
 			get {
@@ -277,6 +292,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowSelectButton {
 			get {
@@ -291,6 +307,7 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ShowInsertButton {
 			get {
@@ -305,9 +322,10 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-		[WebCategoryAttribute ("Appearance")]
 		[UrlPropertyAttribute]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string UpdateImageUrl {
 			get {
 				object ob = ViewState ["UpdateImageUrl"];
@@ -320,8 +338,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Appearance")]
 		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string UpdateText {
 			get {
 				object ob = ViewState ["UpdateText"];

mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs

@@ -86,6 +86,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue("")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.ValidatedControlConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string ControlToCompare {
 			get {
 				return ViewState.GetString ("ControlToCompare", String.Empty);
@@ -96,6 +98,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue(ValidationCompareOperator.Equal)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public ValidationCompareOperator Operator {
 			get {
 				return (ValidationCompareOperator)ViewState.GetInt ("Operator", (int)ValidationCompareOperator.Equal);
@@ -108,6 +112,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string ValueToCompare {
 			get {
 				return ViewState.GetString ("ValueToCompare", String.Empty);

mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs

@@ -41,6 +41,8 @@ namespace System.Web.UI.WebControls {
 
 		#region Public Instance Properties
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string ClientValidationFunction {
 			get {
 				return ViewState.GetString("ClientValidationFunction", string.Empty);
@@ -92,6 +94,8 @@ namespace System.Web.UI.WebControls {
 		#endregion	// Public Instance Methods
 
 		#region Events
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public event ServerValidateEventHandler ServerValidate;
 		#endregion	// Events
 	}

mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs

@@ -83,24 +83,32 @@ namespace System.Web.UI.WebControls {
 		private PagedDataSource paged_data_source;
 		
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Paging")]
 		public virtual bool AllowCustomPaging {
 			get { return ViewState.GetBool ("AllowCustomPaging", false); }
 			set { ViewState ["AllowCustomPaging"] = value; }
 		}
 
 		[DefaultValue(false)]
+ 		[WebSysDescription ("")]
+		[WebCategory ("Paging")]
 		public virtual bool AllowPaging {
 			get { return ViewState.GetBool ("AllowPaging", false); }
 			set { ViewState ["AllowPaging"] = value; }
 		}
 
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AllowSorting {
 			get { return ViewState.GetBool ("AllowSorting", false); }
 			set { ViewState ["AllowSorting"] = value; }
 		}
 
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AutoGenerateColumns {
 			get { return ViewState.GetBool ("AutoGenerateColumns", true); }
 			set { ViewState ["AutoGenerateColumns"] = value; }
@@ -109,6 +117,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue("")]
 		[Editor("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+ 		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string BackImageUrl {
 			get { return TableStyle.BackImageUrl; }
 			set { TableStyle.BackImageUrl = value; }
@@ -118,6 +128,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public int CurrentPageIndex {
 			get { return ViewState.GetInt ("CurrentPageIndex", 0); }
 			set {
@@ -128,6 +140,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue(-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual int EditItemIndex {
 			get { return ViewState.GetInt ("EditItemIndex", -1); }
 			set {
@@ -139,11 +153,15 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public int PageCount {
 			get { return page_count; }
 		}
 
 		[DefaultValue(10)]
+		[WebSysDescription ("")]
+		[WebCategory ("Paging")]
 		public virtual int PageSize {
 			get { return ViewState.GetInt ("PageSize", 10); }
 			set {
@@ -155,6 +173,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue(-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Paging")]
 		public virtual int SelectedIndex {
 			get { return ViewState.GetInt ("SelectedIndex", -1); }
 			set {
@@ -167,6 +187,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle AlternatingItemStyle {
 			get {
 				if (alt_item_style == null) {
@@ -181,6 +203,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle EditItemStyle {
 			get {
 				if (edit_item_style == null) {
@@ -196,6 +220,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footer_style == null) {
@@ -211,6 +237,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (header_style == null) {
@@ -225,6 +253,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle ItemStyle {
 			get {
 				if (item_style == null) {
@@ -239,6 +269,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle SelectedItemStyle {
 			get {
 				if (selected_style == null) {
@@ -253,6 +285,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual DataGridPagerStyle PagerStyle {
 			get {
 				if (pager_style == null) {
@@ -266,6 +300,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual DataGridItemCollection Items {
 			get {
 				if (items == null) {
@@ -280,6 +316,8 @@ namespace System.Web.UI.WebControls {
 		[Editor ("System.Web.UI.Design.WebControls.DataGridColumnCollectionEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
 		[MergableProperty (false)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual DataGridColumnCollection Columns {
 			get {
 				if (columns == null) {
@@ -344,6 +382,8 @@ namespace System.Web.UI.WebControls {
 		[MonoTODO]
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Paging")]
 		public virtual DataGridItem SelectedItem {
 			get {
 				if (SelectedIndex == -1)
@@ -354,6 +394,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual bool ShowFooter {
 			get { return ViewState.GetBool ("ShowFooter", false); }
 			set { ViewState ["ShowFooter"] = value; }
@@ -361,6 +403,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual bool ShowHeader {
 			get { return ViewState.GetBool ("ShowHeader", true); }
 			set { ViewState ["ShowHeader"] = value; }
@@ -368,6 +412,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int VirtualItemCount {
 			get { return ViewState.GetInt ("VirtualItemCount", 0); }
 			set {
@@ -915,47 +961,65 @@ namespace System.Web.UI.WebControls {
 				handler (this, e);
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridCommandEventHandler CancelCommand {
 			add { Events.AddHandler (CancelCommandEvent, value); }
 			remove { Events.RemoveHandler (CancelCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridCommandEventHandler DeleteCommand {
 			add { Events.AddHandler (DeleteCommandEvent, value); }
 			remove { Events.RemoveHandler (DeleteCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridCommandEventHandler EditCommand {
 			add { Events.AddHandler (EditCommandEvent, value); }
 			remove { Events.RemoveHandler (EditCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridCommandEventHandler ItemCommand {
 			add { Events.AddHandler (ItemCommandEvent, value); }
 			remove { Events.RemoveHandler (ItemCommandEvent, value); }
 			
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridItemEventHandler ItemCreated {
 			add { Events.AddHandler (ItemCreatedEvent, value); }
 			remove { Events.RemoveHandler (ItemCreatedEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridItemEventHandler ItemDataBound {
 			add { Events.AddHandler (ItemDataBoundEvent, value); }
 			remove { Events.RemoveHandler (ItemDataBoundEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridPageChangedEventHandler PageIndexChanged {
 			add { Events.AddHandler (PageIndexChangedEvent, value); }
 			remove { Events.RemoveHandler (PageIndexChangedEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridSortCommandEventHandler SortCommand {
 			add { Events.AddHandler (SortCommandEvent, value); }
 			remove { Events.RemoveHandler (SortCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataGridCommandEventHandler UpdateCommand {
 			add { Events.AddHandler (UpdateCommandEvent, value); }
 			remove { Events.AddHandler (UpdateCommandEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs

@@ -50,6 +50,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual TableItemStyle FooterStyle 
 		{
 			get {
@@ -66,6 +68,8 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string FooterText 
 		{
 			get {
@@ -78,6 +82,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string HeaderImageUrl
 		{
 			get {
@@ -92,6 +98,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual TableItemStyle HeaderStyle 
 		{
 			get {
@@ -108,6 +116,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string HeaderText 
 		{
 			get {
@@ -122,6 +132,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual TableItemStyle ItemStyle 
 		{
 			get {
@@ -138,6 +150,8 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string SortExpression 
 		{
 			get {
@@ -150,6 +164,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public bool Visible 
 		{
 			get {

mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs

@@ -37,6 +37,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(PagerMode.NextPrev)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public PagerMode Mode {
 			get {
 				if ((styles & Styles.Mode) == 0) {
@@ -55,6 +57,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(">")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public string NextPageText {
 			get {
 				if ((styles & Styles.NextPageText) == 0) {
@@ -73,6 +77,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(10)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public int PageButtonCount {
 			get {
 				if ((styles & Styles.PageButtonCount) == 0) {
@@ -95,6 +101,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(PagerPosition.Bottom)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public PagerPosition Position {
 			get {
 				if ((styles & Styles.Position) == 0) {
@@ -113,6 +121,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue("<")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public string PrevPageText {
 			get {
 				if ((styles & Styles.NextPageText) == 0) {
@@ -131,6 +141,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(true)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public bool Visible {
 			get {
 				if ((styles & Styles.Visible) == 0) {

mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs

@@ -104,6 +104,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle AlternatingItemStyle {
 			get {
 				if (alternatingItemStyle == null) {
@@ -120,12 +122,16 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate AlternatingItemTemplate {
 			get { return alternatingItemTemplate; }
 			set { alternatingItemTemplate = value; }
 		}
 
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual int EditItemIndex {
 #if NET_2_0
 			get { return editIndex; }
@@ -151,6 +157,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle EditItemStyle {
 			get {
 				if (editItemStyle == null) {
@@ -167,12 +175,16 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate EditItemTemplate {
 			get { return editItemTemplate; }
 			set { editItemTemplate = value; }
 		}
 
 		[DefaultValue (false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual bool ExtractTemplateRows {
 			get {
 				object o = ViewState ["ExtractTemplateRows"];
@@ -185,6 +197,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle FooterStyle {
 			get {
 				if (footerStyle == null) {
@@ -201,6 +215,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate FooterTemplate {
 			get { return footerTemplate; }
 			set { footerTemplate = value; }
@@ -226,6 +242,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle HeaderStyle {
 			get {
 				if (headerStyle == null) {
@@ -242,6 +260,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate HeaderTemplate {
 			get { return headerTemplate; }
 			set { headerTemplate = value; }
@@ -249,6 +269,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual DataListItemCollection Items {
 			get {
 				if (items == null)
@@ -261,6 +283,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle ItemStyle {
 			get {
 				if (itemStyle == null) {
@@ -277,6 +301,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate ItemTemplate {
 			get { return itemTemplate; }
 			set { itemTemplate = value; }
@@ -286,6 +312,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int RepeatColumns {
 			get {
 				object o = ViewState ["RepeatColumns"];
@@ -298,6 +326,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (RepeatDirection.Vertical)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatDirection RepeatDirection {
 			get {
 				object o = ViewState ["RepeatDirection"];
@@ -310,6 +340,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (RepeatLayout.Table)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatLayout RepeatLayout {
 			get {
 				object o = ViewState ["RepeatLayout"];
@@ -320,6 +352,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable (true)]
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int SelectedIndex {
 #if NET_2_0
 			get { return selectedIndex; }
@@ -343,6 +377,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual DataListItem SelectedItem {
 			get {
 				if (SelectedIndex < 0)
@@ -357,6 +393,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle SelectedItemStyle {
 			get {
 				if (selectedItemStyle == null) {
@@ -373,6 +411,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate SelectedItemTemplate {
 			get { return selectedItemTemplate; }
 			set { selectedItemTemplate = value; }
@@ -382,6 +422,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty (true)]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual TableItemStyle SeparatorStyle {
 			get {
 				if (separatorStyle == null) {
@@ -398,6 +440,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[TemplateContainer (typeof (DataListItem))]
 		[PersistenceMode (PersistenceMode.InnerProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public virtual ITemplate SeparatorTemplate {
 			get { return separatorTemplate; }
 			set { separatorTemplate = value; }
@@ -407,6 +451,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual bool ShowFooter {
 			get {
 				object o = ViewState ["ShowFooter"];
@@ -419,6 +465,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual bool ShowHeader {
 			get {
 				object o = ViewState ["ShowHeader"];
@@ -816,36 +864,50 @@ for (int i=0; i < Items.Count; i++) {
 		}
 
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListCommandEventHandler CancelCommand {
 			add { Events.AddHandler (cancelCommandEvent, value); }
 			remove { Events.RemoveHandler (cancelCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListCommandEventHandler DeleteCommand {
 			add { Events.AddHandler (deleteCommandEvent, value); }
 			remove { Events.RemoveHandler (deleteCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListCommandEventHandler EditCommand {
 			add { Events.AddHandler (editCommandEvent, value); }
 			remove { Events.RemoveHandler (editCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListCommandEventHandler ItemCommand {
 			add { Events.AddHandler (itemCommandEvent, value); }
 			remove { Events.RemoveHandler (itemCommandEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListItemEventHandler ItemCreated {
 			add { Events.AddHandler (itemCreatedEvent, value); }
 			remove { Events.RemoveHandler (itemCreatedEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListItemEventHandler ItemDataBound {
 			add { Events.AddHandler (itemDataBoundEvent, value); }
 			remove { Events.RemoveHandler (itemDataBoundEvent, value); }
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event DataListCommandEventHandler UpdateCommand {
 			add { Events.AddHandler (updateCommandEvent, value); }
 			remove { Events.RemoveHandler (updateCommandEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs

@@ -75,6 +75,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue(0)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public override int SelectedIndex {
 			get {
 				int selected;

mcs/class/System.Web/System.Web.UI.WebControls/FontInfo.cs

@@ -65,6 +65,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(false)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public bool Bold 
 		{
 			get 
@@ -87,6 +89,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(false)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public bool Italic 
 		{
 			get 
@@ -112,6 +116,8 @@ namespace System.Web.UI.WebControls
 		[Editor("System.Drawing.Design.FontNameEditor, " + Consts.AssemblySystem_Drawing_Design, typeof(System.Drawing.Design.UITypeEditor))]
 		[NotifyParentProperty(true)]
 		[TypeConverter (typeof(System.Drawing.FontConverter.FontNameConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public string Name 
 		{
 			get 
@@ -152,6 +158,8 @@ namespace System.Web.UI.WebControls
 		[Editor("System.Windows.Forms.Design.StringArrayEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
 		[NotifyParentProperty(true)]
 		[TypeConverter(typeof(System.Web.UI.WebControls.FontNamesConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public string[] Names 
 		{
 			get 
@@ -181,6 +189,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(false)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public bool Overline 
 		{
 			get 
@@ -203,6 +213,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(typeof (FontUnit), "")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public FontUnit Size 
 		{
 			get 
@@ -229,6 +241,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(false)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public bool Strikeout 
 		{
 			get 
@@ -251,6 +265,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(false)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Font")]
 		public bool Underline 
 		{
 			get 

mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs

@@ -122,6 +122,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[UrlProperty]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string ImageUrl {
 			get {
 				return ViewState.GetString ("ImageUrl", "");
@@ -137,6 +139,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[UrlProperty]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Navigation")]
 		public string NavigateUrl {
 			get {
 				return ViewState.GetString ("NavigateUrl", "");
@@ -151,6 +155,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[DefaultValue("")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.TargetConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Navigation")]
 		public string Target {
 			get {
 				return ViewState.GetString ("Target", "");
@@ -166,6 +172,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text {
 			get {
 				return ViewState.GetString ("Text", "");

mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs

@@ -37,6 +37,8 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string DataNavigateUrlField {
 			get {
 				return ViewState.GetString ("DataNavigateUrlField", String.Empty);
@@ -46,6 +48,7 @@ namespace System.Web.UI.WebControls
 
 		[DefaultValue("")]
 		[Description("The formatting applied to the value bound to the NavigateUrl property.")]
+		[WebCategory ("Misc")]
 		public virtual string DataNavigateUrlFormatString {
 			get {
 				return ViewState.GetString ("DataNavigateUrlFormatString", String.Empty);
@@ -54,6 +57,8 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string DataTextField {
 			get {
 				return ViewState.GetString ("DataTextField", String.Empty);
@@ -63,6 +68,7 @@ namespace System.Web.UI.WebControls
 
 		[Description("The formatting applied to the value bound to the Text property.")]
 		[DefaultValue("")]
+		[WebCategory ("Misc")]
 		public virtual string DataTextFormatString {
 			get {
 				return ViewState.GetString ("DataTextFormatString", String.Empty);
@@ -71,6 +77,8 @@ namespace System.Web.UI.WebControls
 		}
 		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string NavigateUrl {
 			get {
 				return ViewState.GetString ("NavigateUrl", String.Empty);
@@ -79,6 +87,8 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string Target {
 			get {
 				return ViewState.GetString ("Target", String.Empty);
@@ -87,6 +97,8 @@ namespace System.Web.UI.WebControls
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string Text {
 			get {
 				return ViewState.GetString ("Text", String.Empty);

mcs/class/System.Web/System.Web.UI.WebControls/Image.cs

@@ -52,6 +52,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string AlternateText {
 			get {
 				string s = (string) ViewState ["AlternateText"];
@@ -85,6 +87,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (ImageAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual ImageAlign ImageAlign {
 			get {
 				object o = ViewState ["ImageAlign"];
@@ -108,6 +112,8 @@ namespace System.Web.UI.WebControls {
 #else
 		[Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string ImageUrl {
 			get {
 				string s = (string) ViewState ["ImageUrl"];
@@ -127,6 +133,8 @@ namespace System.Web.UI.WebControls {
 		[Editor ("System.Web.UI.Design.UrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 		[UrlProperty]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Accessibility")]
 		public virtual string DescriptionUrl {
 			get {
 				string s = (string) ViewState ["DescriptionUrl"];
@@ -142,6 +150,8 @@ namespace System.Web.UI.WebControls {
 
 #if NET_2_0
 		[DefaultValue (false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Accessibility")]
 		public virtual bool GenerateEmptyAlternateText {
 			get {
 				object o = ViewState ["GenerateEmptyAlternateText"];

mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs

@@ -55,6 +55,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(false)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -73,6 +75,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -89,6 +93,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -165,6 +171,8 @@ namespace System.Web.UI.WebControls {
 
 		[Themeable (false)]
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual string ValidationGroup
 		{
 			get {
@@ -309,6 +317,8 @@ namespace System.Web.UI.WebControls {
 				Page.RegisterRequiresPostBack (this);
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event ImageClickEventHandler Click
 		{
 			add {
@@ -319,6 +329,8 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event CommandEventHandler Command
 		{
 			add {

mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs

@@ -52,9 +52,10 @@ namespace System.Web.UI.WebControls {
 			return base.Initialize (sortingEnabled, control);
 		}
 
-	    [DefaultValueAttribute ("")]
-	    [WebCategoryAttribute ("Appearance")]
-	    [LocalizableAttribute (true)]
+		[DefaultValueAttribute ("")]
+		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Appearance")]
 		public virtual string AlternateText {
 			get {
 				object ob = ViewState ["AlternateText"];
@@ -68,6 +69,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValueAttribute (true)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
 		public virtual bool ConvertEmptyStringToNull {
 			get {
@@ -82,8 +84,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]
-		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataAlternateTextField {
 			get {
 				object ob = ViewState ["DataAlternateTextField"];
@@ -96,8 +99,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataAlternateTextFormatString {
 			get {
 				object ob = ViewState ["DataAlternateTextFormatString"];
@@ -111,8 +115,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[TypeConverterAttribute ("System.Web.UI.Design.DataSourceViewSchemaConverter, " + Consts.AssemblySystem_Design)]
-		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataImageUrlField {
 			get {
 				object ob = ViewState ["DataImageUrlField"];
@@ -125,8 +130,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Data")]
 		[DefaultValueAttribute ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Data")]
 		public virtual string DataImageUrlFormatString {
 			get {
 				object ob = ViewState ["DataImageUrlFormatString"];
@@ -140,8 +146,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValueAttribute ("")]
+		[LocalizableAttribute (true)]
+		[WebSysDescription ("")]
 		[WebCategoryAttribute ("Behavior")]
-	    [LocalizableAttribute (true)]
 		public virtual string NullDisplayText {
 			get {
 				object ob = ViewState ["NullDisplayText"];
@@ -154,10 +161,11 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-	    [DefaultValueAttribute ("")]
-	    [EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
-	    [UrlPropertyAttribute]
-	    [WebCategoryAttribute ("Behavior")]
+		[DefaultValueAttribute ("")]
+		[EditorAttribute ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
+		[UrlPropertyAttribute]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string NullImageUrl {
 			get {
 				object ob = ViewState ["NullImageUrl"];
@@ -170,8 +178,9 @@ namespace System.Web.UI.WebControls {
 			}
 		}
 
-		[WebCategoryAttribute ("Behavior")]
 		[DefaultValueAttribute (false)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public bool ReadOnly {
 			get {
 				object val = ViewState ["ReadOnly"];

mcs/class/System.Web/System.Web.UI.WebControls/Label.cs

@@ -56,6 +56,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text {
 			get {
 				return ViewState.GetString ("Text", "");
@@ -74,6 +76,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Accessibility")]
 		public virtual string AssociatedControlID {
 			get {
 				return ViewState.GetString ("AssociatedControlID", "");

mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs

@@ -159,6 +159,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(false)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -177,6 +179,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -193,6 +197,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		[Themeable (false)]
 		public virtual
@@ -214,6 +220,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue ("")]
 		[Themeable (false)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string OnClientClick
 		{
 			get {
@@ -232,6 +240,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text {
 			get {
 				return ViewState.GetString ("Text", "");	
@@ -250,6 +260,9 @@ namespace System.Web.UI.WebControls {
 				h (this, e);
 		}
 		static readonly object ClickEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler Click {
 			add { Events.AddHandler (ClickEvent, value); }
 			remove { Events.RemoveHandler (ClickEvent, value); }
@@ -264,6 +277,9 @@ namespace System.Web.UI.WebControls {
 			RaiseBubbleEvent (this, e);
 		}
 		static readonly object CommandEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event CommandEventHandler Command {
 			add { Events.AddHandler (CommandEvent, value); }
 			remove { Events.RemoveHandler (CommandEvent, value); }
@@ -285,6 +301,8 @@ namespace System.Web.UI.WebControls {
 
 		[DefaultValue ("")]
 		[Themeable (false)]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public string ValidationGroup {
 			get {
 				return ViewState.GetString ("ValidationGroup", "");	

mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs

@@ -77,6 +77,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(4)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 #if NET_2_0
 		public virtual
 #else		
@@ -94,6 +96,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue(ListSelectionMode.Single)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 #if NET_2_0
 		public virtual
 #else		

mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs

@@ -70,6 +70,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (false)]
 		[Themeable (false)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AppendDataBoundItems
 		{
 			get {
@@ -85,6 +87,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AutoPostBack {
 			get { return ViewState.GetBool ("AutoPostBack", false); }
 			set { ViewState ["AutoPostBack"] = value; }
@@ -92,6 +96,8 @@ namespace System.Web.UI.WebControls {
 
 #if ONLY_1_1
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual string DataMember {
 			get { return ViewState.GetString ("DataMember", String.Empty); }
 			set { ViewState ["DataMember"] = value; }
@@ -100,6 +106,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(null)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual object DataSource {
 			get { return data_source; }
 			set { data_source = value; }
@@ -110,6 +118,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual string DataTextField {
 			get { return ViewState.GetString ("DataTextField", String.Empty); }
 			set { ViewState ["DataTextField"] = value; }
@@ -119,6 +129,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual string DataTextFormatString {
 			get { return ViewState.GetString ("DataTextFormatString", String.Empty); }
 			set { ViewState ["DataTextFormatString"] = value; }
@@ -128,6 +140,8 @@ namespace System.Web.UI.WebControls {
 		[Themeable (false)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual string DataValueField {
 			get { return ViewState.GetString ("DataValueField", String.Empty); }
 			set { ViewState ["DataValueField"] = value; }
@@ -139,6 +153,8 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[MergableProperty(false)]
 		[PersistenceMode(PersistenceMode.InnerDefaultProperty)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual ListItemCollection Items {
 			get {
 				if (items == null)
@@ -156,6 +172,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual int SelectedIndex {
 			get {
 				if (items == null)
@@ -179,6 +197,8 @@ namespace System.Web.UI.WebControls {
 		[Browsable(false)]
 		[DefaultValue(null)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual ListItem SelectedItem {
 			get {
 				int si = SelectedIndex;
@@ -197,6 +217,8 @@ namespace System.Web.UI.WebControls {
 		[Browsable(false)]
 		[DefaultValue("")]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Misc")]
 		public virtual string SelectedValue {
 			get {
 				int si = SelectedIndex;
@@ -219,6 +241,8 @@ namespace System.Web.UI.WebControls {
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		[Browsable (false)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string Text 
 		{
 			get {
@@ -436,6 +460,8 @@ namespace System.Web.UI.WebControls {
 		}
 #endif		
 
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler SelectedIndexChanged {
 			add { Events.AddHandler (SelectedIndexChangedEvent, value); }
 			remove { Events.RemoveHandler (SelectedIndexChangedEvent, value); }
@@ -456,6 +482,8 @@ namespace System.Web.UI.WebControls {
 		[MonoTODO]
 		[Themeable (false)]
 		[DefaultValue (false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 	        public virtual bool CausesValidation {
 			get {
 				throw new NotImplementedException ();
@@ -468,6 +496,8 @@ namespace System.Web.UI.WebControls {
 		[MonoTODO]
 		[Themeable (false)]
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategoryAttribute ("Behavior")]
 		public virtual string ValidationGroup {
 			get {
 				throw new NotImplementedException ();

mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs

@@ -50,6 +50,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[DefaultValue (LiteralMode.Transform)]
 		[MonoTODO]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public LiteralMode Mode 
 		{
 			get {
@@ -63,6 +65,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 #if NET_2_0
 		[Localizable (true)]
 		public virtual

mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs

@@ -73,6 +73,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue("")]
 		[Editor("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string BackImageUrl {
 			get {
 				return ViewState.GetString ("BackImageUrl", "");
@@ -85,6 +87,8 @@ namespace System.Web.UI.WebControls {
 		
 		[Bindable(true)]
 		[DefaultValue(HorizontalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				return (HorizontalAlign) ViewState.GetInt ("HorizontalAlign", (int) HorizontalAlign.NotSet);
@@ -96,6 +100,8 @@ namespace System.Web.UI.WebControls {
 		
 		[Bindable(true)]
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual bool Wrap {
 			get {
 				return ViewState.GetBool ("Wrap", true);

mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs

@@ -41,6 +41,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual string GroupName
 		{
 			get {

mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs

@@ -48,6 +48,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int CellPadding {
 			get {
 				if (ControlStyleCreated == false)
@@ -65,6 +67,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int CellSpacing {
 			get {
 				if (ControlStyleCreated == false)
@@ -82,6 +86,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int RepeatColumns  {
 			get {
 				return ViewState.GetInt ("RepeatColumns", 0);
@@ -99,6 +105,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (RepeatDirection.Vertical)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatDirection RepeatDirection {
 			get {
 				return (RepeatDirection) ViewState.GetInt ("RepeatDirection", (int) RepeatDirection.Vertical);
@@ -116,6 +124,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (RepeatLayout.Table)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual RepeatLayout RepeatLayout {
 			get {
 				return (RepeatLayout) ViewState.GetInt ("RepeatLayout", (int) RepeatLayout.Table);
@@ -133,6 +143,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif		
 		[DefaultValue (TextAlign.Right)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual TextAlign TextAlign {
 			get {
 				return (TextAlign )ViewState.GetInt ("TextAlign", (int) TextAlign.Right);

mcs/class/System.Web/System.Web.UI.WebControls/RangeValidator.cs

@@ -41,6 +41,8 @@ namespace System.Web.UI.WebControls {
 		#region Public Instance Properties
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string MaximumValue {
 			get {
 				return ViewState.GetString("MaximumValue", String.Empty);
@@ -53,6 +55,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string MinimumValue {
 			get {
 				return ViewState.GetString("MinimumValue", String.Empty);

mcs/class/System.Web/System.Web.UI.WebControls/RegularExpressionValidator.cs

@@ -61,6 +61,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue ("")]
 		[Editor ("System.Web.UI.Design.WebControls.RegexTypeEditor, " + Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string ValidationExpression {
 			get {
 				return ViewState.GetString ("ValidationExpression", "");

mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs

@@ -225,6 +225,7 @@ namespace System.Web.UI.WebControls {
 		ArrayList items;
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
 		public virtual RepeaterItemCollection Items {
 			get {
 				if (itemscol == null)
@@ -234,6 +235,8 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual string DataMember {
 			get {
 				return ViewState.GetString ("DataMember", "");
@@ -254,6 +257,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 		[DefaultValue(null)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Data")]
 		public virtual object DataSource {
 			get {
 				return dataSource;
@@ -317,6 +322,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof (RepeaterItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate AlternatingItemTemplate {
 			get {
 				return alt_itm_tmpl;
@@ -331,6 +337,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof (RepeaterItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate FooterTemplate {
 			get {
 				return footer_tmpl;
@@ -345,6 +352,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof (RepeaterItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate HeaderTemplate {
 			get {
 				return header_tmpl;
@@ -359,6 +367,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof (RepeaterItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate ItemTemplate {
 			get {
 				return item_tmpl;
@@ -373,6 +382,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue(null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof (RepeaterItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate SeparatorTemplate {
 			get {
 				return separator_tmpl;
@@ -391,6 +401,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		static readonly object ItemCommandEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event RepeaterCommandEventHandler ItemCommand {
 			add { Events.AddHandler (ItemCommandEvent, value); }
 			remove { Events.RemoveHandler (ItemCommandEvent, value); }
@@ -405,6 +418,9 @@ namespace System.Web.UI.WebControls {
 		}
 
 		static readonly object ItemCreatedEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public event RepeaterItemEventHandler ItemCreated {
 			add { Events.AddHandler (ItemCreatedEvent, value); }
 			remove { Events.RemoveHandler (ItemCreatedEvent, value); }
@@ -418,6 +434,9 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		static readonly object ItemDataBoundEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public event RepeaterItemEventHandler ItemDataBound {
 			add { Events.AddHandler (ItemDataBoundEvent, value); }
 			remove { Events.RemoveHandler (ItemDataBoundEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs

@@ -49,6 +49,8 @@ namespace System.Web.UI.WebControls {
 
 		[Bindable(true)]
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string InitialValue {
 			get {
 				return ViewState.GetString ("InitialValue", "");

mcs/class/System.Web/System.Web.UI.WebControls/Style.cs

@@ -100,6 +100,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue(typeof (Color), "")]
 		[NotifyParentProperty(true)]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Color BackColor 
 		{
 			get 
@@ -123,6 +125,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue(typeof (Color), "")]
 		[NotifyParentProperty(true)]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Color BorderColor 
 		{
 			get 
@@ -145,6 +149,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(BorderStyle.NotSet)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public BorderStyle BorderStyle 
 		{
 			get 
@@ -167,6 +173,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(typeof (Unit), "")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Unit BorderWidth 
 		{
 			get 
@@ -193,6 +201,8 @@ namespace System.Web.UI.WebControls
 
 		[DefaultValue("")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string CssClass 
 		{
 			get 
@@ -214,6 +224,8 @@ namespace System.Web.UI.WebControls
 
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public FontInfo Font 
 		{
 			get 
@@ -230,6 +242,8 @@ namespace System.Web.UI.WebControls
 		[DefaultValue(typeof (Color), "")]
 		[NotifyParentProperty(true)]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Color ForeColor 
 		{
 			get 
@@ -252,6 +266,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(typeof (Unit), "")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Unit Height 
 		{
 			get 
@@ -279,6 +295,8 @@ namespace System.Web.UI.WebControls
 		[Bindable(true)]
 		[DefaultValue(typeof (Unit), "")]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Unit Width 
 		{
 			get 

mcs/class/System.Web/System.Web.UI.WebControls/Table.cs

@@ -60,6 +60,8 @@ namespace System.Web.UI.WebControls {
 		[Editor ("System.Web.UI.Design.ImageUrlEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
 #endif
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string BackImageUrl {
 			get {
 				if (!ControlStyleCreated)
@@ -75,6 +77,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Accessibility")]
 		public virtual string Caption {
 			get {
 				object o = ViewState ["Caption"];
@@ -89,6 +93,7 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue (TableCaptionAlign.NotSet)]
+		[WebCategory ("Accessibility")]
 		public virtual TableCaptionAlign CaptionAlign {
 			get {
 				object o = ViewState ["CaptionAlign"];
@@ -106,6 +111,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int CellPadding {
 			get {
 				if (!ControlStyleCreated)
@@ -119,6 +126,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int CellSpacing {
 			get {
 				if (!ControlStyleCreated)
@@ -132,6 +141,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (GridLines.None)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual GridLines GridLines {
 			get {
 				if (!ControlStyleCreated)
@@ -145,6 +156,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (HorizontalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if (!ControlStyleCreated)
@@ -156,6 +169,7 @@ namespace System.Web.UI.WebControls {
 
 		[MergableProperty (false)]
 		[PersistenceMode (PersistenceMode.InnerDefaultProperty)]
+		[WebSysDescription ("")]
 		public virtual TableRowCollection Rows {
 			get {
 				if (rows == null)

mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs

@@ -83,6 +83,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int ColumnSpan {
 			get {
 				object o = ViewState ["ColumnSpan"];
@@ -100,6 +102,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (HorizontalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if (!ControlStyleCreated)
@@ -113,6 +117,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual int RowSpan {
 			get {
 				object o = ViewState ["RowSpan"];
@@ -133,6 +139,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text {
 			get {
 				object o = ViewState ["Text"];
@@ -153,6 +161,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (VerticalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual VerticalAlign VerticalAlign {
 			get {
 				if (!ControlStyleCreated)
@@ -166,6 +176,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual bool Wrap {
 			get {
 				if (!ControlStyleCreated)

mcs/class/System.Web/System.Web.UI.WebControls/TableItemStyle.cs

@@ -51,6 +51,8 @@ namespace System.Web.UI.WebControls {
 #endif
 		[DefaultValue (HorizontalAlign.NotSet)]
 		[NotifyParentProperty (true)]
+		[WebSysDescription ("")]
+		[WebCategory("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if ((styles & Styles.HorizontalAlign) == 0)
@@ -73,6 +75,8 @@ namespace System.Web.UI.WebControls {
 #endif
 		[DefaultValue (VerticalAlign.NotSet)]
 		[NotifyParentProperty (true)]
+		[WebSysDescription ("")]
+		[WebCategory("Layout")]
 		public virtual VerticalAlign VerticalAlign {
 			get {
 				if ((styles & Styles.VerticalAlign) == 0)
@@ -95,6 +99,8 @@ namespace System.Web.UI.WebControls {
 #endif
 		[DefaultValue (true)]
 		[NotifyParentProperty (true)]
+		[WebSysDescription ("")]
+		[WebCategory("Layout")]
 		public virtual bool Wrap {
 			get {
 				if ((styles & Styles.Wrap) == 0)

mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs

@@ -56,6 +56,8 @@ namespace System.Web.UI.WebControls {
 
 		[MergableProperty (false)]
 		[PersistenceMode (PersistenceMode.InnerDefaultProperty)]
+		[WebSysDescription ("")]
+		[WebCategory("Layout")]
 		public virtual TableCellCollection Cells {
 			get {
 				if (cells == null)
@@ -68,6 +70,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (HorizontalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if (!ControlStyleCreated)
@@ -81,6 +85,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (VerticalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual VerticalAlign VerticalAlign {
 			get {
 				if (!ControlStyleCreated)

mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs

@@ -54,6 +54,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue ("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string BackImageUrl {
 			get {
 				if ((styles & Styles.BackImageUrl) == 0)
@@ -74,6 +76,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int CellPadding {
 			get {
 				if ((styles & Styles.CellPadding) == 0)
@@ -94,6 +98,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (-1)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int CellSpacing {
 			get {
 				if ((styles & Styles.CellSpacing) == 0)
@@ -115,6 +121,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (GridLines.None)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual GridLines GridLines {
 			get {
 				if ((styles & Styles.GridLines) == 0)
@@ -138,6 +146,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable (true)]
 #endif
 		[DefaultValue (HorizontalAlign.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual HorizontalAlign HorizontalAlign {
 			get {
 				if ((styles & Styles.HorizontalAlign) == 0)

mcs/class/System.Web/System.Web.UI.WebControls/TemplateColumn.cs

@@ -63,6 +63,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof(DataGridItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate EditItemTemplate {
 			get { return editItemTemplate; }
 			set { editItemTemplate = value; }
@@ -72,6 +73,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof(DataGridItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate FooterTemplate {
 			get { return footerTemplate; }
 			set { footerTemplate = value; }	
@@ -81,6 +83,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof(DataGridItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate HeaderTemplate {
 			get { return headerTemplate; }
 			set { headerTemplate = value; }
@@ -90,6 +93,7 @@ namespace System.Web.UI.WebControls {
 		[DefaultValue (null)]
 		[PersistenceMode(PersistenceMode.InnerProperty)]
 		[TemplateContainer (typeof(DataGridItem))]
+		[WebSysDescription ("")]
 		public virtual ITemplate ItemTemplate {
 			get { return itemTemplate; }
 			set { itemTemplate = value; }

mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs

@@ -183,6 +183,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool AutoPostBack {
 			get {
 				return ViewState.GetBool ("AutoPostBack", false);
@@ -210,6 +212,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual int Columns {
 			get {
 				return ViewState.GetInt ("Columns", 0);
@@ -226,6 +230,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual int MaxLength {
 			get {
 				return ViewState.GetInt ("MaxLength", 0);
@@ -240,6 +246,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual bool ReadOnly {
 			get {
 				return ViewState.GetBool ("ReadOnly", false);
@@ -256,6 +264,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual int Rows {
 			get {
 				return ViewState.GetInt ("Rows", 0);
@@ -287,6 +297,8 @@ namespace System.Web.UI.WebControls {
 		[Localizable (true)]
 		[Editor ("System.ComponentModel.Design.MultilineStringEditor," + Consts.AssemblySystem_Design, "System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string Text {
 			get {
 				return ViewState.GetString ("Text", "");
@@ -302,6 +314,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual TextBoxMode TextMode {
 			get {
 				return (TextBoxMode) ViewState.GetInt ("TextMode", (int) TextBoxMode.SingleLine);
@@ -326,6 +340,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 	
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual bool Wrap {
 			get {
 				return ViewState.GetBool ("Wrap", true);
@@ -343,6 +359,9 @@ namespace System.Web.UI.WebControls {
 		}
 		
 		static readonly object TextChangedEvent = new object ();
+
+		[WebSysDescription ("")]
+		[WebCategory ("Action")]
 		public event EventHandler TextChanged {
 			add { Events.AddHandler (TextChangedEvent, value); }
 			remove { Events.RemoveHandler (TextChangedEvent, value); }

mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs

@@ -49,6 +49,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(ValidationSummaryDisplayMode.BulletList)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public ValidationSummaryDisplayMode DisplayMode {
 			get {
 				object obj;
@@ -69,6 +71,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Themeable (false)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public bool EnableClientScript {
 			get {
 				return ViewState.GetBool("EnableClientScript", true);
@@ -97,6 +101,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public string HeaderText {
 			get {
 				return ViewState.GetString("HeaderText", string.Empty);
@@ -111,6 +117,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(false)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public bool ShowMessageBox {
 			get {
 				return ViewState.GetBool("ShowMessageBox", false);
@@ -125,6 +133,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public bool ShowSummary {
 			get {
 				return ViewState.GetBool("ShowSummary", true);

mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs

@@ -65,6 +65,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual string AccessKey {
 			get {
 				return ViewState.GetString ("AccessKey", string.Empty);
@@ -79,6 +81,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public AttributeCollection Attributes {
 			get {
 				if (attributes == null) {
@@ -97,6 +101,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[DefaultValue(typeof (Color), "")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual Color BackColor {
 			get {
 				if (style == null) 
@@ -114,6 +120,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[DefaultValue(typeof (Color), "")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual Color BorderColor {
 			get {
 				if (style == null) 
@@ -131,6 +139,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(BorderStyle.NotSet)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual BorderStyle BorderStyle {
 			get {
 				if (style == null) 
@@ -150,6 +160,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(typeof (Unit), "")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual Unit BorderWidth {
 			get {
 				if (style == null) 
@@ -164,6 +176,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public Style ControlStyle {
 			get {
 				if (style == null) {
@@ -189,6 +203,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual string CssClass {
 			get {
 				if (style == null) 
@@ -238,6 +254,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
 		[NotifyParentProperty(true)]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual FontInfo Font {
 			get {
 				// Oddly enough, it looks like we have to let it create the style
@@ -251,6 +269,8 @@ namespace System.Web.UI.WebControls {
 #endif		
 		[DefaultValue(typeof (Color), "")]
 		[TypeConverter(typeof(System.Web.UI.WebControls.WebColorConverter))]
+		[WebSysDescription ("")]
+		[WebCategory ("Appearance")]
 		public virtual Color ForeColor {
 			get {
 				if (style == null) 
@@ -279,6 +299,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(typeof (Unit), "")]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual Unit Height {
 			get {
 				if (style == null) 
@@ -307,6 +329,8 @@ namespace System.Web.UI.WebControls {
 		
 		[Browsable(false)]
 		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Style")]
 		public CssStyleCollection Style {
 			get {
 				return Attributes.CssStyle;
@@ -314,6 +338,8 @@ namespace System.Web.UI.WebControls {
 		}
 
 		[DefaultValue((short)0)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual short TabIndex {
 			get {
 				return ViewState.GetShort ("TabIndex", 0);
@@ -330,6 +356,8 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[Localizable (true)]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public virtual string ToolTip {
 			get {
 				return ViewState.GetString ("ToolTip", string.Empty);
@@ -343,6 +371,8 @@ namespace System.Web.UI.WebControls {
 		[Bindable(true)]
 #endif		
 		[DefaultValue(typeof (Unit), "")]
+		[WebSysDescription ("")]
+		[WebCategory ("Layout")]
 		public virtual Unit Width {
 			get {
 				if (style == null) 

mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs

@@ -121,6 +121,8 @@ namespace System.Web.UI.WebControls {
 #else		
 		[Editor ("System.Web.UI.Design.XmlUrlEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
 #endif		
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public string DocumentSource {
 			get {
 				if (xml_file == null)
@@ -169,6 +171,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public XslTransform Transform {
 			get {
 				return xsl_transform;
@@ -182,6 +186,8 @@ namespace System.Web.UI.WebControls {
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
 		public XsltArgumentList TransformArgumentList {
 			get {
 				return transform_arguments;