diff --git a/README.md b/README.md index a89504e..038b1a0 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ F9/9 - clone current DataPower configuration under new name DEL/x - delete selected (or current if none selected) directories and files - delete DataPower configuration d - diff current files/directories - (must be "blocking" - see "Custom external commands" below) + (should be "blocking" - see "Custom external commands" below) / - find string n - find next string m - show all status messages saved in history @@ -213,9 +213,9 @@ calling external commands are set. By default these are "less", "vi" and "ldiff" but could be any commands. All of those commands should be started in foreground and should wait for user's input to complete. For example for viewer "less" or "more" can be used while "cat" will not work. For file comparison normal "diff" -command can't be used but "blocking" diff command must be used like vimdiff or -custom ldiff script which combines diff and less commands can be prepared -(something like: +command can be used as work around but "blocking" diff command should be used +like vimdiff. Custom ldiff script which combines diff and less commands can be +easily prepared (something like: 'diff "$1" "$2" | less' or for more fancy colored output you can use something like: 'diff -u -r --color=always "$1" "$2" | less -r'). diff --git a/help/help.go b/help/help.go index 743ac09..fab0b84 100644 --- a/help/help.go +++ b/help/help.go @@ -40,7 +40,7 @@ DEL/x - delete selected (or current if none selected) directories - delete DataPower configuration - delete DataPower object d - diff current files/directories - (must be "blocking" - see "Custom external commands" below) + (should be "blocking" - see "Custom external commands" below) / - find string n - find next string m - show all status messages saved in history @@ -68,9 +68,9 @@ calling external commands are set. By default these are "less", "vi" and "ldiff" but could be any commands. All of those commands should be started in foreground and should wait for user's input to complete. For example for viewer "less" or "more" can be used while "cat" will not work. For file comparison normal "diff" -command can't be used but "blocking" diff command must be used like vimdiff or -custom ldiff script which combines diff and less commands can be prepared -(something like: +command can be used as work around but "blocking" diff command should be used +like vimdiff. Custom ldiff script which combines diff and less commands can be +easily prepared (something like: 'diff "$1" "$2" | less' or for more fancy colored output you can use something like: 'diff -u -r --color=always "$1" "$2" | less -r').