Merge pull request #1507 from json-schema-org/gregsdennis/adr-template-merge-pro-con-into-options

update adr template to merge pros/cons and option descriptions

Author: gregsdennis

adr/template.md

@@ -18,30 +18,9 @@ Technical Story: [description | ticket/issue URL] <!-- optional -->
 
 ## Considered Options
 
-* [option 1]
-* [option 2]
-* [option 3]
-* … <!-- numbers of options can vary -->
-
-## Decision Outcome
-
-Chosen option: "[option 1]", because [justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force force | … | comes out best (see below)].
-
-### Positive Consequences <!-- optional -->
-
-* [e.g., improvement of quality attribute satisfaction, follow-up decisions required, …]
-* …
-
-### Negative Consequences <!-- optional -->
-
-* [e.g., compromising quality attribute, follow-up decisions required, …]
-* …
-
-## Pros and Cons of the Options <!-- optional -->
-
 ### [option 1]
 
-[example | description | pointer to more information | …] <!-- optional -->
+[example | description | pointer to more information | …]
 
 * Good, because [argument a]
 * Good, because [argument b]
@@ -50,7 +29,7 @@ Chosen option: "[option 1]", because [justification. e.g., only option, which me
 
 ### [option 2]
 
-[example | description | pointer to more information | …] <!-- optional -->
+[example | description | pointer to more information | …]
 
 * Good, because [argument a]
 * Good, because [argument b]
@@ -59,13 +38,27 @@ Chosen option: "[option 1]", because [justification. e.g., only option, which me
 
 ### [option 3]
 
-[example | description | pointer to more information | …] <!-- optional -->
+[example | description | pointer to more information | …]
 
 * Good, because [argument a]
 * Good, because [argument b]
 * Bad, because [argument c]
 * … <!-- numbers of pros and cons can vary -->
 
+## Decision Outcome
+
+"[option 1]" was chosen because [justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force force | … | comes out best (see below)].
+
+### Positive Consequences <!-- optional -->
+
+* [e.g., improvement of quality attribute satisfaction, follow-up decisions required, …]
+* …
+
+### Negative Consequences <!-- optional -->
+
+* [e.g., compromising quality attribute, follow-up decisions required, …]
+* …
+
 ## Links <!-- optional -->
 
 * [Link type] [Link to ADR] <!-- example: Refined by [ADR-0005](0005-example.md) -->