diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-07 18:26:11 +0100 |
| commit | 9e111db4535b3cd5729e37294ae51d95240334b4 (patch) | |
| tree | cc90a9de80ff39bd93426b763918d904abfeeb56 /doc | |
| parent | 92b61d3e1bb50f0c1d087bc8d57cc00c3ce360df (diff) | |
| parent | cf69135d5e6797e566b8bb18419ae9e3c8aeb621 (diff) | |
| download | patches-9e111db4535b3cd5729e37294ae51d95240334b4.tar patches-9e111db4535b3cd5729e37294ae51d95240334b4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 2267fadd1d..c14df7fcd3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5992,7 +5992,7 @@ Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. Information is taken from the JSON-formatted metadata provided through -@uref{https://api.metacpan.org/, MetaCPAN's API} and includes most +@uref{https://fastapi.metacpan.org/, MetaCPAN's API} and includes most relevant information, such as module dependencies. License information should be checked closely. If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the @@ -8241,8 +8241,8 @@ in particular: @itemize @item -Make sure the @code{grub-configuration} form refers to the target you -want to install GRUB on. It should mention @code{grub-bootloader} if +Make sure the @code{bootloader-configuration} form refers to the target +you want to install GRUB on. It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems. For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path |