Merge pull request #1 from friendica/develop

[friendica.git] / doc / Update.md

diff --git a/doc/Update.md b/doc/Update.md
index 7f8a0fcae5bbf76051f1b446f1dc415ae6030e3d..c4fe16186380c011d539b895e51baed3d93a2422 100644 (file)
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -36,11 +36,11 @@ The addon tree has to be updated separately like so:
     git pull
 
 For both repositories:
-The default branch to use is the ``master`` branch, which is the stable version of Friendica.
+The default branch to use is the ``stable`` branch, which is the stable version of Friendica.
 It is updated about four times a year on a fixed schedule.
 
 If you want to use and test bleeding edge code please checkout the ``develop`` branch.
-The new features and fixes will be merged from ``develop`` into ``master`` after a release candidate period before each release.
+The new features and fixes will be merged from ``develop`` into ``stable`` after a release candidate period before each release.
 
 Warning: The ``develop`` branch is unstable, and breaks on average once a month for at most 24 hours until a patch is submitted and merged.
 Be sure to pull frequently if you choose the ``develop`` branch.