diff --git a/package/yast2-network.changes b/package/yast2-network.changes index dd669dedd..ee3127fd0 100644 --- 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 index eb9d0c534..5237c718f 100644 --- 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 index 248e64b88..3e3103a54 100644 --- 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 _( "

Network Setup Method

\n" + "

Use the NetworkManager as a desktop applet\n" + "managing connections for all interfaces. It is well suited\n" + "for switching among wired and wireless networks.

\n" ) + - # Network setup method help - # NetworkManager and wicked are programs _( "

Use wicked if you do not run a desktop environment\n" + "or need to use multiple interfaces at the same time.

\n" + ) + + # For systems not including NetworkManager by default (bnc#892678) + _( + "

NetworkManager 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.

\n" ), "overview" => _( "

Network Card Overview
\n" +