From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 31 Dec 2016 15:43:01 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/doc'
X-Git-Tag: v0.5.7~3
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c6a123a4bfdce6c278ece9d368ad94c33db567da

Merge branch 'refs/heads/t/doc'

The contributing section for the user manual and a few other
documentation updates.

* refs/heads/t/doc:
  signal.h: Add documentation of signal_pre_select().
  manual: Fix kernel coding style link.
  user manual: Add section on contributing.
---

c6a123a4bfdce6c278ece9d368ad94c33db567da
diff --cc NEWS.md
index 3d00528d,a7af7717..d47141ce
--- a/NEWS.md
+++ b/NEWS.md
@@@ -15,7 -15,6 +15,8 @@@ NEW
  - The wma decoder and audio format handler now correctly decodes
    files with unusual block sizes.
  - We now compile with -Wformat-signedness if possible.
 +- The touch command now refuses to set an invalid image or lyrics ID.
++- New section on contributing for the user manual.
  
  Download: [tarball](./releases/paraslash-git.tar.bz2)