* debian/network-manager.README.Debian

  - Add a section briefly explaining system settings and add references to
    the online documentation and the system settings spec. (Closes: #594849)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3737 ceb527fc-18e6-0310-9fe2-813c157c29e7

2 files changed, 30 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 2422b972..90715833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ network-manager (0.8.1-3) UNRELEASED; urgency=low
       a KDE desktop. Instead let the desktop meta packages depend on their
       preferred frontend. (Closes: #596233)
     - Add Breaks: ppp (<< 2.4.5) to avoid partial upgrades. (Closes: #592444)
+  * debian/network-manager.README.Debian
+    - Add a section briefly explaining system settings and add references to
+      the online documentation and the system settings spec. (Closes: #594849)
 
  -- Michael Biebl <biebl@debian.org>  Fri, 06 Aug 2010 04:39:56 +0200
 
diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian
index d56a14b5..43fad371 100644
--- a/debian/network-manager.README.Debian
+++ b/debian/network-manager.README.Debian
@@ -5,6 +5,7 @@ daemon.
 
 Security
 ~~~~~~~~
+
 To allow users to connect to the NetworkManager daemon they have to be in the
 group "netdev". If you want to add a user to group "netdev" use the command
 "adduser username netdev" or one of the graphical user management frontends.
@@ -16,6 +17,7 @@ for all locally logged in users.
 
 Managed vs. Unmanaged mode and /etc/network/interfaces
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Devices listed in /etc/network/interfaces _will_ be managed by NetworkManager
 unless the ifupdown system-config-setting is enabled and is setup to run
 in "Unmanaged mode".
@@ -33,11 +35,35 @@ Managed mode will make NetworkManager manage all devices and will make
 NetworkManager honour all dhcp and static configurations for wired and
 wireless devices.
 
-
 After modifying /etc/NetworkManager/NetworkManager.conf _or_
 /etc/network/interfaces you may want to tell NetworkManager about the changes
 by running "service network-manager restart".
 
+System settings
+~~~~~~~~~~~~~~~
+
+System settings allow to setup network connections which are available at
+boot time, before login and to all users of the machine. The settings are
+stored in a system-wide location.
+There are plugins for different configuration sources.
+By default the ifupdown and keyfile plugin are enabled, see
+/etc/NetworkManager/NetworkManager.conf:
+
+  [main]
+  plugins=ifupdown,keyfile
+
+The ifupdown plugin is read-only and reads the native ifupdown configuration
+file /etc/network/interfaces.
+
+The keyfile plugin is read-write. The configuration files for network
+connections are stored in /etc/NetworkManager/system-connections/.
+
+For more information see NetworkManager.conf(5) or
+http://live.gnome.org/NetworkManager/SystemSettings
+
+The keyfile specification is available at
+http://projects.gnome.org/NetworkManager/developers/settings-spec-08.html
+
 
 Dial-up configuration
 ~~~~~~~~~~~~~~~~~~~~~