Merge branch 'master' of http://github.com/Microsoft/vcpkg

1 files changed, 4 insertions, 3 deletions

diff --git a/toolsrc/src/commands_other.cpp b/toolsrc/src/commands_other.cpp
index 5f4128bb1..6df325100 100644
--- a/toolsrc/src/commands_other.cpp
+++ b/toolsrc/src/commands_other.cpp
@@ -41,16 +41,16 @@ namespace vcpkg
             , INTEGRATE_COMMAND_HELPSTRING);
     }
 
-    std::string create_example_string(const char* command_and_arguments)
+    std::string create_example_string(const std::string& command_and_arguments)
     {
         std::string cs = Strings::format("Example:\n"
                                          "  vcpkg %s", command_and_arguments);
         return cs;
     }
 
-    void print_example(const char* command_and_arguments)
+    void print_example(const std::string& command_and_arguments)
     {
-        System::println(create_example_string(command_and_arguments).c_str());
+        System::println(create_example_string(command_and_arguments));
     }
 
     void internal_test_command(const vcpkg_cmd_arguments& /*args*/, const vcpkg_paths& /*paths*/)
@@ -74,6 +74,7 @@ namespace vcpkg
     const std::vector<package_name_and_function<command_type_b>>& get_available_commands_type_b()
     {
         static std::vector<package_name_and_function<command_type_b>> t = {
+            {"/?", help_command},
             {"help", help_command},
             {"search", search_command},
             {"list", list_command},