[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-20-g2644bc1

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 2644bc11fb2919b99ff584e038378f5910565ccf
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Feb 16 10:14:52 2011 +0100

    Updated documentation files.

diff --git a/debian/NEWS b/debian/NEWS
index 01637c3..b2b4583 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.3d-4) unstable; urgency=low
+
+    Starting from this version /etc/proftpd/proftpd.conf also includes 
+    all files present at /etc/proftpd/conf.d/ to allow a better customization
+    without need of changing the main system files. 
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
+
 proftpd-dfsg (1.3.2e-3) unstable; urgency=low
 
     This version adds the useful contributed module mod_vroot, which is still not
@@ -40,3 +48,14 @@ proftpd-dfsg (1.3.2e-3) unstable; urgency=low
   
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 16 Mar 2010 12:13:00 +0100
+proftpd-dfsg (1.3.3d-4) unstable; urgency=low
+
+    This version adds the useful contributed module mod_vroot, which is still not
+    part of the standard modules. It can be used for providing shared
+    directories under chrooted environments, among other useful features.
+    A new template 'virtuals.conf' is provided also to keep things
+    ordered about vhosts/vroots and show some examples.
+
+  
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
diff --git a/debian/changelog b/debian/changelog
index b3b4922..596b3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=low
     modules.
   * [PATCH] silent remove excessive verbosity at startup about conf.d
     directory parsing.
+  * Updated debian/NEWS file with information about new conf.d directory.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:31:52 +0100
 

-- 
ProFTPD core package