Apply Markus' docs patch.

Update religious secondary choices.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6473 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 40 insertions, 40 deletions

diff --git a/crawl-ref/README.txt b/crawl-ref/README.txt
index 688e94597d..4838e0fd7a 100644
--- a/crawl-ref/README.txt
+++ b/crawl-ref/README.txt
@@ -1,14 +1,14 @@
 Dungeon Crawl Stone Soup
 ========================
 
-Dungeon Crawl Stone Soup is a game of dungeon exploration, combat and magic, 
-involving characters of diverse skills, worshipping deities of great power and 
-caprice. To win, you'll need to be a master of tactics and strategy, and 
+Dungeon Crawl Stone Soup is a game of dungeon exploration, combat and magic,
+involving characters of diverse skills, worshipping deities of great power and
+caprice. To win, you'll need to be a master of tactics and strategy, and
 prevail against overwhelming odds.
 
 Players of versions 0.3.4 and older beware: please read the file
    034_changes.txt
-in the docs/ directory for a list of the interface changes, and how 
+in the docs/ directory for a list of the interface changes, and how
 you could possibly retrieve the 0.3.4 standards.
 
 Contents:
@@ -22,21 +22,21 @@ Contents:
 ------------------
 If you'd like to dive in immediately, your best bets are to
 * start up a game and choose a tutorial (press 'T' when asked for race), or
-* read quickstart.txt (in the /docs directory), or
+* read quickstart.txt (in the docs/ directory), or
 * for studious readers, browse the manual (see below for all doc files).
 
 Internet play:
-You can play Crawl online, both competing with other players and watching 
-them. Check the homepage at crawl.akrasiac.org for details, including 
-information about additional servers. You just need a ssh or telnet console; 
-on Windows, the \key{PuTTY} program works very well. Read docs/ssh_guide.txt
+You can play Crawl online, both competing with other players and watching
+them. Check the homepage at http://crawl.akrasiac.org/ for details, including
+information about additional servers. You just need a ssh or telnet console;
+on Windows, the PuTTY program works very well. Read docs/ssh_guide.txt
 for a step by step guide on how to set this up.
 
 Tiles:
 Crawl features an alternative to the classical ASCII display; Tile-based
-Crawl is often a lot more accessible by new players. Tiles are available for 
+Crawl is often a lot more accessible by new players. Tiles are available for
 Linux, Windows and OS X.
-Unfortunately, it is not yet possible to combine tiles and internet play.
+Unfortunately, it is not yet possible to combine tiles and Internet play.
 
 
 2. File system
@@ -69,14 +69,14 @@ The settings/ folder contains, among others, the following files:
 -----------------------------
 The official webpage is at
       http://crawl-ref.sourceforge.net/
-and there you can find both trackers to add bug reports, feature requests, or 
-upload patches, as well as sources and binaries. This is the best way to report 
+and there you can find both trackers to add bug reports, feature requests, or
+upload patches, as well as sources and binaries. This is the best way to report
 bugs or mention new ideas.
 
 There is a Usenet newsgroup dealing with roguelikes, including Crawl:
       rec.games.roguelike.misc
-It is polite to flag your post with -crawl- as other games are discussed over 
-there as well. This is a good place to ask general questions, both from new 
+It is polite to flag your post with -crawl- as other games are discussed over
+there as well. This is a good place to ask general questions, both from new
 players as well as for spoilers, or to announce spectacular wins.
 
 If you want to chime in with development, you can read the mailing list
@@ -86,18 +86,18 @@ which can get pretty busy on the occasion.
 
 4. License and history information
 ----------------------------------
