From 6ad5d5048286cbb5dcb144d018423ba942583ee8 Mon Sep 17 00:00:00 2001 From: Ramy Elgammal Date: Fri, 12 Aug 2022 16:57:10 +0100 Subject: Fix note in guidelines doc Partially Resolves: COMPMID-5346 Signed-off-by: Ramy Elgammal Change-Id: I26212bfb46cd451ef01956ade0a306bbdbf5940e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8069 Reviewed-by: Adnan AlSinan Reviewed-by: SiCong Li Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- docs/contributor_guide/contribution_guidelines.dox | 2 +- docs/user_guide/release_version_and_change_log.dox | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributor_guide/contribution_guidelines.dox b/docs/contributor_guide/contribution_guidelines.dox index f26a709897..4a3ae4db2e 100644 --- a/docs/contributor_guide/contribution_guidelines.dox +++ b/docs/contributor_guide/contribution_guidelines.dox @@ -42,7 +42,7 @@ As part of the initiative to use inclusive language, there are certain phrases a Please also follow this guideline when committing changes to Compute Library. It is worth mentioning that the term "master" is still used in some comments but only in reference to external code links that Arm has no governance on. -Futhermore, starting from this release (22.05), 'master' branch will no longer be used, it has been replaced by 'main'. Please update your clone jobs accordingly. +Futhermore, starting from release (22.05), 'master' branch is no longer being used, it has been replaced by 'main'. Please update your clone jobs accordingly. @section S5_1_coding_standards Coding standards and guidelines Best practices (as suggested by clang-tidy): diff --git a/docs/user_guide/release_version_and_change_log.dox b/docs/user_guide/release_version_and_change_log.dox index 1eeb11189e..8fb143c22a 100644 --- a/docs/user_guide/release_version_and_change_log.dox +++ b/docs/user_guide/release_version_and_change_log.dox @@ -37,7 +37,7 @@ If there is more than one release in a month then an extra sequential number is v17.04 (First release of April 2017) @note We're aiming at releasing one major public release with new features per quarter. All releases in between will only contain bug fixes. -@note Starting from release 22.05, 'master' branch will no longer be used, it has been replaced by 'main'. Please update your clone jobs accordingly. +@note Starting from release 22.05, 'master' branch is no longer being used, it has been replaced by 'main'. Please update your clone jobs accordingly. @section S2_2_changelog Changelog -- cgit v1.2.1