Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / README

diff --git a/README b/README
index 4f0e3c08ca28c66cc7d4cacdc6aa73d1fd8ba087..7819b883a378195df71bb94030c0c14f08e79381 100644 (file)
--- a/README
+++ b/README
@@ -15,8 +15,11 @@ GNU package (http://www.gnu.org/).
 This is an ALPHA release.  There are known and significant bugs as
 well as many missing features in this release.
 
+GNUnet is free software released under the GNU General Public License
+(v3 or later). For details see the COPYING file in this directory.
+
 Additional documentation about GNUnet can be found at
-https://gnunet.org/.
+https://gnunet.org/ and in the doc/ folder.
 
 
 Dependencies:
@@ -47,21 +50,27 @@ These are the direct dependencies for running GNUnet:
 - libpulse      >= 2.0 (optional for experimental conversation tool)
 - libogg        >= 1.3.0 (optional for experimental conversation tool)
 - python-zbar   >= 0.10 (optional for gnunet-qr)
-- TeX Live      >= 2012 (optional for gnunet-bcd)
+- TeX Live      >= 2012 (optional for gnunet-bcd[*])
+- Texinfo       >= 5.2
 - libglpk       >= 4.45 (optional for experimental code)
 
-Recommended autotools for compiling the SVN version are:
+Recommended autotools for compiling the git version are:
 - autoconf >= 2.59
 - automake >= 1.11.1
 - libtool  >= 2.2
 
 
+[*] Mandatory for compiling the info output of the documentation,
+a limited subset ('texlive-tiny' in Guix) is enough.
+
 How to install?
 ===============
 
 The fastest way is to use a binary package if it is available for your
 system.  For a more detailed description, read the installation
 instructions on the webpage at https://gnunet.org/installation.
+Generic installation instructions are in the INSTALL file in this
+directory.
 
 Note that some functions of GNUnet require "root" access.  GNUnet will
 install (tiny) SUID binaries for those functions is you run "make
@@ -134,7 +143,7 @@ install' process with SUDO rights, the libraries will be installed to
 "$GNUNET_PREFIX" and you will have to move them to "/lib/"
 manually.
 
-Finally, if you are compiling the code from subversion, you have to
+Finally, if you are compiling the code from git, you have to
 run ". bootstrap" before ./configure.  If you receive an error during
 the running of ". bootstrap" that looks like "macro `AM_PATH_GTK' not
 found in library", you may need to run aclocal by hand with the -I
@@ -299,7 +308,7 @@ Stay tuned
 
 * https://gnunet.org/
 * https://gnunet.org/bugs/
-* https://gnunet.org/svn/
+* https://gnunet.org/git/
 * http://www.gnu.org/software/gnunet/
 * http://mail.gnu.org/mailman/listinfo/gnunet-developers
 * http://mail.gnu.org/mailman/listinfo/help-gnunet