diff --git a/README-mali_fbdev_r4p0.md b/README-mali_fbdev_r4p0.md index 554a587182..522a848ac9 100644 --- a/README-mali_fbdev_r4p0.md +++ b/README-mali_fbdev_r4p0.md @@ -18,7 +18,7 @@ So we will use First we will clone and build the kernel: git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1 -Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncoment the line 1074: +Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074: // Fb_wait_for_vsync(info); It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules: diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c index bfea6221d3..d5e8f14b51 100644 --- a/audio/drivers/alsa.c +++ b/audio/drivers/alsa.c @@ -224,7 +224,7 @@ static ssize_t alsa_write(void *data, const void *buf_, size_t size_) return written; else if (frames < 0) { - RARCH_ERR("[ALSA]: Unknown error occured (%s).\n", + RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n", snd_strerror(frames)); return -1; } diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c index cb9676b4bb..59ac98eb55 100644 --- a/audio/drivers/alsathread.c +++ b/audio/drivers/alsathread.c @@ -92,7 +92,7 @@ static void alsa_worker_thread(void *data) } else if (frames < 0) { - RARCH_ERR("[ALSA]: Unknown error occured (%s).\n", + RARCH_ERR("[ALSA]: Unknown error occurred (%s).\n", snd_strerror(frames)); break; } diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c index 76001148ee..34c136857a 100644 --- a/audio/drivers/dsound.c +++ b/audio/drivers/dsound.c @@ -377,7 +377,7 @@ static void *dsound_init(const char *device, unsigned rate, unsigned latency) return ds; error: - RARCH_ERR("[DirectSound] Error occured in init.\n"); + RARCH_ERR("[DirectSound] Error occurred in init.\n"); dsound_free(ds); return NULL; } diff --git a/docs/retroarch.6 b/docs/retroarch.6 index 07a2789f4c..ac5d09a60c 100644 --- a/docs/retroarch.6 +++ b/docs/retroarch.6 @@ -70,13 +70,13 @@ This option is only available if RetroArch is compiled with dynamic libretro loa .TP \fB--save PATH, -s PATH\fR Overrides the path used for save ram (*.srm). -Without this flag, the save ram path will be inferred from the rom path name, and put in the same directory as the rom file with the extention replaced with '.srm'. +Without this flag, the save ram path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replaced with '.srm'. If PATH is a directory, RetroArch will treat this as the save file directory, where the save file name will be inferred from the rom name. .TP \fB--savestate PATH, -S PATH\fR Overrides the path used for save states. -Without this flag, the save state path will be inferred from the rom path name, and put in the same directory as the rom file with the extention replace with '.state'. +Without this flag, the save state path will be inferred from the rom path name, and put in the same directory as the rom file with the extension replace with '.state'. If PATH is a directory, RetroArch will treat this as the save state directory, where the state file name will be inferred from the rom name. Do note that save states are bound to the libretro implementation being used. Using a different libretro could invalidate the save state file. diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c index e092926234..e80b7835dd 100644 --- a/network/netplay/netplay.c +++ b/network/netplay/netplay.c @@ -953,7 +953,7 @@ static void netplay_flip_users(netplay_t *netplay) netplay, NETPLAY_CMD_FLIP_PLAYERS, &flip_frame_net, sizeof flip_frame_net, CMD_OPT_HOST_ONLY | CMD_OPT_REQUIRE_SYNC, - "flip users", "Succesfully flipped users.\n"); + "flip users", "Successfully flipped users.\n"); if(command) {