From 5c4800e43028e030410fbe2583d27f55748e9fb0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 17 Jul 2011 00:50:39 +0200
Subject: [PATCH] Vanilla is gone, say hello to Void GNU/Linux.

---
 README                        | 16 +++++++---------
 xbps-src/README               | 12 +++++++-----
 xbps-src/etc/xbps-src.conf.in |  4 +---
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/README b/README
index 2927311d18..1f066cbd73 100644
--- a/README
+++ b/README
@@ -1,14 +1,12 @@
-Welcome to the official Vanilla GNU/Linux git repository.
-=================================================================
-
-Vanilla GNU/Linux is a new distribution that uses XBPS as its package system,
+Void GNU/Linux is a new distribution that uses XBPS as its package system,
 The X Binary Package System has been designed from scratch, please visit
 http://code.google.com/p/xbps for more information.
 
-Vanilla GNU/Linux is a simple and minimal distribution that can be customized
-in many ways. Currently there are ~1500 packages in the stable repository that you can
-build. There is support for i686 and x86_64 architectures, more
-may be added in a future (i.e. ARM) but it's not a high priority.
+Void GNU/Linux is a simple and minimal distribution that can be customized
+in many ways, through the use of virtual packages. Currently there are
+1500 packages in the current repository that you can build and install.
+There is support for i686 and x86_64 architectures, more may be added in
+a future (i.e. ARM) but it's not a high priority.
 
 Some features:
  - It's not a fork or customized version of any distro, it has been created
@@ -37,7 +35,7 @@ testing purposes along with the minimal base system.
 
 You can find the Live Images at:
 
-http://xbps.nopcode.org/vanilla/live/
+http://xbps.nopcode.org/live/
 
 If you have questions or contributions please use the google groups forum:
 
diff --git a/xbps-src/README b/xbps-src/README
index d6d18803f3..49143a6e0d 100644
--- a/xbps-src/README
+++ b/xbps-src/README
@@ -78,7 +78,7 @@ to be installed into the host system:
  - awk, bash, gcc c++, gettext, patch, texinfo, perl and fakeroot.
  - xbps static utilities, available from http://code.google.com/p/xbps.
    (use the latest available stable version) or
-   'xbps-bin -y install xbps-static' if using Vanilla GNU/Linux.
+   'xbps-bin -y install xbps-static' if using Void GNU/Linux.
 
 Additionally if you want to work as 'root':
 
@@ -89,15 +89,15 @@ Starting up
 Firstly you'll have to download the `git` repository that contains `xbps-src`
 and the build template files. To clone it with `git` use:
 
-----------------------------------------------------
-$ git clone git://github.com/xtraeme/vanilla.git
-----------------------------------------------------
+-----------------------------------------------------------------
+$ git clone https://code.google.com/p/xbps.packages xbps-packages
+-----------------------------------------------------------------
 
 `xbps-src` and its shell utilities need to be installed in a directory
 for correct operation, that is accomplished by issuing:
 
 --------------------------------------------------
-$ cd vanilla/xbps-src && make install clean
+$ cd xbps-packages/xbps-src && make install clean
 --------------------------------------------------
 
 This will install all files into `/usr/local` by default, can be changed
@@ -238,3 +238,5 @@ suggestion about *xbps-src* and the build templates, don't forget that there
 is a mailing list to talk about it on:
 
 http://groups.google.com/xbps
+
+or join us at #xbps on irc.freenode.net.
diff --git a/xbps-src/etc/xbps-src.conf.in b/xbps-src/etc/xbps-src.conf.in
index 363d0ebe45..8c5258811a 100644
--- a/xbps-src/etc/xbps-src.conf.in
+++ b/xbps-src/etc/xbps-src.conf.in
@@ -1,11 +1,9 @@
 #
 # Configuration file for xbps-src.
-#
 
-#
 # Directory where the xbps-src GIT repository is stored. This is
 # required to be mounted in the chroot. You shouldn't need to modify this
-# one unless your vanilla/xbps-templates repo has been moved to another path.
+# one unless your xbps-packages repo has been moved to another path.
 #
 XBPS_DISTRIBUTIONDIR=@@XBPS_DISTRIBDIR@@