Merge pull request #264 from ancorgs/network_manager_help

Improved help text in "global options" (bnc#892678)
yast · Oct 10, 2014 · 1ede967 · 1ede967
2 parents 22cd677 + a4f0a93
commit 1ede967
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  9 15:47:14 UTC 2014 - ancor@suse.com
+
+- Improved help text in "global options" (bnc#892678)
+- 3.1.106
+
 -------------------------------------------------------------------
 Mon Oct  6 09:31:41 UTC 2014 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.105
+Version:        3.1.106
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/network/lan/help.rb b/src/include/network/lan/help.rb
@@ -47,18 +47,23 @@ def initialize_network_lan_help(include_target)
             ),
         "managed" =>
           # Network setup method help
-          # NetworkManager and ifup are programs
+          # NetworkManager and wicked are programs
           _(
             "<p><b><big>Network Setup Method</big></b></p>\n" +
               "<p>Use the <b>NetworkManager</b> as a desktop applet\n" +
               "managing connections for all interfaces. It is well suited\n" +
               "for switching among wired and wireless networks.</p>\n"
           ) +
-            # Network setup method help
-            # NetworkManager and wicked are programs
             _(
               "<p>Use <b>wicked</b> if you do not run a desktop environment\n" +
                 "or need to use multiple interfaces at the same time.</p>\n"
+            ) +
+            # For systems not including NetworkManager by default (bnc#892678)
+            _(
+              "<p><b>NetworkManager</b> is not part of every base\n" +
+              "installation repository. For example, to enable it on SUSE\n" +
+              "Linux Enterprise Server add the Workstation Extension\n" +
+              "repository and install the 'NetworkManager' package.</p>\n"
             ),
         "overview"          => _(
           "<p><b><big>Network Card Overview</big></b><br>\n" +