You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+2Lines changed: 2 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -39,6 +39,8 @@ Longer explanation: Head to <https://adr.github.io/madr/#applying-madr-to-your-p
39
39
|`develop`| Latest developments, including homepage updates which should be published on a release. `gh-pages` should always be merged into this branch. |
40
40
|`release/vY`| Branch for latest release Y.x version of MADR. Introduced to fix [#92](https://github.com/adr/madr/issues/92)|
41
41
42
+
The branch name conventions follow the [git flow model](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
Copy file name to clipboardExpand all lines: docs/index.md
+10-10Lines changed: 10 additions & 10 deletions
Original file line number
Diff line number
Diff line change
@@ -37,7 +37,7 @@ MADR is a streamlined template for recording architectural significant decisions
37
37
* 2022-11-22. MADR Version 1.0 was released five years ago. A new blog post ["The Markdown ADR (MADR) Template Explained and Distilled"](https://medium.com/olzzio/the-markdown-adr-madr-template-explained-and-distilled-b67603ec95bb) is available on Medium.
38
38
* 2022-10-09: Release of MADR 3.0.0.\
39
39
The most important change is the merged of sections "Positive Consequences" and "Negative Consequences" into "Consequences" to enable similar grammar as in "Pros and Cons of the Options".
Besides improvement of the template, there was a renaming from "Markdown Architectural Decision Records" to "Markdown Any Decision Records" to follow the movement ["ADR = Any Decision Record? Architecture, Design and Beyond"](https://ozimmer.ch/practices/2021/04/23/AnyDecisionRecords.html).
43
43
The acronym is still MADR.
@@ -88,11 +88,11 @@ Chosen option: "Plain JUnit5", because it is a standard framework and the featur
88
88
89
89
For more examples see [examples](examples.md).
90
90
For the MADR project itself, all ADRs are rendered at [decisions/](decisions/).
91
-
Their source can be found at <https://github.com/adr/madr/tree/main/docs/decisions>.
91
+
Their source can be found at <https://github.com/adr/madr/tree/develop/docs/decisions>.
92
92
The latest release of the full template (with placeholders and some guidance how to use) can be found at the [releases page](https://github.com/adr/madr/releases/latest).
93
93
By clicking on the number at the tag symbol, you browse the repository at the state of the release.
94
-
For the brave, the version under development is available at <https://github.com/adr/madr/blob/main/template/adr-template.md>.
95
-
There also is a [CHANGELOG](https://github.com/adr/madr/blob/main/CHANGELOG.md#changelog) listing the changes between the last released version and the currently developed version.
94
+
For the brave, the version under development is available at <https://github.com/adr/madr/blob/develop/template/adr-template.md>.
95
+
There also is a [CHANGELOG](https://github.com/adr/madr/blob/develop/CHANGELOG.md#changelog) listing the changes between the last released version and the currently developed version.
1. Copy [`docs/decisions/adr-template.md`](https://github.com/adr/madr/blob/main/template/adr-template.md) to `docs/decisions/NNNN-title-with-dashes.md`, where `NNNN` indicates the next number in sequence.
114
+
1. Copy [`docs/decisions/adr-template.md`](https://github.com/adr/madr/blob/develop/template/adr-template.md) to `docs/decisions/NNNN-title-with-dashes.md`, where `NNNN` indicates the next number in sequence.
115
115
2. Edit `NNNN-title-with-dashes.md`.
116
116
117
117
Note you can also use [other patterns for the directory format](https://github.com/joelparkerhenderson/architecture_decision_record#adr-file-name-conventions).
@@ -175,11 +175,11 @@ The current development version renders as follows:
0 commit comments