diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs
index ffc2c3a090..4113a66510 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingElementGenerator.cs
@@ -167,10 +167,16 @@ namespace ICSharpCode.AvalonEdit.Folding
 			}
 		}
 		
+		/// <summary>
+		/// Default brush for folding element text. Value: Brushes.Gray
+		/// </summary>
 		public static readonly Brush DefaultTextBrush = Brushes.Gray;
 		
 		static Brush textBrush = DefaultTextBrush;
 		
+		/// <summary>
+		/// Gets/sets the brush used for folding element text.
+		/// </summary>
 		public static Brush TextBrush {
 			get { return textBrush; }
 			set { textBrush = value; }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingMargin.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingMargin.cs
index e26a5762c3..334b840e78 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingMargin.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Folding/FoldingMargin.cs
@@ -28,39 +28,63 @@ namespace ICSharpCode.AvalonEdit.Folding
 		internal const double SizeFactor = Constants.PixelPerPoint;
 		
 		#region Brushes
+		/// <summary>
+		/// FoldingMarkerBrush dependency property.
+		/// </summary>
 		public static readonly DependencyProperty FoldingMarkerBrushProperty =
 			DependencyProperty.RegisterAttached("FoldingMarkerBrush", typeof(Brush), typeof(FoldingMargin),
 			                                    new FrameworkPropertyMetadata(Brushes.Gray, FrameworkPropertyMetadataOptions.Inherits, OnUpdateBrushes));
 		
+		/// <summary>
+		/// Gets/sets the Brush used for displaying the lines of folding markers.
+		/// </summary>
 		public Brush FoldingMarkerBrush {
 			get { return (Brush)GetValue(FoldingMarkerBrushProperty); }
 			set { SetValue(FoldingMarkerBrushProperty, value); }
 		}
 		
+		/// <summary>
+		/// FoldingMarkerBackgroundBrush dependency property.
+		/// </summary>
 		public static readonly DependencyProperty FoldingMarkerBackgroundBrushProperty =
 			DependencyProperty.RegisterAttached("FoldingMarkerBackgroundBrush", typeof(Brush), typeof(FoldingMargin),
 			                                    new FrameworkPropertyMetadata(Brushes.White, FrameworkPropertyMetadataOptions.Inherits, OnUpdateBrushes));
 		
+		/// <summary>
+		/// Gets/sets the Brush used for displaying the background of folding markers.
+		/// </summary>
 		public Brush FoldingMarkerBackgroundBrush {
 			get { return (Brush)GetValue(FoldingMarkerBackgroundBrushProperty); }
 			set { SetValue(FoldingMarkerBackgroundBrushProperty, value); }
 		}
 		
+		/// <summary>
+		/// SelectedFoldingMarkerBrush dependency property.
+		/// </summary>
 		public static readonly DependencyProperty SelectedFoldingMarkerBrushProperty =
 			DependencyProperty.RegisterAttached("SelectedFoldingMarkerBrush",
 			                                    typeof(Brush), typeof(FoldingMargin),
 			                                    new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.Inherits, OnUpdateBrushes));
 		
+		/// <summary>
+		/// Gets/sets the Brush used for displaying the lines of selected folding markers.
+		/// </summary>
 		public Brush SelectedFoldingMarkerBrush {
 			get { return (Brush)GetValue(SelectedFoldingMarkerBrushProperty); }
 			set { SetValue(SelectedFoldingMarkerBrushProperty, value); }
 		}
 		
+		/// <summary>
+		/// SelectedFoldingMarkerBackgroundBrush dependency property.
+		/// </summary>
 		public static readonly DependencyProperty SelectedFoldingMarkerBackgroundBrushProperty =
 			DependencyProperty.RegisterAttached("SelectedFoldingMarkerBackgroundBrush",
 			                                    typeof(Brush), typeof(FoldingMargin),
 			                                    new FrameworkPropertyMetadata(Brushes.White, FrameworkPropertyMetadataOptions.Inherits, OnUpdateBrushes));
 		
+		/// <summary>
+		/// Gets/sets the Brush used for displaying the background of selected folding markers.
+		/// </summary>
 		public Brush SelectedFoldingMarkerBackgroundBrush {
 			get { return (Brush)GetValue(SelectedFoldingMarkerBackgroundBrushProperty); }
 			set { SetValue(SelectedFoldingMarkerBackgroundBrushProperty, value); }
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
index 3c3a70c486..1f6f79d745 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/MouseHoverLogic.cs
@@ -8,6 +8,9 @@ using System.Windows.Threading;
 
 namespace ICSharpCode.AvalonEdit.Rendering
 {
+	/// <summary>
+	/// Encapsulates and adds MouseHover support to UIElements.
+	/// </summary>
 	public class MouseHoverLogic : IDisposable
 	{
 		UIElement target;
@@ -17,6 +20,9 @@ namespace ICSharpCode.AvalonEdit.Rendering
 		MouseEventArgs mouseHoverLastEventArgs;
 		bool mouseHovering;
 		
+		/// <summary>
+		/// Creates a new instance and attaches itself to the <paramref name="target" /> UIElement.
+		/// </summary>
 		public MouseHoverLogic(UIElement target)
 		{
 			if (target == null)
@@ -70,8 +76,14 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			OnMouseHover(mouseHoverLastEventArgs);
 		}
 		
+		/// <summary>
+		/// Occurs when the mouse starts hovering over a certain location.
+		/// </summary>
 		public event EventHandler<MouseEventArgs> MouseHover;
 		
+		/// <summary>
+		/// Raises the <see cref="MouseHover"/> event.
+		/// </summary>
 		protected virtual void OnMouseHover(MouseEventArgs e)
 		{
 			if (MouseHover != null) {
@@ -79,8 +91,14 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			}
 		}
 		
+		/// <summary>
+		/// Occurs when the mouse stops hovering over a certain location.
+		/// </summary>
 		public event EventHandler<MouseEventArgs> MouseHoverStopped;
 		
+		/// <summary>
+		/// Raises the <see cref="MouseHoverStopped"/> event.
+		/// </summary>
 		protected virtual void OnMouseHoverStopped(MouseEventArgs e)
 		{
 			if (MouseHoverStopped != null) {
@@ -90,6 +108,9 @@ namespace ICSharpCode.AvalonEdit.Rendering
 		
 		bool disposed;
 		
+		/// <summary>
+		/// Removes the MouseHover support from the target UIElement.
+		/// </summary>
 		public void Dispose()
 		{
 			if (!disposed) {