From 9305212bab0cf885c04a2c7690b22736b00f0f5d Mon Sep 17 00:00:00 2001
From: Conor Wright <Conor.Wright@blackbaud.com>
Date: Thu, 17 Jan 2019 14:56:53 -0500
Subject: [PATCH 1/2] reworked subcomponents.Added
 replaceTitle&replaceDescription

---
 src/app/components/error/index.html | 55 ++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/app/components/error/index.html b/src/app/components/error/index.html
index 03d1e76e2..8c2d74c16 100644
--- a/src/app/components/error/index.html
+++ b/src/app/components/error/index.html
@@ -8,38 +8,67 @@
     The error component displays a SKY UX-themed error message. It includes options to specify the image, title, description, and action.
   </sky-demo-page-summary>
 
-  <sky-demo-page-properties>
+  <sky-demo-page-properties
+    sectionHeading="Error properties"
+  >
     <sky-demo-page-property
-      propertyName="image"
+      propertyName="errorType"
+      [isOptional]="false"
+    >
+      An attribute to specify a set of pre-defined values for the image, title, and description. The valid options are <stache-code>broken</stache-code>,
+      <stache-code>notfound</stache-code>, <stache-code>construction</stache-code>, and <stache-code>security</stache-code>.
+    </sky-demo-page-property>
+  </sky-demo-page-properties>
+
+  <sky-demo-page-properties
+    sectionHeading="Error child components"
+  >
+    <sky-demo-page-property
+      propertyName="sky-error-image"
       [isOptional]="true"
     >
-    Specifies an image to display in the error message.
+      Specifies an image to display in the error message.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="title"
+      propertyName="sky-error-title"
       [isOptional]="true"
     >
-      Specifies a title to display in the error message.
+      Specifies a title to display in the error message. Properties are listed <a href="skyux/components/error#error-title-properties">below</a>.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="description"
+      propertyName="sky-error-description"
       [isOptional]="true"
     >
-      Specifies a description to provide additional details in the error message.
+      Specifies a description to provide additional details in the error message. Properties are listed <a href="skyux/components/error#error-description-properties">below</a>.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="action"
-      [isOptional]="false"
+      propertyName="sky-error-action"
+      [isOptional]="true"
     >
       Specifies an action to include in the error message. For example, you can include a button to reload the page or to refresh
       data.
     </sky-demo-page-property>
+  </sky-demo-page-properties>
+
+  <sky-demo-page-properties
+    sectionHeading="Error title properties"
+  >
+    <sky-demo-page-property
+      propertyName="replaceDefaultTitle"
+      [isOptional]="true"
+    >
+      Whether to replace the default title. If <stache-code>false</stache-code>, this title will be appended to the default title. This property accepts <stache-code>boolean</stache-code> values.
+    </sky-demo-page-property>
+  </sky-demo-page-properties>
+
+  <sky-demo-page-properties
+    sectionHeading="Error description properties"
+  >
     <sky-demo-page-property
-      propertyName="errorType"
+      propertyName="replaceDefaultDescription"
       [isOptional]="true"
     >
-      An attribute to specify a set of pre-defined values for the image, title, and description. The valid options are <stache-code>broken</stache-code>,
-      <stache-code>notfound</stache-code>, <stache-code>construction</stache-code>, and <stache-code>security</stache-code>.
+      Whether to replace the default description. If <stache-code>false</stache-code>, this description will be appended to the default description. This property accepts <stache-code>boolean</stache-code> values.
     </sky-demo-page-property>
   </sky-demo-page-properties>
 
@@ -68,9 +97,9 @@
       Specifies a label for the action button that closes the modal error message.
     </sky-demo-page-property>
   </sky-demo-page-properties>
+
   <sky-demo-page-example>
     <sky-error-demo></sky-error-demo>
     <sky-demo-page-code demoName="Error"></sky-demo-page-code>
   </sky-demo-page-example>
-
 </sky-demo-page>

From 2afefbb7c1cb0ae26df1bcfb46234a5886eacd60 Mon Sep 17 00:00:00 2001
From: blackbaud-johnly <John.Lyons@blackbaud.com>
Date: Wed, 23 Jan 2019 11:10:48 -0500
Subject: [PATCH 2/2] Doc tweaks

---
 src/app/components/error/index.html | 40 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/app/components/error/index.html b/src/app/components/error/index.html
index 8c2d74c16..19d8992ae 100644
--- a/src/app/components/error/index.html
+++ b/src/app/components/error/index.html
@@ -5,7 +5,7 @@
 >
 
   <sky-demo-page-summary>
