integrate __pacman_conf_integrate

Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>

cdist/conf/type/__pacman_conf_integrate/man.text

@@ -1,11 +1,11 @@
-cdist-type__pacman_integrate(7)
-===============================
+cdist-type__pacman_conf_integrate(7)
+====================================
 Dominique Roux <dominique.roux4@gmail.com>
 
 
 NAME
 ----
-cdist-type__pacman_integrate - Integrate default pacman.conf to cdist conform and vice versa
+cdist-type__pacman_conf_integrate - Integrate default pacman.conf to cdist conform and vice versa
 
 
 DESCRIPTION
@@ -28,10 +28,10 @@ EXAMPLES
 
 --------------------------------------------------------------------------------
 # Convert normal to cdist conform
-__pacman_integrate convert
+__pacman_conf_integrate convert
 
 # Convert cdist conform to normal
-__pacman_integrate convert --state absent
+__pacman_conf_integrate convert --state absent
 
 --------------------------------------------------------------------------------
 

docs/changelog

@@ -3,6 +3,9 @@ Changelog
 
 next:
 	* Documentation: Fix spelling in manual pages (Dmitry Bogatov)
+	* New type: __pacman_conf: Manage pacman.conf (Dominique Roux)
+	* New type: __pacman_conf_integrate: cdist compatible pacman.conf (Dominique Roux)
+
 
 3.1.13: 2015-05-16
 	* Type __block: Fix support for non stdin blocks (Dominique Roux)