aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorYuchen Pei <me@ypei.me>2018-04-29 19:30:22 +0200
committerYuchen Pei <me@ypei.me>2018-04-29 19:30:22 +0200
commitc61f65701b6304ae82b41bb59acc39ef7d3d2502 (patch)
tree8931677f0583e3c231e2a484cb19936e81b78ae7 /README.md
parent2822a3c7dd36d52e550f501602b135b330f6ab48 (diff)
parent4fa8a77b088a9028f4838cfca4d3a0ccc88eb390 (diff)
Merge branch 'master' into dev
Diffstat (limited to 'README.md')
-rw-r--r--README.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/README.md b/README.md
index 777fa01..ee28797 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
This repository hosts all that is necessary to build [my personal webpage](https://ypei.me).
-It roughly consists of two parts, the contents and the code. The contents are the markdown files, and the code are the python code, css code and templates.
+It roughly consists of two parts, the web content and the code. The former is in the markdown files, whereas the latter corresponds to the python, css, and the html template files.
The python code (`engine/engine.py`) is a tiny static site generator depending on [pypandoc](https://pypi.python.org/pypi/pypandoc), [PyYAML](http://pyyaml.org/) and [pyatom](https://pypi.python.org/pypi/pyatom).
-The contents are licensed under CC-BY-ND unless otherwise specified.
-The code is licensed under GPLv3+.
+The content is licensed under CC-BY-ND unless otherwise specified, and the code is licensed under GPLv3+. \ No newline at end of file