Merge pull request #4 from nick-wang/master

BNC#879029. Modify typo ored to ignored.
yast · May 29, 2014 · 22368cc · 22368cc
2 parents 46e90a8 + ee7dc3b
commit 22368cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/package/yast2-iplb.changes b/package/yast2-iplb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 29 02:51:24 UTC 2014 - nwang@suse.com
+
+- BNC#879029. Modify typo of ored to ignored.
+- Version 3.1.2
+
 -------------------------------------------------------------------
 Tue May 27 03:20:07 UTC 2014 - nwang@suse.com
 

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

diff --git a/src/include/iplb/helps.rb b/src/include/iplb/helps.rb
@@ -79,7 +79,7 @@ def initialize_iplb_helps(include_target)
             "\n" +
             "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n" +
             "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n" +
-            "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n" +
+            "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ignored\n" +
             "with each other.\n" +
             "</p><p>If defined in a virtual server section then the global value is overridden.\n" +
             "</p><p>Default: all\n" +
@@ -317,7 +317,7 @@ def initialize_iplb_helps(include_target)
             "\n" +
             "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n" +
             "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n" +
-            "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n" +
+            "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ignored\n" +
             "with each other.\n" +
             "</p><p>If defined in a virtual server section then the global value is overridden.\n" +
             "</p><p>Default: all\n" +