[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www_shared] 12/19: merge README.text and README
From: |
gnunet |
Subject: |
[www_shared] 12/19: merge README.text and README |
Date: |
Sat, 25 Jan 2020 11:29:27 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository www_shared.
commit 22216ab267e7139a1e476fdad7f0193778aed4c8
Author: ng0 <address@hidden>
AuthorDate: Sun Dec 8 10:37:19 2019 +0000
merge README.text and README
---
README | 27 ---------------------------
README.text | 21 ++++++++++++++++++++-
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.
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [www_shared] 06/19: readme, (continued)
- [www_shared] 06/19: readme, gnunet, 2020/01/25
- [www_shared] 01/19: init from www.git, gnunet, 2020/01/25
- [www_shared] 03/19: drop sum.py, remove function from fileproc., gnunet, 2020/01/25
- [www_shared] 09/19: rss2.0 spec., gnunet, 2020/01/25
- [www_shared] 14/19: add macro for single link preview, gnunet, 2020/01/25
- [www_shared] 08/19: follow-up, add rss, gnunet, 2020/01/25
- [www_shared] 05/19: add sitemap generator script in python., gnunet, 2020/01/25
- [www_shared] 07/19: debug print statements., gnunet, 2020/01/25
- [www_shared] 11/19: Merge branch 'default' of gnunet.org:www_shared into default, gnunet, 2020/01/25
- [www_shared] 17/19: news.macro.j2: use date: title for shortnews, gnunet, 2020/01/25
- [www_shared] 12/19: merge README.text and README,
gnunet <=
- [www_shared] 18/19: avoid need to have Makefile set PYTHONPATH (breaks then other things), gnunet, 2020/01/25
- [www_shared] 16/19: remove forgotten todo file, gnunet, 2020/01/25
- [www_shared] 13/19: Add copyright header, fix copyright headers., gnunet, 2020/01/25
- [www_shared] 10/19: licensing, notes, todo, readme, gnunet, 2020/01/25
- [www_shared] 15/19: site.py: expose conf directly to jinja2., gnunet, 2020/01/25
- [www_shared] 19/19: add mybabel wrapper, gnunet, 2020/01/25