[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/04: doc: Remove references to

From: guix-commits
Subject: 02/04: doc: Remove references to
Date: Sat, 29 Jun 2019 08:54:11 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 44b5f28a77d94609cc43d713c46f6c1bdc4e380b
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Jun 28 16:19:15 2019 +0200

    doc: Remove references to
    * doc/contributing.texi (Packaging Guidelines, Submitting Patches):
    Replace hydra URL with @value{SUBSTITUTE-SERVER}.
    * doc/guix.texi (Official Substitute Server): Remove ‘hydra’ @cindex.
    (Substitute Server Authorization): Remove note about
 doc/contributing.texi | 5 ++---
 doc/guix.texi         | 7 -------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 6770fae..e00634e 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -281,8 +281,7 @@ Once your package builds correctly, please send us a patch
 (@pxref{Submitting Patches}).  Well, if you need help, we will be happy to
 help you too.  Once the patch is committed in the Guix repository, the
 new package automatically gets built on the supported platforms by
-@url{, our continuous integration
+@url{@value{SUBSTITUTE-SERVER}, our continuous integration system}.
 @cindex substituter
 Users can obtain the new package definition simply by running
@@ -893,7 +892,7 @@ changes).  This branch is intended to be merged in 
@code{master} every
 2.5 months or so.
 @end table
-All these branches are @uref{,
+All these branches are @uref{@value{SUBSTITUTE-SERVER},
 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
diff --git a/doc/guix.texi b/doc/guix.texi
index f0d148a..f6be4c6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3134,7 +3134,6 @@ also result from derivation builds, can be available as 
 @node Official Substitute Server
 @subsection Official Substitute Server
-@cindex hydra
 @cindex build farm
 The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official 
build farm
 that builds packages from Guix continuously for some
@@ -3186,12 +3185,6 @@ Then, you can run something like this:
 # guix archive --authorize < 
 @end example
-@quotation Note
-Similarly, the @file{} file contains the public key
-of an independent build farm also run by the project, reachable at
-@end quotation
 Once this is in place, the output of a command like @code{guix build}
 should change from something like:

reply via email to

[Prev in Thread] Current Thread [Next in Thread]