summaryrefslogtreecommitdiff
path: root/doc/branches.md
diff options
context:
space:
mode:
authorEli Weiss <eliwss0@gmail.com>2021-12-02 14:50:59 -0600
committerJF <JF002@users.noreply.github.com>2021-12-30 20:57:26 +0100
commit90352af626cc0087143e824f62f5dcee9f58f29c (patch)
tree1a103ebf44797196869faa3d70b84ae31f74dafd /doc/branches.md
parentc8214bc666a5daf1b0c1c323ae4af7cb5ae2510b (diff)
Improved documentation readability
Improved documentation readability by rephrasing confusing sentences. Added Sitronix ST7789V datasheet link to SPI-LCD-driver.md for easier reference.
Diffstat (limited to 'doc/branches.md')
-rw-r--r--doc/branches.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/branches.md b/doc/branches.md
index ef280f40..b06c10cc 100644
--- a/doc/branches.md
+++ b/doc/branches.md
@@ -9,4 +9,4 @@ New features should be implemented in **feature branches** created from **develo
To release a new version of the application, when develop is considered stable, a **release** branch is created from **develop**. This can be considered as a *release candidate* branch. When everything is OK, this release branch is merged into **master** and the release is generated (a tag is applied to git, the release note is finalized, binaries are built,...) from **master**.
-Git flow also supports the creation of **hotfix** branches when a bug is discovered in a released version. The **hotfix** branch is created from **master** and will be used only to implement a fix to this bug. Multiple hotfix branches can be created for the same release if more than one bugs are discovered. \ No newline at end of file
+Git flow also supports the creation of **hotfix** branches when a bug is discovered in a released version. The **hotfix** branch is created from **master** and will be used only to implement a fix to this bug. Multiple hotfix branches can be created for the same release if multiple bugs are discovered. \ No newline at end of file