summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2008-12-16 08:39:13 +0000
committerMichael Biebl <biebl@debian.org>2008-12-16 08:39:13 +0000
commit05749841eeaaac8e6123c64e0275e0c5646830c7 (patch)
treeb37846afcab33113b5a4c4a53960dcfb38e5e955
parentb245ce08232e425cc68d5a5428a088e2a7949121 (diff)
* debian/nm-system-settings.conf
  - Set default mode to unmanaged.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2664 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog2
-rw-r--r--debian/network-manager.README.Debian4
-rw-r--r--debian/nm-system-settings.conf3
3 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 409e7cc1..b0e51ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low
   * debian/network-manager.README.Debian
     - Merge the README.Debian from Ubuntu which describes the new
       managed/unmanaged modes.
+  * debian/nm-system-settings.conf
+    - Set default mode to unmanaged.
 
  -- Michael Biebl <biebl@debian.org>  Sat, 06 Dec 2008 00:43:22 +0100
 
diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian
index aabe01f3..0f52b41e 100644
--- a/debian/network-manager.README.Debian
+++ b/debian/network-manager.README.Debian
@@ -43,7 +43,7 @@ using the command:
 Dial-up configuration
 ~~~~~~~~~~~~~~~~~~~~~
 
-Your dialup configurations can now be one in network-manager connection editor.
+Your dialup configurations can now be done in nm-connection-editor.
 Because of that /etc/network/interfaces configurations are considered "legacy"
 from a network manager point of view.
 
@@ -51,7 +51,7 @@ However, if you want to use your /etc/network/interfaces configuration make
 sure that you have the ifupdown plugin in "Unmanaged mode" and take care that
 the used wired/wireless device is also configured in /etc/network/interfaces.
 
-Not that NetworkManager 0.7 will not provive UI hooks to up and down ppp
+Note that NetworkManager 0.7 will not provide UI hooks to up and down ppp
 connections managed outside of NetworkManager itself (not that it ever worked
 nicely before).
 
diff --git a/debian/nm-system-settings.conf b/debian/nm-system-settings.conf
index 8f4ce8e3..d8b33d91 100644
--- a/debian/nm-system-settings.conf
+++ b/debian/nm-system-settings.conf
@@ -1,2 +1,5 @@
 [main]
 plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=false