From 596b1cabacee9488bc3b981354ea51815617e03d Mon Sep 17 00:00:00 2001
From: neingeist <neingeist@bl0rg.net>
Date: Sun, 11 Dec 2016 22:17:48 +0100
Subject: [PATCH] merge etckeeper.conf.rpmnew

---
 templates/etckeeper.conf.j2 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/templates/etckeeper.conf.j2 b/templates/etckeeper.conf.j2
index ecfec0b..462a08a 100644
--- a/templates/etckeeper.conf.j2
+++ b/templates/etckeeper.conf.j2
@@ -16,12 +16,14 @@ BZR_COMMIT_OPTIONS=""
 # Options passed to darcs record when run by etckeeper.
 DARCS_COMMIT_OPTIONS="-a"
 
-# Uncomment to avoid etckeeper committing existing changes
-# to /etc automatically once per day.
+# Etckeeper includes both a cron job and a systemd timer, which each
+# can commit exiting changes to /etc automatically once per day.
+# To enable the systemd timer, run: systemctl enable etckeeper.timer
+# The cron job is enabled by default; to disable it, uncomment this next line.
 AVOID_DAILY_AUTOCOMMITS={{ '1' if etckeeper_avoid_autocommits else '0' }}
 
 # Uncomment the following to avoid special file warning
-# (the option is enabled automatically by cronjob regardless).
+# (the option is enabled automatically for daily autocommits regardless).
 #AVOID_SPECIAL_FILE_WARNING=1
 
 # Uncomment to avoid etckeeper committing existing changes to
@@ -30,11 +32,11 @@ AVOID_DAILY_AUTOCOMMITS={{ '1' if etckeeper_avoid_autocommits else '0' }}
 AVOID_COMMIT_BEFORE_INSTALL={{ '1' if etckeeper_avoid_autocommits else '0' }}
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum, dnf, zypper etc)
+# (apt, pacman, pacman-g2, yum, dnf, zypper etc)
 HIGHLEVEL_PACKAGE_MANAGER={{ highlevel_package_manager }}
 
 # The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacman-g2, etc)
+# (dpkg, rpm, pacman, pacmatic, pacman-g2, etc)
 LOWLEVEL_PACKAGE_MANAGER={{ lowlevel_package_manager }}
 
 # To push each commit to a remote, put the name of the remote here.