about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-06-14 18:01:25 +0000
committerGitHub <noreply@github.com>2022-06-14 18:01:25 +0000
commit34bc19a1dc1418e87b53326f1b331825daa795a0 (patch)
treedc09cfba08c016c93903bb0d489dd6132cb8c453 /doc
parent452a7d6c43872ff73082bb889264e9d02a6cc986 (diff)
parent7a9920561983f35934bf43b61d101f05a8755fb1 (diff)
Merge master into staging-next
Diffstat (limited to 'doc')
-rw-r--r--doc/contributing/submitting-changes.chapter.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index 6f87e015b9cf3..471e45d7dfb30 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -227,7 +227,7 @@ digraph {
 }
 ```
 
-[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours.
+[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above.  The purple arrows in the diagram above are done manually and much less frequently.  You can get an idea of how often these merges occur by looking at the git history.
 
 
 ### Master branch {#submitting-changes-master-branch}