summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--INSTALL4
-rw-r--r--README3
-rw-r--r--WinReadMe.txt2
-rw-r--r--data/help/support.txt2
-rw-r--r--docs/FAQ.txt4
-rw-r--r--docs/INSTALL/debian.txt6
-rw-r--r--docs/INSTALL/win32.txt4
-rw-r--r--docs/items.txt2
-rw-r--r--docs/packages.txt2
-rw-r--r--docs/progression.txt4
-rw-r--r--docs/win32-release.txt4
12 files changed, 19 insertions, 20 deletions
diff --git a/AUTHORS b/AUTHORS
index 34618b84..4f30129b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Aethyra Dev Team
== Artists ==
- Frictor
+ Frictor <frictor2(at)hotmail.com>
Angeliex
== Map Designers ==
diff --git a/INSTALL b/INSTALL
index 4124002d..24669094 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
How to compile and run Aethyra on your GNU/Linux Box
================================================
-Homepage: http://www.aethyra.com/
+Homepage: http://www.aethyra.org/
IRC: irc.freenode.net / #aethyra
1) Requirements
@@ -69,7 +69,7 @@ pass a different prefix to configure as usual.
4.) su -c "make install"
you can get help from A.) IRC channel irc.freenode.net #aedev or #aethyra
- B.) http://forum.aethyra.com
+ B.) http://www.aethyra.org/forums/
Make sure you record the output from the konsole window
NOTE: It is possible to compile Aethyra without support for OpenGL rendering.
diff --git a/README b/README
index 6e31ab6e..0e5eb955 100644
--- a/README
+++ b/README
@@ -122,10 +122,9 @@ level 10: enables not used
If you're having troubles, please first of all read the FAQ.
If you can't find a solution to your problem, feel free to check our
Bugs/Support section of the forum:
-- http://forums.aethyra.com
+- http://www.aethyra.org/forums
or come visit us on our IRC channel:
- #aethyra @ irc.freenode.net
-- ##aethyra @ irc.freenode.net
- #aedev @ irc.freenode.net
Otherwise check the AUTHORS file to have a list of developers and how to
diff --git a/WinReadMe.txt b/WinReadMe.txt
index 17870e03..a77ce944 100644
--- a/WinReadMe.txt
+++ b/WinReadMe.txt
@@ -12,7 +12,7 @@ from where it left off.
To install the client, just copy this folder to your Program Files
folder and add a shortcut to aethyra.exe to your Start Menu.
-For any further questions pop onto the forums at http://forums.aethyra.com/
+For any further questions pop onto the forums at http://www.aethyra.org/forums/
especially the Windows Way forum, or pop onto the IRC channel #aethyra on the
FreeNode network
diff --git a/data/help/support.txt b/data/help/support.txt
index 44fd08f3..5d7d019f 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -7,7 +7,7 @@
can't find a solution to your problem, feel free to check our
Bugs/Support section of the forum:
-##2 http://forums.aethyra.com
+##2 http://www.aethyra.org/forums/
or come visit us on our IRC channel:
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index b52c0f17..6adfb2b3 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -9,7 +9,7 @@ A: The fastest way is to come on our IRC channel. There you can find a lot of
nice people that will help you until you solve your problem. Server:
irc.freenode.net Channel: #aethyra.
If you don't like IRC just come to our forums:
- http://forums.aethyra.com/ . Ok, do you think forums are evil?
+ http://www.aethyra.org/ . Ok, do you think forums are evil?
Don't worry, send me an e-mail at blame582@gmail.com and you're done.
That's not enough? No, I won't give you my phone number! ;P
@@ -60,7 +60,7 @@ DEVELOPMENT
Q: When will the next version be released?
A: We have scheduled releases. Usually a new release is available every month.
- Check http://www.aethyra.com/ for further info.
+ Check http://www.aethyra.org/ for further info.
Q: How can I contribute?
diff --git a/docs/INSTALL/debian.txt b/docs/INSTALL/debian.txt
index e9cf3183..4e643a55 100644
--- a/docs/INSTALL/debian.txt
+++ b/docs/INSTALL/debian.txt
@@ -9,11 +9,11 @@ to for Aethyra...
WARNING! These instructions are probably outdated!
-Check the forums (http://forums.aethyra.com/) where better help can be found.
+Check the forums (http://www.aethyra.org/forums/) where better help can be found.
Aethyra project
======================
-Homepage: http://www.aethyra.com/
+Homepage: http://www.aethyra.org/
IRC: irc.freenode.net / #aethyra
1) Installing Aethyra and dependencies
@@ -53,7 +53,7 @@ And the debhelper tools:
Download tmw from Subversion using the command (You'll need Subversion
installed on your system):
- svn co svn://209.168.213.109/client/trunk aethyra
+ svn co svn://www.aethyra.org/client/trunk aethyra
Rename the aethyra folder into aethyra-XXX and open a console in it.
You can now type:
diff --git a/docs/INSTALL/win32.txt b/docs/INSTALL/win32.txt
index 3ffd506e..2fd12f8c 100644
--- a/docs/INSTALL/win32.txt
+++ b/docs/INSTALL/win32.txt
@@ -5,7 +5,7 @@ How setup Dev-C++ to compile Aethyra on a Win32 Box
Aethyra project
===========================
-Homepage: http://www.aethyra.com
+Homepage: http://www.aethyra.org
IRC: irc.freenode.net / #aethyra
@@ -119,7 +119,7 @@ Check out The Mana Experiment from Subversion using either the command line svn
tool or TortoiseSVN, pick what you like to use most and install that. Next,
check out the following directory from our repository:
- svn://209.168.213.109/client/trunk
+ svn://www.aethyra.org/client/trunk
Open "Aethyra.dev" in Dev-C++. From there on you should be able to
start compilition with Excute -> Compile. A file called aethyra.exe should appear
diff --git a/docs/items.txt b/docs/items.txt
index 19c6b10c..efba35ac 100644
--- a/docs/items.txt
+++ b/docs/items.txt
@@ -1,5 +1,5 @@
-------------------------------
-THE MANA WORLD INVENTORY SYSTEM
+ AETHYRA INVENTORY SYSTEM
-------------------------------
1. INTRODUCTION
diff --git a/docs/packages.txt b/docs/packages.txt
index d5735e28..f29fbe8c 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -15,7 +15,7 @@ AETHYRA PACKAGE SYSTEM
1. INTRODUCTION
-Aethyra (Was The Mana Experiment, original;y The Mana World) is expected to grow continuously with updates to the game
+Aethyra (Was The Mana Experiment, originally part of The Mana World) is expected to grow continuously with updates to the game
world occurring relatively frequently. More often so than for example new
releases of the game client. To make sure players don't have to update their
data manually all the time, by for example downloading the latest from the
diff --git a/docs/progression.txt b/docs/progression.txt
index a25cf11f..cbec77e2 100644
--- a/docs/progression.txt
+++ b/docs/progression.txt
@@ -1,5 +1,5 @@
-----------------------------------
-THE MANA WORLD PLAYER'S PROGRESSION
+ AETHYRA PLAYER'S PROGRESSION
-----------------------------------
1. PLAYER'S STATS
@@ -126,4 +126,4 @@ Peon 17 Double Hit, Hard Hit(JL:5) Beginner Lvl:10
Every of these notes have to be discussed, if you have any feedback,
suggestions, updates, commit or tell them at:
-address: irc://irc.freenode.net channel: #themanaworld
+address: irc://irc.freenode.net channel: #aethyra
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
index 64590139..5bd837d0 100644
--- a/docs/win32-release.txt
+++ b/docs/win32-release.txt
@@ -22,9 +22,9 @@ Every Win32 releaser should follow this checklist when creating a new package.
<configuration>
<option name="chatlog" value="chatlog.txt"/>
<option name="guialpha" value="0.8"/>
- <option name="host" value="209.168.213.109"/>
+ <option name="host" value="www.aethyra.org"/>
<option name="hwaccel" value="0"/>
- <option name="port" value="6901"/>
+ <option name="port" value="21001"/>
<option name="remember" value="0"/>
<option name="screen" value="0"/>
<option name="sfxVolume" value="100"/>