From f8348b91adf7c878ffad2229e60db7c67565a516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 18 Nov 2012 15:22:00 +0100
Subject: [PATCH] Turn Guix into "GNU Guix".

* configure.ac: Change package name to "GNU Guix", and bug-report
  address to `gnu-system-discuss@gnu.org'.
* doc/guix.texi: Replace "Guix" by "GNU Guix" in some places.
  (Top, Introduction): Mention "for the GNU system".
* HACKING, README: Use "GNU Guix" instead of "Guix" in some places.
---
 HACKING       |  2 +-
 README        |  2 +-
 configure.ac  |  2 +-
 doc/guix.texi | 27 ++++++++++++++-------------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/HACKING b/HACKING
index 7916fe2090..b6b9b462f9 100644
--- a/HACKING
+++ b/HACKING
@@ -1,6 +1,6 @@
 -*- mode: org; coding: utf-8; -*-
 
-#+TITLE: Hacking Guix and its incredible distro
+#+TITLE: Hacking GNU Guix and its incredible distro
 
 Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
 
diff --git a/README b/README
index 02c1f34e2e..7e6c3dd719 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 -*- mode: org -*-
 
-Guix is Nix[0] from Guile[1]!
+GNU Guix is Nix[0] from Guile[1]!
 
 Concretely, it allows Nix package management to be done entirely in
 Scheme. The goal is to investigate whether Scheme, and in particular
diff --git a/configure.ac b/configure.ac
index e67468504c..703dee8b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT([Guix], [0.1], [guile-user@gnu.org])
+AC_INIT([GNU Guix], [0.1], [gnu-system-discuss@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([1.11 gnu silent-rules subdir-objects \
diff --git a/doc/guix.texi b/doc/guix.texi
index 4effbc7ea8..637265d873 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4,7 +4,7 @@
 @c %**start of header
 @setfilename guix.info
 @documentencoding UTF-8
-@settitle Guix Reference Manual
+@settitle GNU Guix Reference Manual
 @c %**end of header
 
 @include version.texi
@@ -19,8 +19,8 @@
 @end direntry
 
 @titlepage
-@title{Guix Reference Manual}
-@subtitle{Using the Guix Functional Package Manager}
+@title{GNU Guix Reference Manual}
+@subtitle{Using the GNU Guix Functional Package Manager}
 @author Ludovic Courtès
 
 @page
@@ -41,7 +41,7 @@ Documentation License''.
 @end titlepage
 
 @copying
-This manual documents Guix version @value{VERSION}.
+This manual documents GNU Guix version @value{VERSION}.
 
 Copyright (C) 2012 Ludovic Courtès
 
@@ -57,9 +57,10 @@ Documentation License.''
 
 @c *********************************************************************
 @node Top
-@top Guix
+@top GNU Guix
 
-This document describes Guix version @value{VERSION}.
+This document describes GNU Guix version @value{VERSION}, a functional
+package management tool written for the GNU system.
 
 @menu
 * Introduction::                What is Guix about?
@@ -77,12 +78,12 @@ This document describes Guix version @value{VERSION}.
 @node Introduction
 @chapter Introduction
 
-Guix is a functional package management tool.  Package management
-consists in all the activities that relate to building packages from
-source, honoring the build-time and run-time dependencies on packages,
-installing packages in user environments, upgrading installed packages
-to new versions or rolling back to a previous set, removing unused
-software packages, etc.
+GNU Guix is a functional package management tool for the GNU system.
+Package management consists in all the activities that relate to
+building packages from source, honoring the build-time and run-time
+dependencies on packages, installing packages in user environments,
+upgrading installed packages to new versions or rolling back to a
+previous set, removing unused software packages, etc.
 
 @cindex functional package management
 The term @dfn{functional} refers to a specific package management
@@ -119,7 +120,7 @@ The remainder of this manual describes them.
 @node Package Management
 @chapter Package Management
 
-The purpose of Guix is to allow users to easily install, upgrade, and
+The purpose of GNU Guix is to allow users to easily install, upgrade, and
 remove software packages, without having to know about their build
 procedure or dependencies.  Guix also goes beyond this obvious set of
 features.