diff options
| author | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-04-25 15:06:28 +0200 |
| commit | ba829a4f45f619431fa823c39c19046957958dce (patch) | |
| tree | 450b967a7a247b05b794574fd9859fd987b014b2 /man/nm-settings.xml | |
| parent | 7cba9af6f00e73f211ec9b6c88474044b421ba14 (diff) | |
| parent | 78c3b8801ecf4975e5da1af3b10ae20dd2d876de (diff) | |
Merge tag 'upstream/1.2.0'
Upstream version 1.2.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 4d51f648..d97c36fc 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.1.94</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.2.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 |