diff options
| author | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 10:13:11 +0800 |
|---|---|---|
| committer | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 10:13:11 +0800 |
| commit | c3458855bdb52c976ee6689ad5a0d4e92e96f2e3 (patch) | |
| tree | d9dbbcc3087b5bfc520710b5f5624a3f4e2b78e6 /packages/markdown/marked/docs/PUBLISHING.md | |
| parent | 444848876759173ad80203129250d2f0311f30fc (diff) | |
| parent | cfcc73724fcd394150d1b815d0a7a4c466e216b5 (diff) | |
| download | wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.tar.gz wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.tar.bz2 wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.zip | |
Merge branch 'master' into lib-change
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). |