about summary refs log tree commit diff
path: root/man/nm-settings.xml
diff options
context:
space:
mode:
authorJeremy Bicha <jbicha@ubuntu.com>2018-03-26 08:35:51 -0400
committerJeremy Bicha <jbicha@ubuntu.com>2018-03-26 08:35:51 -0400
commit95410d8dcdd0433894612785c89b821b9de4cc04 (patch)
tree66c57586825b10af593a84a00ee885aa257b5196 /man/nm-settings.xml
parent6b60d03d200147c516db40716b1c58e2a86db1a5 (diff)
parentaee9265c9325331914e9fd42ce06e063fabdfcab (diff)
Merge tag 'debian/1.10.6-2' into bionic
network-manager Debian release 1.10.6-2
Diffstat (limited to 'man/nm-settings.xml')
-rw-r--r--man/nm-settings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index dea3e6b5..fe8265dc 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.10.4</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.10.6</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