libblkid: make example more robust

[thirdparty/util-linux.git] / Documentation / howto-contribute.txt

diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index 9afc17c124439299c92124fe4df6995b7044a039..97f3ce1e1600b08fccb686eeaf14d1ca73bf502d 100644 (file)
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -31,8 +31,8 @@ Sending Patches
        * don't include generated (autotools) files in your patches.
          Hint: use 'git clean -Xd'.
 
-        * don't include po/ (tranlations) changes to the upstream patches.
-          The po/ stuff is maintained on http://translationproject.org/domain/util-linux.html
+        * don't include po/ (translations) changes to the upstream patches.
+          The po/ stuff is maintained on https://translationproject.org/domain/util-linux.html
           and updated always before the next release.
 
        * neutrality: the files in util-linux should be distribution-neutral.
@@ -44,26 +44,28 @@ Repositories & Branches
        * Primary repository is on kernel.org:
           git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
 
-         We use this repository for master and stable branches only.
-
        * Backup repository at github.com:
-         git clone git://github.com/karelzak/util-linux.git
+         git clone https://github.com/util-linux/util-linux.git
 
-         We use this repository to backup kernel.org and for pull requests,
-         issues tracking and topic branches. The master and stable branches are
-         always pushed to the both repositories in the same time.
+         We use this repository to backup kernel.org and for PULL REQUESTS,
+         issues tracking. The master and stable branches are always pushed to
+         the both repositories in the same time.
 
          It's recommended to use github.com for development.
 
        * Branches:
 
-         master   - development for the next release
-         stable/* - stable maintenance releases
-
-         Github only:
+         master      - continuous development
+         stable/vX.Y - stable releases
 
-         next     - optionally used when master branch is frozen due to -rcN releases
-         topic/*  - long time development
+         Since version 2.40, the "master" branch remains continuously open and is 
+         never subjected to feature freezes. The stabilization process for
+         the upcoming release is exclusively conducted within the "stable/" branches.
+         Upon branching from "master" to "stable/vX.Y," a new tag vX.Y+1-devel
+         is generated to serve as placeholder for git-based versioning (refer to
+         tools/git-version-gen). Subsequently, changes specific to the new release
+         (such as po/ updates) are selectively cherry-picked from "stable/vX.Y" to
+         "master" after the final release.
 
 Patching Process
 
@@ -162,7 +164,7 @@ Coding Style
        * the preferred coding style is based on the linux kernel coding-style.
          Available here:
 
-       http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/process/coding-style.rst
+       https://docs.kernel.org/process/coding-style.html
 
        * use 'FIXME:' with a good description, if you want to inform others
          that something is not quite right, and you are unwilling to fix the
@@ -244,5 +246,5 @@ Standards Compliance
                The Single UNIX(TM) Specification, Version 2
                Copyright (C) 1997 The Open Group
 
-               http://pubs.opengroup.org/onlinepubs/7908799/xcuix.html
+               https://pubs.opengroup.org/onlinepubs/7908799/xcuix.html