diff --git a/doc/images/plugins.dot.flatten b/doc/images/plugins.dot.flatten
index 52ff26b8a16..d2c3e3e46e7 100644
--- a/doc/images/plugins.dot.flatten
+++ b/doc/images/plugins.dot.flatten
@@ -1,101 +1,101 @@
 strict digraph G {
 	graph [splines=true];
-	storage	 [shape=Mdiamond];
+	storage	[shape=Mdiamond];
 	augeas -> storage;
-	binary	 [shape=Mdiamond];
+	binary	[shape=Mdiamond];
 	base64 -> binary;
-	check	 [shape=Mdiamond];
+	check	[shape=Mdiamond];
 	blacklist -> check;
-	resolver	 [shape=Mdiamond];
+	resolver	[shape=Mdiamond];
 	resolver -> resolver;
 	blockresolver -> resolver;
-	c	 [shape=Mdiamond];
+	c	[shape=Mdiamond];
 	c -> storage;
 	c -> c;
-	cache	 [shape=Mdiamond];
-	code	 [shape=Mdiamond];
+	cache	[shape=Mdiamond];
+	code	[shape=Mdiamond];
 	ccode -> code;
-	conditionals	 [shape=Mdiamond];
+	conditionals	[shape=Mdiamond];
 	constants -> storage;
-	info	 [shape=Mdiamond];
+	info	[shape=Mdiamond];
 	constants -> info;
-	tracing	 [shape=Mdiamond];
+	tracing	[shape=Mdiamond];
 	counter -> tracing;
 	cpptemplate -> storage;
 	cpptemplate -> info;
-	crypto	 [shape=Mdiamond];
+	crypto	[shape=Mdiamond];
 	crypto -> crypto;
 	csvstorage -> storage;
-	csv	 [shape=Mdiamond];
+	csv	[shape=Mdiamond];
 	csvstorage -> csv;
-	curlget	 [shape=Mdiamond];
-	date	 [shape=Mdiamond];
-	notification	 [shape=Mdiamond];
+	curlget	[shape=Mdiamond];
+	date	[shape=Mdiamond];
+	notification	[shape=Mdiamond];
 	dbus -> notification;
 	dbusrecv -> notification;
 	desktop -> storage;
 	desktop -> info;
-	directoryvalue	 [shape=Mdiamond];
-	doc	 [shape=Mdiamond];
-	dpkg	 [shape=Mdiamond];
+	directoryvalue	[shape=Mdiamond];
+	doc	[shape=Mdiamond];
+	dpkg	[shape=Mdiamond];
 	dpkg -> storage;
 	dpkg -> dpkg;
-	dump	 [shape=Mdiamond];
+	dump	[shape=Mdiamond];
 	dump -> storage;
 	dump -> dump;
 	email -> check;
-	error	 [shape=Mdiamond];
+	error	[shape=Mdiamond];
 	error -> error;
-	sync	 [shape=Mdiamond];
+	sync	[shape=Mdiamond];
 	sync -> sync;
 	fcrypt -> crypto;
 	fcrypt -> sync;
-	filefilter	 [shape=Mdiamond];
+	filefilter	[shape=Mdiamond];
 	fcrypt -> filefilter;
-	file	 [shape=Mdiamond];
+	file	[shape=Mdiamond];
 	file -> storage;
 	file -> file;
-	filecheck	 [shape=Mdiamond];
-	fstab	 [shape=Mdiamond];
+	filecheck	[shape=Mdiamond];
+	fstab	[shape=Mdiamond];
 	fstab -> storage;
 	fstab -> fstab;
 	gitresolver -> resolver;
-	apply	 [shape=Mdiamond];
+	apply	[shape=Mdiamond];
 	glob -> apply;
-	gopts	 [shape=Mdiamond];
+	gopts	[shape=Mdiamond];
 	gpgme -> crypto;
 	hexcode -> code;
-	conv	 [shape=Mdiamond];
+	conv	[shape=Mdiamond];
 	hexnumber -> check;
 	hexnumber -> conv;
-	hosts	 [shape=Mdiamond];
+	hosts	[shape=Mdiamond];
 	hosts -> storage;
 	hosts -> hosts;
 	iconv -> conv;
-	internalnotification	 [shape=Mdiamond];
+	internalnotification	[shape=Mdiamond];
 	ipaddr -> check;
-	iterate	 [shape=Mdiamond];
-	jni	 [shape=Mdiamond];
-	logging	 [shape=Mdiamond];
+	iterate	[shape=Mdiamond];
+	jni	[shape=Mdiamond];
+	logging	[shape=Mdiamond];
 	journald -> logging;
-	kconfig	 [shape=Mdiamond];
+	kconfig	[shape=Mdiamond];
 	kconfig -> storage;
 	kconfig -> kconfig;
 	keytometa -> conv;
 	length -> check;
-	line	 [shape=Mdiamond];
+	line	[shape=Mdiamond];
 	line -> storage;
 	line -> line;
-	lineendings	 [shape=Mdiamond];
-	list	 [shape=Mdiamond];
+	lineendings	[shape=Mdiamond];
+	list	[shape=Mdiamond];
 	logchange -> tracing;
-	lua	 [shape=Mdiamond];
+	lua	[shape=Mdiamond];
 	macaddr -> check;
 	mathcheck -> check;
 	mini -> storage;
-	properties	 [shape=Mdiamond];
+	properties	[shape=Mdiamond];
 	mini -> properties;
-	mmapstorage	 [shape=Mdiamond];
+	mmapstorage	[shape=Mdiamond];
 	mmapstorage -> storage;
 	mmapstorage -> mmapstorage;
 	mozprefs -> storage;
@@ -103,56 +103,56 @@ strict digraph G {
 	multifile -> resolver;
 	network -> check;
 	ni -> storage;
-	ini	 [shape=Mdiamond];
+	ini	[shape=Mdiamond];
 	ni -> ini;
 	noresolver -> resolver;
-	passwd	 [shape=Mdiamond];
+	passwd	[shape=Mdiamond];
 	passwd -> storage;
 	passwd -> passwd;
 	path -> check;
-	process	 [shape=Mdiamond];
-	profile	 [shape=Mdiamond];
-	python	 [shape=Mdiamond];
-	quickdump	 [shape=Mdiamond];
+	process	[shape=Mdiamond];
+	profile	[shape=Mdiamond];
+	python	[shape=Mdiamond];
+	quickdump	[shape=Mdiamond];
 	quickdump -> storage;
 	quickdump -> quickdump;
-	range	 [shape=Mdiamond];
-	reference	 [shape=Mdiamond];
-	filter	 [shape=Mdiamond];
+	range	[shape=Mdiamond];
+	reference	[shape=Mdiamond];
+	filter	[shape=Mdiamond];
 	rename -> filter;
-	rgbcolor	 [shape=Mdiamond];
+	rgbcolor	[shape=Mdiamond];
 	ruby -> storage;
-	shell	 [shape=Mdiamond];
+	shell	[shape=Mdiamond];
 	simpleini -> storage;
 	simpleini -> properties;
 	spec -> check;
 	spec -> apply;
-	specload	 [shape=Mdiamond];
+	specload	[shape=Mdiamond];
 	specload -> storage;
 	specload -> specload;
 	syslog -> logging;
-	template	 [shape=Mdiamond];
+	template	[shape=Mdiamond];
 	timeofday -> tracing;
-	toml	 [shape=Mdiamond];
+	toml	[shape=Mdiamond];
 	toml -> storage;
 	toml -> toml;
 	tracer -> tracing;
 	type -> check;
 	uname -> storage;
 	uname -> info;
-	unit	 [shape=Mdiamond];
+	unit	[shape=Mdiamond];
 	validation -> check;
 	wresolver -> resolver;
 	xerces -> storage;
-	xml	 [shape=Mdiamond];
+	xml	[shape=Mdiamond];
 	xerces -> xml;
 	xmltool -> storage;
 	xmltool -> xml;
 	yajl -> storage;
-	json	 [shape=Mdiamond];
+	json	[shape=Mdiamond];
 	yajl -> json;
 	yamlcpp -> storage;
-	yaml	 [shape=Mdiamond];
+	yaml	[shape=Mdiamond];
 	yamlcpp -> yaml;
 	zeromqrecv -> notification;
 	zeromqsend -> notification;
diff --git a/doc/images/plugins.pdf b/doc/images/plugins.pdf
index 88bb2c75ce4..eaf8f11c013 100644
Binary files a/doc/images/plugins.pdf and b/doc/images/plugins.pdf differ
diff --git a/doc/images/plugins.png b/doc/images/plugins.png
index a95f14961e3..84df62ebac7 100644
Binary files a/doc/images/plugins.png and b/doc/images/plugins.png differ
diff --git a/doc/images/plugins.ps b/doc/images/plugins.ps
index b931cf0887b..e75c2989ee0 100644
Binary files a/doc/images/plugins.ps and b/doc/images/plugins.ps differ