diff options
| author | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 09:35:11 +0800 |
|---|---|---|
| committer | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 09:35:11 +0800 |
| commit | cfcc73724fcd394150d1b815d0a7a4c466e216b5 (patch) | |
| tree | a9648255f14cd8b0e1ad8eee1f8d42337a0668bc /packages/markdown/marked/docs/PUBLISHING.md | |
| parent | a3658993128bdddd5d40f792c19281dc5eac51f5 (diff) | |
| parent | 533bc045d06269dba2f42cdfe61817a1b3407974 (diff) | |
| download | wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.tar.gz wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.tar.bz2 wekan-cfcc73724fcd394150d1b815d0a7a4c466e216b5.zip | |
Merge branch 'master' of https://github.com/wekan/wekan
Diffstat (limited to 'packages/markdown/marked/docs/PUBLISHING.md')
| -rw-r--r-- | packages/markdown/marked/docs/PUBLISHING.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/markdown/marked/docs/PUBLISHING.md b/packages/markdown/marked/docs/PUBLISHING.md index 27937c2f..73972667 100644 --- a/packages/markdown/marked/docs/PUBLISHING.md +++ b/packages/markdown/marked/docs/PUBLISHING.md @@ -7,7 +7,7 @@ ## Overall strategy -**Master is always shippable:** We try to merge PRs in such a way that `master` is the only branch to really be concerned about *and* `master` can always be released. This allows smoother flow between new fetures, bug fixes, and so on. (Almost a continuous deployment setup, without automation.) +**Master is always shippable:** We try to merge PRs in such a way that `master` is the only branch to really be concerned about *and* `master` can always be released. This allows smoother flow between new features, bug fixes, and so on. (Almost a continuous deployment setup, without automation.) ## Versioning @@ -20,5 +20,5 @@ We follow [semantic versioning](https://semver.org) where the following sequence What to expect while Marked is a zero-major (0.x.y): 1. The major will remain at zero; thereby, alerting consumers to the potentially volatile nature of the package. -2. The minor will tend to be more analagous to a `major` release. -3. The patch will tend to be more analagous to a `minor` release or a collection of bug fixes (patches). +2. The minor will tend to be more analogous to a `major` release. +3. The patch will tend to be more analogous to a `minor` release or a collection of bug fixes (patches). |