[Git][NTPsec/ntpsec][master] 2 commits: Shorten version number description

[Richard Laager]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
16674876 by Richard Laager at 2020-12-31T14:03:26-06:00
Shorten version number description

- - - - -
6c62cc8a by Richard Laager at 2020-12-31T14:05:15-06:00
Change "pull request" to "merge request"

GitLab calls them "merge requests".

- - - - -


1 changed file:

- devel/hacking.adoc


Changes:

=====================================
devel/hacking.adoc
=====================================
@@ -499,11 +499,11 @@ C was the minor.  They also use release-candidate suffixes.
 
 Release builds have version strings of the form:
 
-<base version number><trim()d --build-desc with a prepended space>
+<X.Y.Z>[ <build-desc>]
 
 Development builds have version strings of the form:
 
-<base version number>+<commits since last tag>-g<git short hash><conditional '-dirty'> <trim()d --build-desc with a prepended space>
+<X.Y.Z>+<# of commits since tag>-g<git short hash>[-dirty][ <build-desc>]
 
 == Contribution workflow and conventions
 
@@ -530,14 +530,14 @@ We use GitLab.com as our forge.
 
 Our GitLab group is at https://gitlab.com/groups/NTPsec
 
-Please use the issue tracker and the pull request process at GitLab.com.
+Please use the issue tracker and the merge request process at GitLab.com.
 
 If you wish, you can request to join the GitLab project team at
 https://gitlab.com/groups/NTPsec/group_members and we will add you to the
 team with Guest access; this will cause GitLab to send issue tracker
 updates and pipeline updates to your email address.  You do not have
 to formally be a member of the GitLab team to participate, contribute,
-or send issues, patches, or pull requests.
+or send issues, patches, or merge requests.
 
 Granting other levels of GitLab project team access is at the discretion
 of the Project Manager, after consulting with the existing core team.



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/c09978ebd79327ba2a30a6bce4cb7029e72a7c83...6c62cc8a8256d22db34a8e9399f77bae12d07b0b

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/c09978ebd79327ba2a30a6bce4cb7029e72a7c83...6c62cc8a8256d22db34a8e9399f77bae12d07b0b
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20201231/9781f297/attachment-0001.htm>