From abd32c88fcff95f7687bb9765cc83ad365f4c677 Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Sun, 5 Dec 2010 20:36:54 +0000
Subject: [PATCH] Merge doc patches to release; fixes #3992, fixes #4858

[SVN r67034]
---
 doc/howto.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/howto.xml b/doc/howto.xml
index bc8808f..d260259 100644
--- a/doc/howto.xml
+++ b/doc/howto.xml
@@ -115,7 +115,8 @@ if (vm.count("response-file")) {
      ss << ifs.rdbuf();
      // Split the file content
      char_separator<char> sep(" \n\r");
-     tokenizer<char_separator<char> > tok(ss.str(), sep);
+     std::string ResponsefileContents( ss.str() );
+     tokenizer<char_separator<char> > tok(ResponsefileContents, sep);
      vector<string> args;
      copy(tok.begin(), tok.end(), back_inserter(args));
      // Parse the file and store the options
@@ -295,7 +296,7 @@ void validate(boost::any& v,
     if (regex_match(s, match, r)) {
         v = any(magic_number(lexical_cast<int>(match[1])));
     } else {
-        throw validation_error("invalid value");
+        throw validation_error(valodation_error::invalid_option_value);
     }        
 }
 ]]>