Merge branch 'feature/upstream' into develop

1 files changed, 6 insertions, 19 deletions

diff --git a/debian/patches/0600-typo-man.patch b/debian/patches/0600-typo-man.patch
index 1e1c2ef..c8d26a5 100644
--- a/debian/patches/0600-typo-man.patch
+++ b/debian/patches/0600-typo-man.patch
@@ -3,24 +3,11 @@ Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Last-Update: 2014-06-04
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/doc/iseltime.8
-===================================================================
---- trunk.orig/doc/iseltime.8
-+++ trunk/doc/iseltime.8
-@@ -54,7 +54,7 @@ Use a specified IPMI LAN Authentication
- Use a specified IPMI LAN privilege level. 1=Callback level, 2=User level, 3=Operator level, 4=Administrator level (default), 5=OEM level.
- .IP "-Y"
- Yes, do prompt the user for the IPMI LAN remote password.
--Alternatives for the password are -E or -P.
-+Alternatives for the password are \-E or \-P.
- 
- 
- .SH "SEE ALSO"
 Index: trunk/doc/iekanalyzer.8
 ===================================================================
 --- trunk.orig/doc/iekanalyzer.8
 +++ trunk/doc/iekanalyzer.8
-@@ -114,7 +114,7 @@ Display point to point physical connecti
+@@ -116,7 +116,7 @@ Display point to point physical connecti
        AMC slot B2 topology:
           Port 0 =====> On Carrier Device ID 0, Port 3
           Port 2 =====> AMC slot B1, Port 2
@@ -29,7 +16,7 @@ Index: trunk/doc/iekanalyzer.8
     From Carrier file: carrierfru
        On Carrier Device ID 0 topology:
           Port 0 =====> AMC slot B1, Port 4
-@@ -170,7 +170,7 @@ and an AMC module or between 2 AMC modul
+@@ -172,7 +172,7 @@ and an AMC module or between 2 AMC modul
       Link Type: AMC.2 Ethernet
       Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
       Link Group ID: 0 || Link Asym. Match: exact match
@@ -38,7 +25,7 @@ Index: trunk/doc/iekanalyzer.8
    AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
     Matching Result
     From On-Carrier Device ID 0
-@@ -183,7 +183,7 @@ and an AMC module or between 2 AMC modul
+@@ -185,7 +185,7 @@ and an AMC module or between 2 AMC modul
       Link Type: AMC.2 Ethernet
       Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
       Link Group ID: 0 || Link Asym. Match: exact match
@@ -47,7 +34,7 @@ Index: trunk/doc/iekanalyzer.8
   On-Carrier Device vs AMC slot A2
    AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
     Matching Result
-@@ -197,7 +197,7 @@ and an AMC module or between 2 AMC modul
+@@ -199,7 +199,7 @@ and an AMC module or between 2 AMC modul
       Link Type: AMC.2 Ethernet
       Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
       Link Group ID: 0 || Link Asym. Match: exact match
@@ -56,7 +43,7 @@ Index: trunk/doc/iekanalyzer.8
   AMC slot B1 vs AMC slot A2
    AMC slot A2 port 2 ==> AMC slot B1 port 2
     Matching Result
-@@ -211,7 +211,7 @@ and an AMC module or between 2 AMC modul
+@@ -213,7 +213,7 @@ and an AMC module or between 2 AMC modul
       Link Type: AMC.3 Storage
       Link Type extension: Serial Attached SCSI (SAS/SATA)
       Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
@@ -75,5 +62,5 @@ Index: trunk/doc/ifru.8
 -ipmiutil_fru \- show Field Replacable Unit configuration data
 +ipmiutil_fru \- show Field Replaceable Unit configuration data
  .SH SYNOPSIS
- .B "ipmiutil fru [-abcdeikmsvx -N node -U user -P/-R pswd -EFJTVY]"
+ .B "ipmiutil fru [-abcdeikmsvx -N node -U user -P/-R pswd -EFJTVYZ]"