colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

man: drop nm-system-settings.conf.5

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

Instead, NetworkManager.conf(5) documents the file. Let's just link that
one.
This commit is contained in:
Lubomir Rintel
2016-04-04 18:35:25 +02:00
parent 8a9350f3b0
commit f457f4ef83
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -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

16
man/Makefile.am
View File

@@ -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)

25
man/nm-system-settings.conf.5.in
View File

@@ -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).