-    The error component displays a SKY UX-themed error message. It includes options to specify the image, title, description, and action.
+    The error component displays a SKY UX-themed error message. It includes options to specify an image, title, description, and action in the error message.
   </sky-demo-page-summary>
 
   <sky-demo-page-properties
@@ -15,8 +15,8 @@
       propertyName="errorType"
       [isOptional]="false"
     >
-      An attribute to specify a set of pre-defined values for the image, title, and description. The valid options are <stache-code>broken</stache-code>,
-      <stache-code>notfound</stache-code>, <stache-code>construction</stache-code>, and <stache-code>security</stache-code>.
+      Specifies an error type to use a set of pre-defined values for the image, title, and description. The valid options are <stache-code>broken</stache-code>,
+      <stache-code>construction</stache-code>, <stache-code>notfound</stache-code>, and <stache-code>security</stache-code>. This property accepts <stache-code>string</stache-code> values.
     </sky-demo-page-property>
   </sky-demo-page-properties>
 
@@ -24,29 +24,29 @@
     sectionHeading="Error child components"
   >
     <sky-demo-page-property
-      propertyName="sky-error-image"
+      propertyName="sky-error-action"
       [isOptional]="true"
     >
-      Specifies an image to display in the error message.
+      Specifies an action to include in the error message. For example, you can include a button to reload the page or to refresh
+      data.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="sky-error-title"
+      propertyName="sky-error-description"
       [isOptional]="true"
     >
-      Specifies a title to display in the error message. Properties are listed <a href="skyux/components/error#error-title-properties">below</a>.
+      Specifies a description to provide additional details in the error message. Properties are listed <a stacheRouterLink="." fragment="error-description-properties">below</a>.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="sky-error-description"
+      propertyName="sky-error-image"
       [isOptional]="true"
     >
-      Specifies a description to provide additional details in the error message. Properties are listed <a href="skyux/components/error#error-description-properties">below</a>.
+      Specifies an image to display in the error message.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="sky-error-action"
+      propertyName="sky-error-title"
       [isOptional]="true"
     >
-      Specifies an action to include in the error message. For example, you can include a button to reload the page or to refresh
-      data.
+      Specifies a title to display in the error message. Properties are listed <a stacheRouterLink="." fragment="error-title-properties">below</a>.
     </sky-demo-page-property>
   </sky-demo-page-properties>
 
@@ -55,9 +55,10 @@
   >
     <sky-demo-page-property
       propertyName="replaceDefaultTitle"
+      defaultValue="false"
       [isOptional]="true"
     >
-      Whether to replace the default title. If <stache-code>false</stache-code>, this title will be appended to the default title. This property accepts <stache-code>boolean</stache-code> values.
+      Indicates whether to replace the default title. If <stache-code>false</stache-code>, this title is appended to the default title. This property accepts <stache-code>boolean</stache-code> values.
     </sky-demo-page-property>
   </sky-demo-page-properties>
 
@@ -66,9 +67,10 @@
   >
     <sky-demo-page-property
       propertyName="replaceDefaultDescription"
+      defaultValue="false"
       [isOptional]="true"
     >
-      Whether to replace the default description. If <stache-code>false</stache-code>, this description will be appended to the default description. This property accepts <stache-code>boolean</stache-code> values.
+      Indicates whether to replace the default description. If <stache-code>false</stache-code>, this description is appended to the default description. This property accepts <stache-code>boolean</stache-code> values.
     </sky-demo-page-property>
   </sky-demo-page-properties>
 
@@ -82,19 +84,19 @@
 
   <sky-demo-page-properties sectionHeading="SkyErrorModalService config properties">
     <sky-demo-page-property
-      propertyName="errorTitle"
+      propertyName="errorCloseText"
     >
-      Specifies a title to display in the modal error message.
+      Specifies a label for the action button that closes the modal error message. This property accepts <stache-code>string</stache-code> values.
     </sky-demo-page-property>
     <sky-demo-page-property
       propertyName="errorDescription"
     >
-      Specifies a description to provide additional details in the modal error message.
+      Specifies a description to provide additional details in the modal error message. This property accepts <stache-code>string</stache-code> values.
     </sky-demo-page-property>
     <sky-demo-page-property
-      propertyName="errorCloseText"
+      propertyName="errorTitle"
     >
-      Specifies a label for the action button that closes the modal error message.
+      Specifies a title to display in the modal error message. This property accepts <stache-code>string</stache-code> values.
     </sky-demo-page-property>
   </sky-demo-page-properties>