switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Utils / Termlib / Editor.hh

diff --git a/senf/Utils/Termlib/Editor.hh b/senf/Utils/Termlib/Editor.hh
index 01f1ba7..dd202a1 100644 (file)
--- a/senf/Utils/Termlib/Editor.hh
+++ b/senf/Utils/Termlib/Editor.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // 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 Editor public header */
@@ -156,7 +161,7 @@ namespace term {
         functions.
 
 
-        \section editor_complete Completion suppoprt
+        \section editor_complete Completion support
 
         Completion support is provided by senf::term::bindings::complete(). To use the completer,
         you need to implement a completion function and pass it as second argument to
@@ -248,7 +253,7 @@ namespace term {
         //\{
 
         void gotoChar(unsigned n);      ///< Move cursor to position \a n
-        void scrollTo(unsigned n);      ///< Move positon \n to beginning of display line
+        void scrollTo(unsigned n);      ///< Move position \n to beginning of display line
 
         //\}
 
@@ -280,7 +285,7 @@ namespace term {
         //\{
 
         void auxDisplay(unsigned line, std::string const & text);
-                                        ///< Display \a text on aux display line \a lilne
+                                        ///< Display \a text on aux display line \a line
         unsigned maxAuxDisplayHeight(); ///< Get maximum height of the aux display area
         void clearAuxDisplay();         ///< Clear the aux display area