diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-25 21:10:31 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-25 21:10:31 +0100 |
| commit | c05e3feee73cfa02ea85cddd914131da577edb0f (patch) | |
| tree | 2cee29aa20c03007a1c0d56cc1376ffc64ed3aee /man/nm-settings.xml | |
| parent | 3541705d4462868c0d93eaee7171c9d92c76a4d4 (diff) | |
| parent | 7f4dff3943c64e1d0e5d13b2ac915088dde165e6 (diff) | |
Merge tag 'upstream/1.6.0'
Upstream version 1.6.0
Diffstat (limited to 'man/nm-settings.xml')
| -rw-r--r-- | man/nm-settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 6200fc0d..20604de2 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> -<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.5.91</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> +<refentry id="nm-settings"><refentryinfo><title>nm-settings</title><author>NetworkManager developers</author></refentryinfo><refmeta><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum><refmiscinfo class="source">NetworkManager</refmiscinfo><refmiscinfo class="manual">Configuration</refmiscinfo><refmiscinfo class="version">1.6.0</refmiscinfo></refmeta><refnamediv><refname>nm-settings</refname><refpurpose>Description of settings and properties of NetworkManager connection profiles</refpurpose></refnamediv><refsect1 id="description"><title>Description</title><para> NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will |