aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/starting.txt
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-12-30 21:17:18 +0100
committerGitHub <noreply@github.com>2018-12-30 21:17:18 +0100
commit1e8d2bdc487cdebf152eb228ed936720cfed3a76 (patch)
treef4933a9250ac93d6dd6998b9bafb87bb1beae8ab /runtime/doc/starting.txt
parentfa5182489a660e672bac6ea78ba4eefcbba9d6eb (diff)
parenta10fdc70aa1e7e48421a473a2fab49b79089426c (diff)
downloadrneovim-1e8d2bdc487cdebf152eb228ed936720cfed3a76.tar.gz
rneovim-1e8d2bdc487cdebf152eb228ed936720cfed3a76.tar.bz2
rneovim-1e8d2bdc487cdebf152eb228ed936720cfed3a76.zip
Merge #9335 from justinmk/doc
Diffstat (limited to 'runtime/doc/starting.txt')
-rw-r--r--runtime/doc/starting.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 82e73035d8..12794b6cc0 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1025,7 +1025,7 @@ Use the "r" flag in 'shada' to specify for which files no marks should be
remembered.
MERGING *shada-merging*
- {Nvim}
+
When writing ShaDa files with |:wshada| without bang or at regular exit
information in the existing ShaDa file is merged with information from current
Neovim instance. For this purpose ShaDa files store timestamps associated
@@ -1055,7 +1055,7 @@ with ShaDa entries. Specifically the following is being done:
Neovim instance which was last writing the file. |shada-%|
COMPATIBILITY *shada-compatibility*
- {Nvim}
+
ShaDa files are forward and backward compatible. This means that
1. Entries which have unknown type (i.e. that hold unidentified data) are