merge README.text and README

2 files changed, 20 insertions, 28 deletions

diff --git a/README b/README
deleted file mode 100644
index d1a6159..0000000
--- a/README
+++ /dev/null
@@ -1,27 +0,0 @@
-www_shared
-==========
-
-Shared code between taler.net and gnunet.org to build a jinja2-based
-website.
-
-This code provides building blocks for generating the html pages and
-other repeating tasks.
-
-Usage
------
-
-The code expects to sit in 'inc', which for gnunet.org is the folder
-where this submodule is checked out to. For more practical
-applications of it refer to the source code of gnunet.org.
-
-Dependencies
-------------
-
-python3, jinja2, BeautifulSoup 4, ruamel.yaml
-
-License
--------
-Everything in here is to be placed in the public domain, due to
-ambiguity of "public domain" in some countries the code is 0-BSD
-licensed.
-New code should follow this licensing choice.
diff --git a/README.text b/README.text
index fed16ea..d9650ce 100644
--- a/README.text
+++ b/README.text
@@ -1,12 +1,31 @@
+www_shared
+==========
 Common shared components for the websites of GNUnet and Taler.
 
 This is meant to be imported by a jinja2 project with a
 structure equivalent to https://git.gnunet.org/www.git
 or https://git.taler.net/www.git.
 
+Usage
+-----
+
+The code expects to sit in 'inc', which for gnunet.org is the folder
+where this submodule is checked out to. For more practical
+applications of it refer to the source code of gnunet.org.
+
 Changes to this code must be usable outside of the structure
 of one website, ie this affects both websites and if in doubt
 should be tested against both as soon as both websites have
 been switched to this code.
 
-Code should be mostly 0BSD / Public Domain.
+Dependencies
+------------
+
+python3, jinja2, BeautifulSoup 4, ruamel.yaml
+
+License
+-------
+Everything in here is to be placed in the public domain, due to
+ambiguity of "public domain" in some countries the code is 0-BSD
+licensed.
+New code should follow this licensing choice.