summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/README.txt2
-rw-r--r--crawl-ref/settings/034_command_keys.txt4
-rw-r--r--crawl-ref/source/command.cc8
3 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/README.txt b/crawl-ref/README.txt
index 4838e0fd7a..dee42cb165 100644
--- a/crawl-ref/README.txt
+++ b/crawl-ref/README.txt
@@ -93,7 +93,7 @@ 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
+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.
diff --git a/crawl-ref/settings/034_command_keys.txt b/crawl-ref/settings/034_command_keys.txt
index c6d7e00a51..5cbc347da3 100644
--- a/crawl-ref/settings/034_command_keys.txt
+++ b/crawl-ref/settings/034_command_keys.txt
@@ -7,10 +7,6 @@
# Note that the 'v'iew item command is not available anymore. You can
# get the same functionality by pressing the item slot in the inventor.
-# autotravel (Ctrl-G)
-M:\{7}
-A:G
-
# annotate level (Ctrl-I)
M:\{9}
A:!
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 2b46088a8d..eff2e4047c 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -819,7 +819,7 @@ struct help_file
help_file help_files[] = {
{ "crawl_manual.txt", '*', true },
- { "../readme.txt", '!', false },
+ { "../README.txt", '!', false },
{ "aptitudes.txt", '%', false },
{ "quickstart.txt", '^', false },
{ "macros_guide.txt", '~', false },
@@ -1645,16 +1645,16 @@ static void _show_keyhelp_menu(const std::vector<formatted_string> &lines,
if (!fp)
continue;
- // put in a separator
+ // Put in a separator...
cmd_help.add_item_string("");
cmd_help.add_item_string(std::string(get_number_of_cols()-1,'='));
cmd_help.add_item_string("");
- // and the file itself
+ // ...and the file itself.
_add_file_to_scroller(fp, cmd_help, help_files[i].hotkey,
help_files[i].auto_hotkey);
- // done with this file
+ // Done with this file.
fclose(fp);
}
}