diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
| commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
| tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /etc | |
| parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
| parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
| download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/news.scm | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/etc/news.scm b/etc/news.scm index b498ce139d..0bdde6aa8b 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -11,6 +11,25 @@ (channel-news (version 0) + (entry (commit "e1e6491226347d9fb93ff484d78cef98848a510a") + (title (en "Guix Cookbook now available as Info")) + ;; TRANSLATORS: Adjust the URL and the 'info' command to refer to the + ;; translated manual if it's available. + (body (en "The new Guix Cookbook is now fetched by @command{guix pull} +and thus readily available in the Info format. It aims to provide tutorials +and detailed examples covering a variety of use cases. You can access it by +typing: + +@example +info guix-cookbook +@end example + +The Cookbook is currently available in English and German. You can also find +it @uref{https://guix.gnu.org/cookbook/en/, on-line}. + +Your contributions are welcome: @uref{https://guix.gnu.org/contact/, get in +touch with the developers} to share your recipes!"))) + (entry (commit "2ca7af43fe17d9acf082dce85d137a27a8ac4887") (title (en "Further reduced binary seed bootstrap")) (body |