Fixed name of the project in copyright headers

Also updated the headers to refer to the GPL by URL instead of
suggesting to contact the FSF by snail mail, as per the latest
GPL usage instructions.

27 files changed, 282 insertions, 298 deletions

diff --git a/src/utils/encryption.cpp b/src/utils/encryption.cpp
index 38ee01a3..38503bb0 100644
--- a/src/utils/encryption.cpp
+++ b/src/utils/encryption.cpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "encryption.h"
diff --git a/src/utils/encryption.h b/src/utils/encryption.h
index 656bffa7..52d6d05f 100644
--- a/src/utils/encryption.h
+++ b/src/utils/encryption.h
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_ENCRYPTION_H
diff --git a/src/utils/functors.h b/src/utils/functors.h
index 5fae1214..92edd092 100644
--- a/src/utils/functors.h
+++ b/src/utils/functors.h
@@ -1,36 +1,33 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef FUNCTORS_H
 #define FUNCTORS_H
 
-
 #include <functional>
 #include <sstream>
 #include <string>
 
-
 namespace
 {
 
-
 /**
  * Functor used for the search of an object by name in a list.
  *
@@ -51,7 +48,6 @@ struct obj_name_is
     }
 };
 
-
 /**
  * Functor to convert a string into another type using
  * std::istringstream.operator>>().
@@ -70,8 +66,6 @@ struct string_to: public std::unary_function<std::string, T>
     }
 };
 
-
 } // anonymous namespace
 
-
 #endif // FUNCTORS_H
diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp
index e3b48c38..b9c8d619 100644
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "logger.h"
diff --git a/src/utils/logger.h b/src/utils/logger.h
index f19f5b77..3b3ca750 100644
--- a/src/utils/logger.h
+++ b/src/utils/logger.h
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef LOGGER_H
diff --git a/src/utils/mathutils.cpp b/src/utils/mathutils.cpp
index 9024a400..2977f878 100644
--- a/src/utils/mathutils.cpp
+++ b/src/utils/mathutils.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "mathutils.h"
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 3b49b7e0..032908be 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MATHUTILS_H
diff --git a/src/utils/processorutils.cpp b/src/utils/processorutils.cpp
index 0c2cf5bd..841b15ae 100644
--- a/src/utils/processorutils.cpp
+++ b/src/utils/processorutils.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "utils/processorutils.hpp"
diff --git a/src/utils/processorutils.hpp b/src/utils/processorutils.hpp
index e6190669..e89e85cf 100644
--- a/src/utils/processorutils.hpp
+++ b/src/utils/processorutils.hpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PROCESSORUTILS_HPP
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 4f292c9b..a5bd0427 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2008 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file has been slighly modified as part of The Mana World.
+ *  This file has been slighly modified as part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*       +------------------------------------+
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index d861d75e..09598884 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.h
@@ -1,22 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_SHA256_H
diff --git a/src/utils/singleton.h b/src/utils/singleton.h
index 7405c76b..fd3e4ddf 100644
--- a/src/utils/singleton.h
+++ b/src/utils/singleton.h
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SINGLETON_H
diff --git a/src/utils/string.cpp b/src/utils/string.cpp
index 1e5cb5bc..d5e6d229 100644
--- a/src/utils/string.cpp
+++ b/src/utils/string.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "utils/string.hpp"
diff --git a/src/utils/string.hpp b/src/utils/string.hpp
index 62c0f2f0..448376f2 100644
--- a/src/utils/string.hpp
+++ b/src/utils/string.hpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_STRING_HPP
diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp
index 6b6a231a..73565140 100644
--- a/src/utils/stringfilter.cpp
+++ b/src/utils/stringfilter.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <algorithm>
diff --git a/src/utils/stringfilter.h b/src/utils/stringfilter.h
index c871a4df..d9a648d6 100644
--- a/src/utils/stringfilter.h
+++ b/src/utils/stringfilter.h
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SLANGSFILTER_H
diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index 51791935..ba2c6073 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "timer.h"
diff --git a/src/utils/timer.h b/src/utils/timer.h
index 32b72603..7c445b16 100644
--- a/src/utils/timer.h
+++ b/src/utils/timer.h
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TIMER_H
diff --git a/src/utils/tokencollector.cpp b/src/utils/tokencollector.cpp
index df21e631..12624dd3 100644
--- a/src/utils/tokencollector.cpp
+++ b/src/utils/tokencollector.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "utils/tokencollector.hpp"
@@ -95,7 +95,7 @@ void TokenCollectorBase::removeOutdated(time_t current)
     if (threshold < mLastCheck) return;
 
     std::list<Item>::iterator it;
-    
+
     it = mPendingConnects.begin();
     while (it != mPendingConnects.end() && it->timeStamp < threshold)
     {
diff --git a/src/utils/tokencollector.hpp b/src/utils/tokencollector.hpp
index 6a6fdd36..4481910e 100644
--- a/src/utils/tokencollector.hpp
+++ b/src/utils/tokencollector.hpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TOKENCOLLECTOR_HPP
diff --git a/src/utils/tokendispenser.cpp b/src/utils/tokendispenser.cpp
index b2052ad0..a05821bb 100644
--- a/src/utils/tokendispenser.cpp
+++ b/src/utils/tokendispenser.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "utils/tokendispenser.hpp"
diff --git a/src/utils/tokendispenser.hpp b/src/utils/tokendispenser.hpp
index 6638cc51..3dfad394 100644
--- a/src/utils/tokendispenser.hpp
+++ b/src/utils/tokendispenser.hpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World Server
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World  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 any later version.
+ *  The Mana Server 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
+ *  any later version.
  *
- *  The Mana  World 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 Mana Server 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.
  *
- *  You should  have received a  copy of the  GNU General Public  License along
- *  with The Mana  World; if not, write to the  Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TOKENDISPENSER_HPP
diff --git a/src/utils/trim.hpp b/src/utils/trim.hpp
index 4f5600c8..11fbcc69 100644
--- a/src/utils/trim.hpp
+++ b/src/utils/trim.hpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2007 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTILS_TRIM_HPP
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 55380275..43c6c2b9 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2006  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cstdlib>
diff --git a/src/utils/xml.hpp b/src/utils/xml.hpp
index fa0c6cbe..1ffe6faf 100644
--- a/src/utils/xml.hpp
+++ b/src/utils/xml.hpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef XML_H
diff --git a/src/utils/zlib.cpp b/src/utils/zlib.cpp
index 00cc4c0e..a6d90205 100644
--- a/src/utils/zlib.cpp
+++ b/src/utils/zlib.cpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2006  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cstdlib>
diff --git a/src/utils/zlib.hpp b/src/utils/zlib.hpp
index e74b9f5e..ee6a9dec 100644
--- a/src/utils/zlib.hpp
+++ b/src/utils/zlib.hpp
@@ -1,22 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2006 The Mana World Development Team
+ *  The Mana Server
+ *  Copyright (C) 2006  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of The Mana Server.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  The Mana Server 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
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  The Mana Server 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with The Mana Server.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ZLIB_HPP