From f457f4ef832ab171fc450d2aabb97736c686ed2d Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 4 Apr 2016 18:35:25 +0200
Subject: [PATCH] man: drop nm-system-settings.conf.5

It's long deprecated and the last roff manual page.

Instead, NetworkManager.conf(5) documents the file. Let's just link that
one.
---
 configure.ac                     |  1 -
 man/Makefile.am                  | 16 ++++++++++------
 man/nm-system-settings.conf.5.in | 25 -------------------------
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 man/nm-system-settings.conf.5.in

diff --git a/configure.ac b/configure.ac
index 641968003..6111da89f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,7 +1077,6 @@ clients/tui/newt/Makefile
 introspection/Makefile
 introspection/all.xml
 man/Makefile
-man/nm-system-settings.conf.5
 po/Makefile.in
 policy/Makefile
 policy/org.freedesktop.NetworkManager.policy.in
diff --git a/man/Makefile.am b/man/Makefile.am
index dc535aa2f..dce981060 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -68,9 +68,6 @@ CLEANFILES +=				\
 
 endif
 
-configure_generated_man_pages =		\
-	nm-system-settings.conf.5
-
 docbook_generated_man_pages =		\
 	nmcli.1				\
 	nmtui.1				\
@@ -102,17 +99,24 @@ EXTRA_DIST +=								\
 
 man_MANS += $(configure_generated_man_pages)
 
-links = nmtui-edit nmtui-connect nmtui-hostname
+nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
+NetworkManager_conf_links = nm-system-settings.conf
 
 install-data-hook:
-	for link in $(links); do \
+	for link in $(nmtui_links); do \
 		ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
 	done
+	for link in $(NetworkManager_conf_links); do \
+		ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/$$link.5; \
+	done
 
 uninstall-hook:
-	for link in $(links); do \
+	for link in $(nmtui_links); do \
 		rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
 	done
+	for link in $(NetworkManager_conf_links); do \
+		rm -f $(DESTDIR)$(mandir)/man5/$$link.5; \
+	done
 
 if ENABLE_GTK_DOC
 man_MANS += $(docbook_generated_man_pages)
diff --git a/man/nm-system-settings.conf.5.in b/man/nm-system-settings.conf.5.in
deleted file mode 100644
index 172db1125..000000000
--- a/man/nm-system-settings.conf.5.in
+++ /dev/null
@@ -1,25 +0,0 @@
-.\" nm-system-settings.conf(5) manual page
-.\"
-.\" Copyright (C) 2010 Red Hat, Inc.
-.\"
-.TH "nm-system-settings.conf" "5" "1 February 2010" ""
-.SH NAME
-nm\-system\-settings.conf \- Deprecated NetworkManager configuration file
-.SH SYNOPSIS
-/etc/NetworkManager/nm\-system\-settings.conf
-.br
-or
-.br
-\fI<SYSCONFDIR>\fP/NetworkManager/nm\-system\-settings.conf
-.br
-where <SYSCONFDIR> depends on your distribution or build.
-.SH DESCRIPTION
-.P
-.I nm\-system\-settings.conf
-is a deprecated configuration file for \fBNetworkManager\fP (5).  While this
-file can still be used, NetworkManager now defaults to reading the config
-file <SYSCONFDIR>\fP/NetworkManager/NetworkManager.conf\fP instead, falling back
-to nm\-system\-settings.conf if NetworkManager.conf does not exist.
-.SH "SEE ALSO"
-.BR NetworkManager (8),
-.BR NetworkManager.conf (5).