Updated FAQ and removed some outdated win32 release information

The still relevant release information was moved to the wiki.

3 files changed, 34 insertions, 76 deletions

diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index b214672e..17860836 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -6,28 +6,31 @@ HELP
 Q: How to get help?
 
 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: #themanaworld.
+   nice people that will help you until you solve your problem.
+
+     Server: irc.freenode.net  Channel: #themanaworld.
+
    If you don't like IRC just come to our forums:
-   http://forums.themanaworld.org. Ok, do you think forums are evil? Don't
-   worry, send me an e-mail at elvenprogrammer@gmail.com and you're done.
-   That's not enough? No, I won't give you my phone number! ;P
+
+     http://forums.themanaworld.org.
+
+   Ok, do you think forums are evil? Don't worry, send us an e-mail at
+   themanaworld-devel@lists.sourceforge.net and you're done. That's not enough?
+   No, we don't share our phone numbers! ;P
+
 
 GAME
 
 Q: I always get "Unregistered ID" error message, why?
 
-A: First of all check that your username is at least 4 characters long. Is the
-   first time you login? Have you registered an account? If not use the
-   "Register" button in game. If you already succesfully connected before, but
-   now you're getting this message, please send an e-mail to
-   elvenprogrammer@gmail.com.
-
+A: Is the first time you login? Have you registered an account? If not use the
+   "Register" button. If you already succesfully connected before, but now
+   you're getting this message, please get in touch (see "How to get help").
 
 Q: I always get "Wrong password" but I'm sure I typed it right, why?
 
 A: If is the first time you login be sure you're not adding _M at the end of
-   your username. Else please send an e-mail to elvenprogrammer@gmail.com.
+   your username. Otherwise just get in touch (see "How to get help").
 
 Q: How can I talk to NPCs?
 
@@ -43,22 +46,23 @@ A: Check your inventory, if you've got lots of stuff probably you're
    carrying 50% of your maximum weight.
 
 
-SVN
+Git
 
-Q: What's SVN?
+Q: What's Git?
 
 A: It's a system where is stored the latest development version. It's not
-   assured that it's stable, but surely it has the latest updates. (SVN version
+   assured that it's stable, but surely it has the latest updates. (Git version
    is updated quite frequently). If you want to check it out, read this guide
-   http://themanaworld.org/svn-tutorial.txt
+
+     http://wiki.themanaworld.org/index.php/Git
 
 
 DEVELOPMENT
 
 Q: When will the next version be released?
 
-A: We have scheduled releases. Usually a new release is available every month.
-   Check http://themanaworld.org/ for further info.
+A: We don't have scheduled releases, but usually a new release is available
+   every few months. Check http://themanaworld.org/ for further info.
 
 
 Q: How can I contribute?
@@ -66,16 +70,19 @@ Q: How can I contribute?
 A: There are a lot of ways:
 
    - If you're a programmer, an artist or just willing to help in any way, you
-     can become part of the development team. Send an e-mail to
-     elvenprogrammer@gmail.com explaining what you want to do, or join our irc
-     channel: #themanaworld @ irc.freenode.net.
+     can become part of the development team. Join our irc channel:
+
+       #themanaworld @ irc.freenode.net.
+
+     There's also a wiki page about how to get involved:
+
+       http://wiki.themanaworld.org/index.php/Joining_the_project
 
    - You can donate money. Follow the link on the project page:
 
-        http://sourceforge.net/projects/themanaworld/
+       http://sourceforge.net/projects/themanaworld/
 
    - You can be a beta tester. Just play The Mana World and report every
-     error to the tracker or on the forum.
+     error to the bug tracker or on the forum.
 
    - Play with The Mana World: more players, more fun! Simple as that! ;-)
-
diff --git a/docs/win32-release.txt b/docs/win32-release.txt
deleted file mode 100644
index a8696897..00000000
--- a/docs/win32-release.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---------------------------------------
-THE MANA WORLD WIN32 RELEASE CHECKLIST
---------------------------------------
-
-Every Win32 releaser should follow this checklist when creating a new package.
-
-- Update version fields in Project -> Project Options -> Version Info
-    * Version details
-    * File version
-    * Product version
-    * Eventually Legal Copyright
-- Update README and ChangeLog if not already
-- Compile OpenGL version (Using -DUSE_OPENGL option) and rename the executable
-  from tmw.exe to tmw_opengl.exe
-- Compile normal version (Do not use special flags as __DEBUG or USE_OPENGL)
-- Check if the dlls were compressed (SDL.dll, SDL_Image.dll, SDL_Mixer.dll)
-- Check config.xml for default values:
-    <?xml version="1.0"?>
-      <configuration>
-        <option name="chatlog" value="chatlog.txt"/>
-        <option name="guialpha" value="0.8"/>
-        <option name="host" value="server.themanaworld.org"/>
-        <option name="hwaccel" value="0"/>
-        <option name="port" value="6901"/>
-        <option name="remember" value="0"/>
-        <option name="screen" value="0"/>
-        <option name="sfxVolume" value="100"/>
-        <option name="musicVolume" value="60"/>
-        <option name="sound" value="1"/>
-        <option name="username" value="player"/>
-      </configuration>
- - Update install script (the most recent version can be found at
-   http://themanaworld.homeip.net/tmw/setup.nsi)
-     * !define PRODUCT_VERSION
-     * OutFile
-     * all the required files (install/uninstall)
- - Test the script with a fresh installation (uninstall and delete
-   previous installations). Test also uninstall process to check if
-   it removes all the files.
-
diff --git a/packaging/windows/readme.txt b/packaging/windows/readme.txt
index 03a5717e..4a10fef4 100644
--- a/packaging/windows/readme.txt
+++ b/packaging/windows/readme.txt
@@ -1,15 +1,6 @@
 HOW TO BUILD THE INSTALLER
 
-First time setup
+See the following wiki page, which also deals with the steps needed to produce
+the Windows installer:
 
-* Install NSIS (http://nsis.sourceforge.net)
-* Install UPX (http://upx.sourceforge.net/)
-  (the script expects upx to be in a "upx" subdirectory right here)
-
-Building the installer
-
-* Make sure TMW is compiled at the right version
-* Make sure the correct DLLs are in place
-* Make sure the latest music files are in place
-* Make sure setup.nsi mentions the right TMW version
-* Right-click setup.nsi and select "Compile NSIS Script"
+  http://wiki.themanaworld.org/index.php/Making_a_new_release