From 6c7a9adaad02b7c6b019e2a797b1b6b26c16fc4a Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Wed, 23 Aug 2017 14:59:16 +1000 Subject: [PATCH] Consistently use "folder" over "directory", except for Linux documentation. For Windows documentation, "folder" is the correct term. For generic documentation, probably either would do but I suspect people are slightly more likely to be familiar with "folder". --- docs/concepts/game-folders.md | 2 +- docs/concepts/game-library.md | 2 +- docs/guides/import.md | 2 +- docs/guides/shaders.md | 8 ++++---- docs/install/general.md | 4 ++-- docs/install/windows.md | 6 +++--- docs/interface/common.md | 8 ++++---- docs/interface/higan-tools.md | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/concepts/game-folders.md b/docs/concepts/game-folders.md index cbd96b95..76f6f063 100644 --- a/docs/concepts/game-folders.md +++ b/docs/concepts/game-folders.md @@ -132,7 +132,7 @@ to all emulators that support them: Holds streamable audio for [the MSU-1][msu1]. Files that are only useful to higan specifically -are placed in a `higan` subdirectory: +are placed in a `higan` subfolder: - `cheats.bml`: All information present in diff --git a/docs/concepts/game-library.md b/docs/concepts/game-library.md index a99e8d29..1deb6fcd 100644 --- a/docs/concepts/game-library.md +++ b/docs/concepts/game-library.md @@ -78,7 +78,7 @@ and telling higan where to find them. to open [higan's Advanced settings][advsettings]. 1. Click the "Change ..." button on the right. A [filesystem browser][fsbrowser] will appear, - allowing you to choose the same directory again. + allowing you to choose the same folder again. [icsettings]: ../interface/icarus.md#the-icarus-settings-dialog [fsbrowser]: ../interface/common.md#the-filesystem-browser diff --git a/docs/guides/import.md b/docs/guides/import.md index 4361f381..ad45a8be 100644 --- a/docs/guides/import.md +++ b/docs/guides/import.md @@ -406,7 +406,7 @@ but higan expects the same filename for both. To import the SGB base cartridge, you must copy the required firmware file -into the same directory. +into the same folder. Then you may import it just like [a regular game](#regular-games). diff --git a/docs/guides/shaders.md b/docs/guides/shaders.md index a082da8e..ad04e9e2 100644 --- a/docs/guides/shaders.md +++ b/docs/guides/shaders.md @@ -53,14 +53,14 @@ it should contain a file named `manifest.bml`, and probably some `*.fs` or `*.vs` files. Place the shader folder inside -the `Video Shaders` directory +the `Video Shaders` folder of your higan installation. -If you don't have a `Video Shaders` directory, -create it beside the `*.sys` directories +If you don't have a `Video Shaders` folder, +create it beside the `*.sys` folders like `Game Boy Advance.sys` and `Super Famicom.sys`. - On Windows, - this is probably the directory containing `higan.exe` + this is probably the folder containing `higan.exe` - On Linux, this is probably `~/.local/share/higan` diff --git a/docs/install/general.md b/docs/install/general.md index 0867d71a..66a7b4ad 100644 --- a/docs/install/general.md +++ b/docs/install/general.md @@ -34,7 +34,7 @@ Once you have the correct BIOS file: so you don't wind up with a file called `bios.rom.dat` or whatever the file's original extension was. - 2. Copy the file into higan's `Game Boy Advance.sys` directory, + 2. Copy the file into higan's `Game Boy Advance.sys` folder, alongside the `manifest.bml` file that is already there. - In Windows, find `Game Boy Advance.sys` in the same folder @@ -46,7 +46,7 @@ Once you have the correct BIOS file: **Note:** If you upgrade this version of higan to a newer version, make sure the `bios.rom` file -winds up in the `Game Boy Advance.sys` directory +winds up in the `Game Boy Advance.sys` folder of the new version. [bios]: http://problemkaputt.de/gbatek.htm#biosfunctions diff --git a/docs/install/windows.md b/docs/install/windows.md index efbf0eaa..9855dbf7 100644 --- a/docs/install/windows.md +++ b/docs/install/windows.md @@ -13,7 +13,7 @@ extract the contents of the higan archive into a new folder. When you're done, the new folder should contain `higan.exe` and `icarus.exe` -along with other assorted files and directories +along with other assorted files and folders that describe the systems higan emulates. You may put that folder wherever you like. @@ -31,7 +31,7 @@ To remove higan's configuration: 1. Press Win+R to open the Run dialog 2. Type `%LOCALAPPDATA%` and press Enter to open the folder where higan's configuration data lives - 3. Delete the subdirectories named `icarus` and `higan` + 3. Delete the subfolders named `icarus` and `higan` if they exist. You might also want to remove the games imported into higan's library @@ -124,7 +124,7 @@ Installing a compiled build on Windows into the new folder 4. Copy `C:\higan-src\higan\out\higan.exe` into the new folder - 5. Copy all the `*.sys` directories + 5. Copy all the `*.sys` folders in `C:\higan-src\higan\systems` into the new folder diff --git a/docs/interface/common.md b/docs/interface/common.md index d5f68d86..7b31a1a0 100644 --- a/docs/interface/common.md +++ b/docs/interface/common.md @@ -32,10 +32,10 @@ Pressing this button will switch to the parent of the current folder. Most of the filesystem browser lists the contents -of the current directory. +of the current folder. Double-clicking a folder, or selecting it and pressing Enter, -will switch to showing the contents of that directory. +will switch to showing the contents of that folder. If the list has keyboard focus, typing any text will jump to the first inem in the list whose name begins with the text you typed. @@ -50,12 +50,12 @@ by double-clicking it, by selecting it and pressing Enter, or by selecting it and clicking the "Select" button in the bottom-right. -If this filesystem browser is asking for a directory, +If this filesystem browser is asking for a folder, you can choose one by selecting it and clicking the "Select" button in the bottom-right. Double-clicking or selecting and pressing Enter don't work, -they just switch to viewing that directory. +they just switch to viewing that folder. The "Cancel" button in the bottom-right closes the filesystem browser without selecting anything. diff --git a/docs/interface/higan-tools.md b/docs/interface/higan-tools.md index deaae231..4e4de2a7 100644 --- a/docs/interface/higan-tools.md +++ b/docs/interface/higan-tools.md @@ -62,8 +62,8 @@ in [the Game Library](../concepts/game-library.md). If your copy of higan includes a cheat database (a file named `cheats.bml` -in the same directory as `Super Famicom.sys` -and the other `*.sys` directories), +in the same folder as `Super Famicom.sys` +and the other `*.sys` folders), you can click the "Find Codes ..." button in the bottom left to load all known cheats for the currently-running game.