Merge branch 'master' into 'master'

Move old monolithic preferences files to mutiple preferences.d files (Fix #14)

Closes #14

See merge request !61

1 files changed, 8 insertions, 14 deletions

diff --git a/README.md b/README.md
index 4aa2cc0..32c86db 100644
--- a/README.md
+++ b/README.md
@@ -253,25 +253,19 @@ Example usage:
   If this variable is set the default repositories list ("main contrib non-free")
   is overriden.
 
-### custom_preferences
+### manage_preferences
 
-  For historical reasons (Debian Lenny's version of APT did not support the use
-  of the `preferences.d` directory for putting fragments of 'preferences'), this
-  module will manage a default generic apt/preferences file with more
-  recent releases pinned to very low values so that any package
-  installation will not accidentally pull in packages from those suites
-  unless you explicitly specify the version number. This file will be
-  complemented with all of the preferences_snippet calls (see below).
+  Setting this variable to `false` will delete all the files in `preferences.d`
+  managed by Puppet. By default, this parameter is set to `true`.
 
-  If the default preferences template doesn't suit your needs, you can create a
-  template located in your `site_apt` module, and set custom_preferences with the
-  content (eg. custom_preferences => template('site_apt/preferences') )
+### custom_preferences
 
-  Setting this variable to false before including this class will force the
-  `apt/preferences` file to be absent:
+  If the default preferences template doesn't suit your needs, you can create a
+  template located in your `apt` module, and set `custom_preferences` to your
+  preferred template:
 
     class { 'apt':
-      custom_preferences => false,
+      custom_preferences => 'apt/my_super_template.erb',
     }
   
 ### custom_sources_list