summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-05-26 15:39:13 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-06-16 21:35:24 +0200
commit38ab778fbd676fe7f7a84220d0cf7f474573dc2b (patch)
treedf58f61b5bef1c51f47f6897b30497f76652a7d4
parentf77886c1c5f3c2bf33b78391cea5c4e5b2c05948 (diff)
doc: Clarify when branches are "frozen".
* doc/contributing.texi (Submitting Patches): Provide a link to Hydra. Add section about freezing branches.
-rw-r--r--doc/contributing.texi11
-rw-r--r--doc/guix.texi2
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 205c972aea..ca44b3b0b0 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -407,12 +407,19 @@ changes). This branch is intended to be merged in @code{master} every
2.5 months or so.
@end table
-All these branches are tracked by our build farm
-and merged into @code{master} once
+All these branches are @uref{https://hydra.gnu.org/project/gnu,
+tracked by our build farm} and merged into @code{master} once
everything has been successfully built. This allows us to fix issues
before they hit users, and to reduce the window during which pre-built
binaries are not available.
+Generally, branches other than @code{master} are considered
+@emph{frozen} if there has been a recent evaluation, or there is a
+corresponding @code{-next} branch. Please ask on the mailing list or
+IRC if unsure where to place a patch.
+@c TODO: It would be good with badges on the website that tracks these
+@c branches. Or maybe even a status page.
+
@item
@cindex determinism, of build processes
@cindex reproducible builds, checking
diff --git a/doc/guix.texi b/doc/guix.texi
index a90af34f80..1ecb110020 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -37,7 +37,7 @@ Copyright @copyright{} 2017 Carlo Zancanaro@*
Copyright @copyright{} 2017 Thomas Danckaert@*
Copyright @copyright{} 2017 humanitiesNerd@*
Copyright @copyright{} 2017 Christopher Allan Webber@*
-Copyright @copyright{} 2017 Marius Bakke@*
+Copyright @copyright{} 2017, 2018 Marius Bakke@*
Copyright @copyright{} 2017 Hartmut Goebel@*
Copyright @copyright{} 2017 Maxim Cournoyer@*
Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@*