From f5a56033a21f37291703ae11fe4bf02aee66763b Mon Sep 17 00:00:00 2001 From: Masoud Abkenar Date: Sun, 26 Jun 2016 08:45:59 +0200 Subject: [PATCH] actual -> current Longman Dictionary says: Do not use actual to mean 'at the present time'. Use current or present http://www.ldoceonline.com/dictionary/actual http://english.stackexchange.com/questions/29654/using-actual-to-signify-current --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54e7f5352e..76007460f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -140,7 +140,7 @@ Examples for different versions: * 8.12.2 ```80120200``` * 9.8.4-rc18 ```90080418``` -beware, that beta releases for an upcoming version will always use the minor and hotfix version of the actual release not the upcoming so that the version code of the upcoming stable release will always be higher so the actual beta release can be updated to the latest hot fix release. +beware, that beta releases for an upcoming version will always use the minor and hotfix version of the current release not the upcoming so that the version code of the upcoming stable release will always be higher so the current beta release can be updated to the latest hot fix release. ## Release cycle @@ -172,4 +172,4 @@ Release Candidate releases are based on the git [master](https://github.com/next Beta releases are based on the git [beta](https://github.com/nextcloud/android/tree/beta) and are done independently from stable releases and integrate open PRs that might not be production ready or heavily tested but being put out there for people willing to test new features and provide valuable feedback on new features to be incorporated before a feature gets released in the stable app. 1. Bump the version name and version code in the [AndroidManifest.xml](https://github.com/nextcloud/android/blob/master/AndroidManifest.xml), see below the version name and code concept. -2. Create a [release/tag](https://github.com/nextcloud/android/releases) in git. Tag name following the naming schema: ```beta-YYYYMMDD``` (e.g. beta-20160612) \ No newline at end of file +2. Create a [release/tag](https://github.com/nextcloud/android/releases) in git. Tag name following the naming schema: ```beta-YYYYMMDD``` (e.g. beta-20160612)