CHANGELOG | 2 +- misc/macos-legacy/mach_gettime.c | 2 +- misc/macos-legacy/mach_gettime.h | 2 +- patches/README.md | 2 +- plugins/cdpath | 2 +- plugins/preview-tui | 4 ++-- plugins/splitjoin | 2 +- src/nnn.c | 4 ++-- diff --git a/CHANGELOG b/CHANGELOG index 7e24446224abf718c0ae6ee2b1691a612a16a439..1c7ee04e124799975ee8b753d74a5c94845740d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -117,7 +117,7 @@ - cool ASCII art logo in the help screen - add `bookmarks` directory for flexible symlinked bookmarks - new key B to add a symlinked bookmark for current dir - special variables `$dN`, `$fN` available for plugins/prompt/shell to access - dir/hovered file in each conext + dir/hovered file in each context - config `NNN_ORDER` to set directory-specific ordering - show/hide hidden files as per context state in plugin based batch rename - retain search filter history for plugin `finder` diff --git a/misc/macos-legacy/mach_gettime.c b/misc/macos-legacy/mach_gettime.c index a52bb84dbdafa9fad3e3a81b9e13eb09457231e0..1e33645a3bdcbc50c4a1f67b6b96c210fa4affc1 100644 --- a/misc/macos-legacy/mach_gettime.c +++ b/misc/macos-legacy/mach_gettime.c @@ -24,7 +24,7 @@ double diff = (mach_absolute_time() - mt_timestart) * mt_timebase; tp->tv_sec = diff * MT_NANO; tp->tv_nsec = diff - (tp->tv_sec * MT_GIGA); - } else { // other clk_ids are mapped to the coresponding mach clock_service + } else { // other clk_ids are mapped to the corresponding mach clock_service clock_serv_t cclock; mach_timespec_t mts; diff --git a/misc/macos-legacy/mach_gettime.h b/misc/macos-legacy/mach_gettime.h index cf574d4a0fb29215f6410a9133953816f686920a..0b815cc344c2f6c88a6b32c29502947c8d2bbf42 100644 --- a/misc/macos-legacy/mach_gettime.h +++ b/misc/macos-legacy/mach_gettime.h @@ -18,7 +18,7 @@ typedef int clockid_t; /* the mach kernel uses struct mach_timespec, so struct timespec - is loaded from for compatability */ + is loaded from for compatibility */ // struct timespec { time_t tv_sec; long tv_nsec; }; int clock_gettime(clockid_t clk_id, struct timespec *tp); diff --git a/patches/README.md b/patches/README.md index 1bebc177d58835ceb1d1b477591797de6146db2e..66e498b659b207d78d767cb55f7dc29cd5d9b2bc 100644 --- a/patches/README.md +++ b/patches/README.md @@ -2,7 +2,7 @@

User Patch Framework

This directory contains sizable user submitted patches that were rejected from mainline as they tend to be more subjective in nature. -The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatability patch is provided and will automatically be applied. +The patches will be adapted on each release when necessary (v4.1 onwards). Each patch can be applied through its respective make variable during compilation. In case inter-patch merge conflicts occur, a compatibility patch is provided and will automatically be applied. ## List of patches diff --git a/plugins/cdpath b/plugins/cdpath index 663cb26a2ef7580613fd98c77f80fbfc7f7b4b48..fbc0fb4d512a5694c1e56a336557661a9599a00b 100755 --- a/plugins/cdpath +++ b/plugins/cdpath @@ -2,7 +2,7 @@ #!/usr/bin/env sh # Description: 'cd' to the directory from CDPATH # -# Details: If the CDPATH environmet variable is not set, the default value of +# Details: If the CDPATH environment variable is not set, the default value of # ${XDG_CONFIG_HOME:-$HOME/.config}/nnn/bookmarks will be used. # You can create this directory and fill it with symbolic links to your # favorite directories. It's a good idea to add it to CDPATH so that it diff --git a/plugins/preview-tui b/plugins/preview-tui index 3fd5e862ff50e2b701cd3aefccd79732b844aad1..f9a51ca7f958d46ec9632bd38de3bbebe02a020d 100755 --- a/plugins/preview-tui +++ b/plugins/preview-tui @@ -33,7 +33,7 @@ # - optional: djvulibre for djvu # - optional: glow or lowdown for markdown # - optional: w3m or lynx or elinks for html # - optional: set/export NNN_ICONLOOKUP as 1 to enable file icons in front of directory previews with .iconlookup -# Icons and colors are configureable in .iconlookup +# Icons and colors are configurable in .iconlookup # - optional: scope.sh file viewer from ranger. # 1. drop scope.sh executable in $PATH # 2. set/export $NNN_SCOPE as 1 @@ -78,7 +78,7 @@ # # Iterm2 users are recommended to use viu to view images without getting pixelated. # # Windows Terminal users can set "Profile termination behavior" under "Profile > Advanced" settings -# to automaticaly close pane on quit when exit code is 0. +# to automatically close pane on quit when exit code is 0. # # Shell: POSIX compliant # Authors: Todd Yamakawa, Léo Villeveygoux, @Recidiviste, Mario Ortiz Manero, Luuk van Baal, @WanderLanz diff --git a/plugins/splitjoin b/plugins/splitjoin index 5ba081b4db911e49eabefdcb95f86e590aaf0f63..ec30dd6170c3835fa12d80089e387e75a84b3aa5 100755 --- a/plugins/splitjoin +++ b/plugins/splitjoin @@ -26,7 +26,7 @@ fi for entry in $arr do if [ -d "$entry" ]; then - echo "cant join directories" + echo "can't join directories" exit fi done diff --git a/src/nnn.c b/src/nnn.c index 6c32f8a101412342b7af733c566890b166be34b6..6d734813decb3ba150f33abc9d9223de6f1b1315 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -4472,7 +4472,7 @@ * This function does one of the following depending on the values of `fdout` and `page`: * 1) fdout == -1 && !page: Write up to CMD_LEN_MAX bytes of command output into g_buf * 2) fdout == -1 && page: Create a temp file, write full command output into it and show in pager. * 3) fdout != -1 && !page: Write full command output into the provided file. - * 4) fdout != -1 && page: Don't use! Returns FASLE. + * 4) fdout != -1 && page: Don't use! Returns FALSE. * * g_buf is modified only in case 1. * g_tmpfpath is modified only in case 2. @@ -6460,7 +6460,7 @@ clrtoeol(); } attroff(COLOR_PAIR(cfg.curctx + 1)); - /* Plase HW cursor on current for Braille systems */ + /* Place HW cursor on current for Braille systems */ tocursor(); }