From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 14 Jul 2017 12:50:43 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/manual'
X-Git-Tag: v0.6.1~68
X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=8bbbc7f397b5068407928bd594a2dea921b8410e;p=paraslash.git

Merge branch 'refs/heads/t/manual'

A couple of patches which merge the contents of the overview.pdf file
into the user manual. After this, the documentation no longer depends
on dia.

Cooking for six weeks.

* refs/heads/t/manual:
  manual: Expand description of para_play.
  manual: Omit level 3 headers from table of contents.
  manual: Combine overview.pdf and the user manual.
  manual: Remove text about permissions of /var/paraslash.
  manual: Correct format of para_client help output.
  manual: Add lopsub installation instructions to quick start.
---

8bbbc7f397b5068407928bd594a2dea921b8410e
diff --cc NEWS.md
index 60b94238,60b94238..313446f8
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,6 -1,6 +1,13 @@@
  NEWS
  ====
  
++------------------------------------------------
++0.6.1 (to be announced) "hyperbolic correlation"
++------------------------------------------------
++
++- The contents of overview.pdf have been integrated into the user
++  manual.
++
  -------------------------------
  0.6.0 (2017-04-28) "fuzzy flux"
  -------------------------------