diff --git a/src/en/general-development/codebase-info/releases.md b/src/en/general-development/codebase-info/releases.md index f957daf9c..1a7915bd1 100644 --- a/src/en/general-development/codebase-info/releases.md +++ b/src/en/general-development/codebase-info/releases.md @@ -16,7 +16,7 @@ Any issue that directly impacts a player's ability to play the game in a largely ### Branching There are *three* branches that are used in this process: -**Master:** This is the primary development branch and where PRs normally get merged into. Content in the development branch is not final and may be reverted or changed before ending up being released. This branch should generally not be used for hosting a server or as an upstream since it is not guarunteed to be stable and may have reverts. +**Master:** This is the primary development branch and where PRs normally get merged into. Content in the development branch is not final and may be reverted or changed before ending up being released. This branch should generally not be used for hosting a server or as an upstream since it is not guaranteed to be stable and may have reverts. **Stable:** This is the "release" branch that the wizden servers run off of. Content in this branch should generally be considered "commited" and won't be reverted except for in exceptional circumstances. This is the branch you should use as an upstream or if you are hosting a server. Only bugfix PR gets directly merged into this branch, content PRs are merged into "master" and then the entire branch is deployed to "staging" and then merged into "stable".