-What you have downloaded is a descendant of Linley's Dungeon Crawl. Development
-of the main branch stalled at version 4.0.0b26, with a final alpha of 4.1 being
-released by Brent Ross in 2005. Since 2006, the Dungeon Crawl Stone Soup team 
-has been continuing the development. See the CREDITS in the main folder for a
-myriad of contributors, past and present; license.txt contains the legal blurb.
-
-Dungeon Crawl Stone Soup is an open source, freeware roguelike. It is supported 
-on Linux, Windows, OS/X  and, to a lesser extent, on DOS. The source should 
+This is a descendant of Linley's Dungeon Crawl. Development of the main branch
+stalled at version 4.0.0b26, with a final alpha of 4.1 being released by Brent
+Ross in 2005. Since 2006, the Dungeon Crawl Stone Soup team has been continuing
+the development. See the CREDITS in the main folder for a myriad of
+contributors, past and present; license.txt contains the legal blurb.
+
+Dungeon Crawl Stone Soup is an open source, freeware roguelike. It is supported
+on Linux, Windows, OS X  and, to a lesser extent, on DOS. The source should
 compile and run on any reasonably modern Unix.
 Stone Soup features both ASCII and graphical (Tiles) display.
 
-Crawl gladly and gratuitously uses the following open-source packages:
+Crawl gladly and gratuitously uses the following open source packages:
 * The Lua script language, see docs/lualicense.txt.
 * The PCRE library for regular expressions, see docs/pcre_license.txt.
 * The Mersenne Twister for random number generation, docs/mt19937.txt.
@@ -107,48 +107,48 @@ Crawl gladly and gratuitously uses the following open-source packages:
 
 5. How you can help
 -------------------
-If you like the game and you want to help making it better, there are a number 
+If you like the game and you want to help making it better, there are a number
 of ways to do so:
 
 * Playtesting.
 At any time, there will be bugs -- playing and reporting these is a great help.
-There is a beta server around hosting the most recent version of the current 
-code; the akrasiac page links to it. Besides finding bugs, ideas on how to 
-improve interface or gameplay are welcome as well.
+There is a beta server around hosting the most recent version of the current
+code; http://crawl.akrasiac.org/ links to it. Besides finding bugs, ideas on
+how to improve interface or gameplay are welcome as well.
 
 * Vault making.
-Crawl uses many hand-drawn (but often randomised) maps. Making them is fun and 
-easy. It's best to start with simple entry vaults (glance through 
-dat/entry.des for a first impression). Later, you may want to read 
-docs/level_design.txt for the full power. If you're ambitious, new maps for 
+Crawl uses many hand-drawn (but often randomised) maps. Making them is fun and
+easy. It's best to start with simple entry vaults (glance through
+dat/entry.des for a first impression). Later, you may want to read
+docs/level_design.txt for the full power. If you're ambitious, new maps for
 branch ends are possible, as well.
-If you've made some maps, you can test them on your system (no compiling 
+If you've made some maps, you can test them on your system (no compiling
 needed) and then just mail them to the mailing list.
 
 * Speech.
-Monster talking provides a lot of flavour. Just like vaults, speech depends 
-upon a large set of entries. Since most of the speech has been outsourced, you 
+Monster talking provides a lot of flavour. Just like vaults, speech depends
+upon a large set of entries. Since most of the speech has been outsourced, you
 can add new prose. The syntax is effective, but slightly strange, so you may
 want to read docs/monster_speech.txt.
-Again, changing or adding speech is possible on your local game. If you 
+Again, changing or adding speech is possible on your local game. If you
 have added something, send the files to the list.
 
 * Monster descriptions.
 You can look up the current monster descriptions in-game with '?/' or just read
 them in dat/descript/monsters.txt. The following conventions should be more or
-less obeyed: descriptions ought to contain flavour text, ideally pointing out
+less obeyed: Descriptions ought to contain flavour text, ideally pointing out
 major weaknesses/strengths. No numbers, please. Citations are okay, but try to
 stay away from the most generic ones.
 If you like, you can similarly modify the descriptions for features, items or
 branches.
 
 * Tiles.
-Since version 0.4, tiles are integrated within Crawl. Having variants of 
-often-used glyphs is always good. If you want to give this a shot, please 
+Since version 0.4, tiles are integrated within Crawl. Having variants of
+often-used glyphs is always good. If you want to give this a shot, please
 contact us via the mailing list.
 
 * Patches.
-If you like to, you can download the source code and apply patches. Both 
+If you like to, you can download the source code and apply patches. Both
 patches for bug fixes as well as implementation of new features are very much
 welcome. 
 Please be sure to read docs/coding_conventions.txt first.