Skip to content

Commit

Permalink
Word decontamination: Adjusting disclaimers
Browse files Browse the repository at this point in the history
Update disclaimers according to existing mentions.
  • Loading branch information
Warlockbugs committed Feb 23, 2021
1 parent 64074d9 commit 10cee80
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions COPYRIGHT.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Copyright
Definition of copyrighted materials
-----------------------------------

World of Warcraft® ©2004 Blizzard Entertainment, Inc. All rights reserved. World of Warcraft, Warcraft and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries.
World of Warcraft® content and materials are trademarks and copyrights of Blizzard Entertainment, Inc. or its licensors.
World of Warcraft® ©2004 Blizzard Entertainment, Inc. All rights reserved.
World of Warcraft, WoW, Warcraft, The Frozen Throne, The Burning Crusade, Wrath of the Lich King, Cataclysm, Mists of Pandaria, Ashbringer, Dark Portal, Darkmoon Faire, Frostmourne, Onyxia's Lair, Diablo, Hearthstone, Heroes of Azeroth, Reaper of Souls, Starcraft, Battle Net, Blizzcon, Glider, Blizzard and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries.

All content and materials protected by copyright are here after called Copyrighted Material.

Expand Down
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This means, we want to focus on:
* Anyone who wants to do stuff is very welcome to do so!

* Emulation
This project is about developing a server software that is able to
* This project is about developing a server software that is able to
emulate a well known MMORPG service.

* Right
Expand Down Expand Up @@ -81,8 +81,17 @@ To be able to accomplish these goals, we support and promote:

### Exceptions to GPL

World of Warcraft® ©2004 Blizzard Entertainment, Inc. All rights reserved. World of Warcraft, Warcraft and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries.
World of Warcraft® content and materials are trademarks and copyrights of Blizzard Entertainment, Inc. or its licensors.
World of Warcraft® ©2004 Blizzard Entertainment, Inc. All rights reserved.
World of Warcraft® content and materials mentioned or referenced are copyrighted by
Blizzard Entertainment, Inc. or its licensors.
World of Warcraft, WoW, Warcraft, The Frozen Throne, The Burning Crusade, Wrath of the Lich King,
Cataclysm, Mists of Pandaria, Ashbringer, Dark Portal, Darkmoon Faire, Frostmourne, Onyxia's Lair,
Diablo, Hearthstone, Heroes of Azeroth, Reaper of Souls, Starcraft, Battle Net, Blizzcon, Glider,
Blizzard and Blizzard Entertainment are trademarks or registered trademarks of
Blizzard Entertainment, Inc. in the U.S. and/or other countries.

Any World of Warcraft® content and materials mentioned or referenced are copyrighted by
Blizzard Entertainment, Inc. or its licensors.
CMaNGOS project is not affiliated with Blizzard Entertainment, Inc. or its licensors.

Some third-party libraries CMaNGOS uses have other licenses, that must be
Expand Down

0 comments on commit 10cee80

Please sign in to comment.