Merge remote-tracking branch 'origin/master' into multi-repo

# Conflicts:
#	README.md

Makefile

@@ -3,7 +3,8 @@
 
 ### Macros ###
 SRCS_SCRIPTS	= $(filter-out %cron_mail, $(wildcard usr/local/sbin/*))
-SRCS_CONF	= $(patsubst %.template, %, $(wildcard etc/restic/*))
+# $(sort) remove duplicates that comes from running make install >1 times.
+SRCS_CONF	= $(sort $(patsubst %.template, %, $(wildcard etc/restic/*)))
 SRCS_SYSTEMD	= $(wildcard etc/systemd/system/*)
 
 # Just set PREFIX var in your shell environment, like:
@@ -43,12 +44,12 @@ install-conf: | $(SRCS_CONF)
 	install -d $(DEST_CONF)
 	install -m 0600 $(SRCS_CONF) $(DEST_CONF)
 
-# target: install-systemd - Install systemd timer and service files
+# target: install-systemd - Install systemd timer and service files.
 install-systemd:
 	install -d $(DEST_SYSTEMD)
 	install -m 0644 $(SRCS_SYSTEMD) $(DEST_SYSTEMD)
 
-# target: uninstall - Uninstall files from the install targets
+# target: uninstall - Uninstall ALL files from the install targets.
 uninstall:
 	@for file in $(INSTALLED_FILES); do \
 			echo $(RM) $$file; \

README.md

@@ -118,7 +118,7 @@ Put these files in `/etc/restic/`:
 $ source /etc/restic/default.env
 $ restic snapshots    # You don't have to supply all parameters like --repo, as they are now in your environment!
 ````
-* `pw.txt`: This file should contain the restic password used to encrypt the repository. This is a new password what soon will be used when initializing the new repository. It should be unique to this restic backup repository and is needed for restoring from it. Don't re-use your b2 login password, this should be different.
+* `pw.txt`: This file should contain the restic password used to encrypt the repository. This is a new password what soon will be used when initializing the new repository. It should be unique to this restic backup repository and is needed for restoring from it. Don't re-use your B2 login password, this should be different.
 
 ## 3. Initialize remote repo
 Now we must initialize the repository on the remote end: