diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index d8f4725cf6..5c45ca74ee 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -33,15 +33,7 @@ Texts. You may obtain a copy of the GNU Free Documentation License from the Free Software Foundation by visiting their Web site or by writing - to: - -
- The Free Software Foundation, Inc., - 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, - USA -
+ url="http://www.fsf.org">their Web site. @@ -322,14 +314,7 @@ You should have received a copy of the GNU - General Public License along with this program; - if not, write to the -
- Free Software Foundation, Inc., - 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, - USA -
+ General Public License along with this program. diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 09468a5cdb..18a3fe05ba 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -34,15 +34,7 @@ Texts. You may obtain a copy of the GNU Free Documentation License from the Free Software Foundation by visiting their Web site or by writing - to: - -
- The Free Software Foundation, Inc., - 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, - USA -
+ url="http://www.fsf.org">their Web site. @@ -467,13 +459,7 @@ print ("NetworkManager version " + client.get_version())]]> You should have received a copy of the GNU Lesser General Public License along with this - library; if not, write to the -
- Free Software Foundation, Inc., - 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, - USA -
+ library. diff --git a/m4/attributes.m4 b/m4/attributes.m4 index 51ac88be61..7f785afa6b 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -14,9 +14,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -dnl 02110-1301, USA. +dnl along with this program. dnl dnl As a special exception, the copyright owners of the dnl macro gives unlimited permission to copy, distribute and modify the diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 index 3ade411e3b..a2055fe1b0 100644 --- a/m4/vapigen.m4 +++ b/m4/vapigen.m4 @@ -13,8 +13,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU dnl Lesser General Public License for more details. dnl dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +dnl License along with this library. # VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION]) # -------------------------------------- diff --git a/man/NetworkManager-dispatcher.xml b/man/NetworkManager-dispatcher.xml index e87226d05e..f6e1d22d76 100644 --- a/man/NetworkManager-dispatcher.xml +++ b/man/NetworkManager-dispatcher.xml @@ -7,22 +7,13 @@ ]> @@ -68,9 +59,9 @@ device an operation just happened on, and second the action. For device actions, the interface is the name of the kernel interface suitable for IP configuration. Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable. - For the hostname action the device name is always "none". - For connectivity-change it is empty. - For dns-change it is empty. + For the hostname action the device name is always + "none". For connectivity-change and + dns-change it is empty. The actions are: @@ -178,7 +169,7 @@ NetworkManager is configured to not manage resolv.conf (for example, via dns=none). In such case, the dispatch script can discover the DNS configuration provided by currently active connections by - looking at file /run/NetworkManager/resolv.conf + looking at file /run/NetworkManager/resolv.conf diff --git a/man/NetworkManager-wait-online.service.xml b/man/NetworkManager-wait-online.service.xml index 46068ea52f..4776002c86 100644 --- a/man/NetworkManager-wait-online.service.xml +++ b/man/NetworkManager-wait-online.service.xml @@ -7,18 +7,9 @@ ]> diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 045359cf90..5403c46bd9 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index cc5e9b2c65..bd5429952f 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -7,22 +7,13 @@ ]> diff --git a/man/nm-cloud-setup.xml b/man/nm-cloud-setup.xml index 74ec040025..d0e14b4fae 100644 --- a/man/nm-cloud-setup.xml +++ b/man/nm-cloud-setup.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml index 1905b7b665..336d7f0365 100644 --- a/man/nm-initrd-generator.xml +++ b/man/nm-initrd-generator.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nm-online.xml b/man/nm-online.xml index 87672f749b..e9deb83e94 100644 --- a/man/nm-online.xml +++ b/man/nm-online.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 7bf598d6b8..f0c2ca9462 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 36d671ee74..2c7e16ab79 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nmcli.xml b/man/nmcli.xml index 9bda9db0af..6b3054c3d7 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -7,20 +7,11 @@ ]> diff --git a/man/nmtui.1.in b/man/nmtui.1.in deleted file mode 100644 index 977339dbbd..0000000000 --- a/man/nmtui.1.in +++ /dev/null @@ -1,66 +0,0 @@ -.\" nmtui (1) manual page -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public Licence along -.\" with this manual; if not, write to the Free Software Foundation, Inc., -.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -.\" -.\" Copyright 2014 Red Hat, Inc. -.\" -.TH NMTUI "1" "2014-11-06" "NetworkManager 1.2" - -.SH NAME -nmtui \- Text User Interface for controlling NetworkManager -.SH SYNOPSIS -.B nmtui -.RI " [ " edit " | " connect " | " hostname " ] [ ... ] " -.P -.B nmtui\-edit -.RI " [ " connection-id " | " connection-name " ] " -.P -.B nmtui\-connect -.RI " [ " connection-name " | " connection-uuid " | " device-name " | " Wi-Fi-SSID " ] " -.P -.B nmtui\-hostname - -.SH DESCRIPTION -.B nmtui -is a curses\(hybased TUI application for interacting with \fINetworkManager\fP. -.P -When starting \fInmtui\fP, the user is prompted to choose the activity to perform -unless it was specified as the first argument. -.P -The supported activities are: -.IP \(em 4 -\fIedit\fP: show a connection editor that supports adding, modifying, viewing and deleting -connections. It provides similar functionality as \fInm\-connection\-editor\fP. -.IP \(em 4 -\fIconnect\fP: show a list of available connections, with the option to activate or deactivate -them. It provides similar functionality as \fInm\-applet\fP. -.IP \(em 4 -\fIhostname\fP: set the system hostname. - -.P -Corresponding to above activities, \fInmtui\fP also comes with binaries named -\fInmtui\-edit\fP, \fInmtui\-connect\fP, and \fInmtui-hostname\fP to skip the selection -of the activities. - -.SH SEE ALSO -.BR NetworkManager(8), -.BR nmcli(1). -.BR nm\-applet(1). -.BR nm\-connection\-editor(1). diff --git a/man/nmtui.xml b/man/nmtui.xml index 8bf6dd58b2..f610be9d08 100644 --- a/man/nmtui.xml +++ b/man/nmtui.xml @@ -7,20 +7,11 @@ ]>