diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-21 21:02:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 21:02:16 -0500 |
| commit | 74eed35f959e74a9a7015295cdd0a9a21bab0456 (patch) | |
| tree | 8ec3befdc5e49c24b640b8c6ca937803c0a23a52 | |
| parent | 185732a1f82098d1f29fb2568eace544c04c0f1f (diff) | |
| parent | 5c92ee5d717bd494b3f015b78e6a32ff128b1d60 (diff) | |
| download | rneovim-74eed35f959e74a9a7015295cdd0a9a21bab0456.tar.gz rneovim-74eed35f959e74a9a7015295cdd0a9a21bab0456.tar.bz2 rneovim-74eed35f959e74a9a7015295cdd0a9a21bab0456.zip | |
Merge pull request #13338 from shade-of-noon/patch-1
Restricted mode (-Z) lingering references.
| -rw-r--r-- | man/nvim.1 | 3 | ||||
| -rw-r--r-- | runtime/doc/diff.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/man/nvim.1 b/man/nvim.1 index 9e7da629f7..305551c7d4 100644 --- a/man/nvim.1 +++ b/man/nvim.1 @@ -113,9 +113,6 @@ associated with a file. To overwrite a file, add an exclamation mark to the relevant Ex command, such as .Ic :w! . .Ic ":help 'readonly'" -.It Fl Z -Restricted mode. -Disable commands that make use of an external shell. .It Fl m Resets the 'write' option, to disable file modifications. Writing to a file is disabled, but buffers can still be modified. diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 20eaa47b26..2a972483ff 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -20,8 +20,7 @@ additionally sets up for viewing the differences between the arguments. > nvim -d file1 file2 [file3 [file4]] -In addition to the |-d| argument, |-R| may be used for readonly mode -respectively. +In addition to the |-d| argument, |-R| may be used for readonly mode. The second and following arguments may also be a directory name. Vim will then append the file name of the first argument to the directory name to find diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index ac24f22bc6..0f15aefd17 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -416,8 +416,8 @@ Aliases: gvimdiff (GUI) rgview (GUI) rgvim (GUI) - rview (alias for "nvim -RZ") - rvim (alias for "nvim -Z") + rview + rvim view (alias for "nvim -R") vimdiff (alias for "nvim -d" |diff-mode|) @@ -496,6 +496,7 @@ Startup: --literal (file args are always literal; to expand wildcards on Windows, use |:n| e.g. `nvim +"n *"`) Easy mode: eview, evim, nvim -y + Restricted mode: rview, rvim, nvim -Z Vi mode: nvim -v Test functions: |