[DRE-commits] [SCM] camping.git branch, master, updated. upstream/2.1-11-g60a9b8d

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit c6569cf3a4f42e5ebee1c828ce9074288e8d99ed
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jan 25 14:16:28 2012 +0100

    debian/NEWS: fix indentation and make lintian happy

diff --git a/debian/NEWS b/debian/NEWS
index 58e8068..c40967b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,19 +1,19 @@
 camping (2.1.498-1) UNRELEASED; urgency=low
 
- As of version 2.2, Camping no longer uses Markaby as its default
- templating engine but Mab (see also [1]).  Due to license issues, Markaby
- development was halted[2] and also removed from Debian.  Mab is almost
- fully backward compatible with Markaby but differs on two small points:
+  As of version 2.2, Camping no longer uses Markaby as its default
+  templating engine but Mab (see also [1]).  Due to license issues, Markaby
+  development was halted[2] and also removed from Debian.  Mab is almost
+  fully backward compatible with Markaby but differs on two small points:
 
- * in Markaby, the string resulting from `text "foo"` is not escaped,
-   in Mab it _is_ escaped, but it is not escaped in `text! "foo"`.
+  * in Markaby, the string resulting from `text "foo"` is not escaped,
+    in Mab it _is_ escaped, but it is not escaped in `text! "foo"`.
 
- * in Markaby one can use <<, which is not present in Mab but still
-   provided by Camping::Mab
+  * in Markaby one can use <<, which is not present in Mab but still
+    provided by Camping::Mab
 
- Of course, it is also possible to use Tilt instead of Mab.
+  Of course, it is also possible to use Tilt instead of Mab.
 
- 1: http://github.com/camping/mab#readme>
- 2: http://rubyforge.org/pipermail/camping-list/2011-December/001709.html
+  1: http://github.com/camping/mab#readme>
+  2: http://rubyforge.org/pipermail/camping-list/2011-December/001709.html
 
  -- Paul van Tilburg <paulvt at debian.org>  Wed, 25 Jan 2012 13:33:11 +0100

-- 
camping.git