Re: 2 (possible) problems in documentation

[Alex Vong <alexvong1995@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

Hi,

I have written a patch based on the old patch. Does it look good to
you? By the way, does anyone know how to build the guix website from
source? I want to add some labels so that librejs don't complain the
javascripts being non-free on this page
<https://www.gnu.org/software/guix/packages/>. I have cloned the
guix-artwork repo but I don't know how to set-up or build the websites
(I have zero experience on building websites.).

Cheers,
Alex

On 01/11/2015, Mathieu Lirzin <mthl@gnu.org> wrote:
> Hi again,
>
> Mathieu Lirzin <mthl@gnu.org> writes:
>
>> What do you think of the following patch?
>>
>>From ee2f4467d84ad9516b14c7bd14f821e4bec443cc Mon Sep 17 00:00:00 2001
>> From: Mathieu Lirzin <mthl@gnu.org>
>> Date: Sun, 1 Nov 2015 16:27:07 +0100
>> Subject: [PATCH] doc: Add an exception in "Running Guix Before It Is
>>  Installed".
>>
>> * doc/contributing.texi (Running Guix Before It Is Installed): Add an
>>   exception footnote for `guix pull'.
>>
>> Suggested-by: Alex Vong <alexvong1995@gmail.com>
>
> Please ignore this patch, my mind was confused. :)
>
> --
> Mathieu Lrzin
>
>

[-- Attachment #2: 0001-doc-To-clarify-.-pre-inst-env-guix-pull-won-t-upgrad.patch --]
[-- Type: text/x-patch, Size: 1188 bytes --]

From e562ebc9a9e3859ecc0c1c2e8be6f39a44b5be7d Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Mon, 2 Nov 2015 23:34:16 +0800
Subject: [PATCH] doc: To clarify `./pre-inst-env guix pull` won't upgrade
 local source tree.

* doc/contributing.texi (Running Guix Before It Is Installed): To clarify
`./pre-inst-env guix pull` won't upgrade local source tree
and add a footnote to explain why (thanks to Alex Kost).
---
 doc/contributing.texi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index f855daf..6423d85 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -82,6 +82,12 @@ $ sudo ./pre-inst-env guix-daemon --build-users-group=guixbuild
 $ ./pre-inst-env guix build hello
 @end example
 
+However, note that @command{./pre-inst-env guix pull} will not upgrade your
+local source tree@footnote{@code{guix pull} fetches the latest guix source,
+compiles it, put it to the store and link "~/.config/guix/latest" to it.}.
+You should run @command{git pull} instead
+if you want to upgrade your local source tree.
+
 @noindent
 Similarly, for a Guile session using the Guix modules:
 
-- 
2.1.4