switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Console / ProgramOptions.hh

diff --git a/senf/Utils/Console/ProgramOptions.hh b/senf/Utils/Console/ProgramOptions.hh
index ab3c5c5..f5e1c9d 100644 (file)
--- a/senf/Utils/Console/ProgramOptions.hh
+++ b/senf/Utils/Console/ProgramOptions.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief ProgramOptions public header */
@@ -32,7 +37,7 @@
 
 //#include "ProgramOptions.mpp"
 #include "ProgramOptions.ih"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace console {
@@ -68,9 +73,9 @@ namespace console {
         : public detail::BundleMixin
     {
     public:
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
-        ///@{
+        //\{
 
         ProgramOptions(int argc, char const ** argv, DirectoryNode & root = root());
                                         ///< Create ProgramOptions parser for given options
@@ -78,8 +83,8 @@ namespace console {
                                              the operating system. Especially argv[0] is \e not an
                                              option and is ignored. */
 
-        ///@}
-        ///////////////////////////////////////////////////////////////////////////
+        //\}
+        //-////////////////////////////////////////////////////////////////////////
 
         template <class Container>
         ProgramOptions & nonOptions(Container & container);
@@ -108,7 +113,7 @@ namespace console {
 
     /** \brief Parse command line options
 
-        The command line otpions in \a argc / \a argv will be parsed, interpreting all node's
+        The command line options in \a argc / \a argv will be parsed, interpreting all node's
         relative to \a root as root node.
 
         \related ProgramOptions
@@ -117,7 +122,7 @@ namespace console {
 
     /** \brief ConfigBundle source reading command line options
 
-        This cosntructor is used to create aconfig source parsing the given command line options to
+        This constructor is used to create a config source parsing the given command line options to
         add to a ConfigBundle.
 
         \related ProgramOptions
@@ -125,7 +130,7 @@ namespace console {
     detail::ProgramOptionsSource::ptr OptionsConfig(int argc, char const ** argv);
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "ProgramOptions.cci"
 //#include "ProgramOptions.ct"
 #include "ProgramOptions.cti"