Merge pull request #802 from peternewman/libusb

More man pages and minor fixes

.gitignore

@@ -142,6 +142,10 @@ examples/ola_timecode
 examples/ola_timecode.exe
 examples/ola_uni_info
 examples/ola_uni_info.exe
+examples/ola_uni_merge
+examples/ola_uni_merge.exe
+examples/ola_uni_name
+examples/ola_uni_name.exe
 examples/ola_uni_stats
 examples/ola_uni_stats.exe
 examples/ola_usbpro

examples/ola-client.cpp

@@ -638,14 +638,14 @@ void DisplayUniverseNameHelp(const options &opts) {
  * Help message for set uni merge mode
  */
 void DisplayUniverseMergeHelp(const options &opts) {
-  cout << "Usage: " << opts.cmd << " --universe <uni> [ --ltp]\n"
+  cout << "Usage: " << opts.cmd << " --universe <uni> [--ltp]\n"
           "\n"
           "Change the merge mode for the specified universe. Without --ltp "
           "it will\n"
-          " revert to HTP mode.\n"
+          "revert to HTP mode.\n"
           "\n"
           "  -h, --help                Display this help message and exit.\n"
-          "  -l, --ltp                 Change to ltp mode.\n"
+          "  -l, --ltp                 Change to LTP mode.\n"
           "  -u, --universe <universe> Id of the universe to change.\n"
        << endl;
 }

man/Makefile.mk

@@ -14,6 +14,8 @@ dist_man_MANS += \
     man/ola_timecode.1 \
     man/ola_trigger.1 \
     man/ola_uni_info.1 \
+    man/ola_uni_merge.1 \
+    man/ola_uni_name.1 \
     man/ola_uni_stats.1 \
     man/ola_usbpro.1 \
     man/olad.1 \

man/ola_uni_merge.1

@@ -0,0 +1,20 @@
+.TH ola_uni_merge 1 "June 2015"
+.SH NAME
+ola_uni_merge \- Set the merge mode for a universe in olad.
+.SH SYNOPSIS
+.B ola_uni_merge
+--universe <uni> [--ltp]
+.SH DESCRIPTION
+.B ola_uni_merge
+is used to set the merge mode for a universe. Without --ltp it will revert to
+HTP mode.
+.SH OPTIONS
+.IP "-l, --ltp"
+Change to LTP mode.
+.IP "-u, --universe <universe>"
+Id of the universe to name.
+.IP "-h, --help"
+Display the help message
+.SH SEE ALSO
+.BR olad(1) ,
+.

man/ola_uni_name.1

@@ -0,0 +1,19 @@
+.TH ola_uni_name 1 "June 2015"
+.SH NAME
+ola_uni_name \- Set the name for a universe in olad.
+.SH SYNOPSIS
+.B ola_uni_name
+--name <name> --universe <uni>
+.SH DESCRIPTION
+.B ola_uni_name
+is used to set the name for a universe.
+.SH OPTIONS
+.IP "-n, --name <name>"
+Name for the universe.
+.IP "-u, --universe <universe>"
+Id of the universe to name.
+.IP "-h, --help"
+Display the help message
+.SH SEE ALSO
+.BR olad(1) ,
+.