From 7911d87912ed98d6d93aa667f2bb00cf45097736 Mon Sep 17 00:00:00 2001
From: benoit <gitit@benpro.fr>
Date: Mon, 21 Nov 2016 16:18:10 +0100
Subject: [PATCH] After Debian/Ubuntu upgrade, merge local config files
 according to config files shipped in packages.

---
 SysadminTips.page | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SysadminTips.page b/SysadminTips.page
index b56f17d..bdc9e2a 100644
--- a/SysadminTips.page
+++ b/SysadminTips.page
@@ -1,3 +1,10 @@
+After Debian/Ubuntu upgrade, merge local config files according to config files shipped in packages.
+
+```
+for file in $(find /etc -iname '*.dpkg-dist'); do vimdiff ${file%%.dpkg-dist} $file; done
+for file in $(find /etc -iname '*.ucf-dist'); do vimdiff ${file%%.ucf-dist} $file; done
+```
+
 Debug php with strace and php-cgi (especially useful for wp multisites).
 
 ```