Merge from trunk. No code changes, only properties and docs and examples

[SVN r47336]

Author: vprus

doc/overview.xml

@@ -185,16 +185,14 @@ desc.add_options()
     ("email", value<string>()->multitoken(), "email to send to")
     ;
       </programlisting>
-      For the first option (<literal>help</literal>), we specify only the name
-      and the description. No value can be specified in the parsed source.
-      For the second option (<literal>compression</literal>), the user must
-      specify a value, using a single token. For the third option
-      (<literal>verbose</literal>), the user may either provide a single token
-      for the value, or no token at all. For the last option
-      (<literal>email</literal>), the value can span several tokens. For
-      example, the following command line is OK:
+      For the first parameter, we specify only the name and the
+      description. No value can be specified in the parsed source.
+      For the first option, the user must specify a value, using a single
+      token. For the third option, the user may either provide a single token
+      for the value, or no token at all. For the last option, the value can
+      span several tokens. For example, the following command line is OK:
       <screen>
-          test --help --compression 10 --verbose --email beagle@mars beagle2@mars
+          test --help --compression 10 --verbose --email beadle@mars beadle2@mars
       </screen>      
       </para>
 

example/first.cpp

@@ -21,30 +21,23 @@ int main(int ac, char* av[])
         desc.add_options()
             ("help", "produce help message")
             ("compression", po::value<int>(), "set compression level")
-            ("verbose", po::value<string>()->zero_tokens()->implicit_value(""))
         ;
 
-        po::variables_map vm;
+        po::variables_map vm;        
         po::store(po::parse_command_line(ac, av, desc), vm);
-        po::notify(vm);
+        po::notify(vm);    
 
         if (vm.count("help")) {
             cout << desc << "\n";
             return 1;
         }
 
         if (vm.count("compression")) {
-            cout << "Compression level was set to "
+            cout << "Compression level was set to " 
                  << vm["compression"].as<int>() << ".\n";
         } else {
             cout << "Compression level was not set.\n";
         }
-
-        if (vm.count("verbose")) {
-            string v = vm["verbose"].as<string>();
-            if (v.size() > 0)
-                cout << "Verbosity is: " << v << ".\n";
-        }
     }
     catch(exception& e) {
         cerr << "error: " << e.what() << "\n";

example/options_description.cpp

@@ -18,7 +18,7 @@ using namespace std;
 template<class T>
 ostream& operator<<(ostream& os, const vector<T>& v)
 {
-    copy(v.begin(), v.end(), ostream_iterator<T>(os, " ")); 
+    copy(v.begin(), v.end(), ostream_iterator<T>(cout, " ")); 
     return os;
 }