aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-22 22:45:57 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-05-22 22:46:44 +0200
commitf1bc152fa081f5d630ea1a027aa5bd00bdbb78f0 (patch)
tree67c24b6792816bc57af7c00a37ba226dc9a15cfb
parent1642917f9ba873be7be2dae346efb29f64e268a0 (diff)
downloadrneovim-f1bc152fa081f5d630ea1a027aa5bd00bdbb78f0.tar.gz
rneovim-f1bc152fa081f5d630ea1a027aa5bd00bdbb78f0.tar.bz2
rneovim-f1bc152fa081f5d630ea1a027aa5bd00bdbb78f0.zip
doc: remove mentions of vimrc_example
closes #8426
-rw-r--r--runtime/doc/diff.txt2
-rw-r--r--runtime/doc/intro.txt3
-rw-r--r--runtime/doc/motion.txt5
-rw-r--r--runtime/doc/usr_01.txt9
-rw-r--r--runtime/doc/usr_05.txt5
-rw-r--r--runtime/tutor/en/vim-01-beginner.tutor11
6 files changed, 13 insertions, 22 deletions
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index b9dccc42a8..c6c827a748 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -165,7 +165,7 @@ loaded. Since Vim doesn't allow having two buffers for the same file, you
need another buffer. This command is useful: >
command DiffOrig vert new | set buftype=nofile | read ++edit # | 0d_
\ | diffthis | wincmd p | diffthis
-(this is in |vimrc_example.vim|). Use ":DiffOrig" to see the differences
+Use ":DiffOrig" to see the differences
between the current buffer and the file it was loaded from.
A buffer that is unloaded cannot be used for the diff. But it does work for
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6c40264d86..e7fb632de8 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -655,9 +655,6 @@ Q Switch to "Ex" mode. This is a bit like typing ":"
Vim will enter this mode by default if it's invoked as
"ex" on the command-line.
Use the ":vi" command |:visual| to exit "Ex" mode.
- Note: In older versions of Vim "Q" formatted text,
- that is now done with |gq|. But if you use the
- |vimrc_example.vim| script "Q" works like "gq".
*gQ*
gQ Switch to "Ex" mode like with "Q", but really behave
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 600eb3ab9e..6f3a585ff3 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -761,9 +761,8 @@ g'{mark} g`{mark}
Jump to the {mark}, but don't change the jumplist when
jumping within the current buffer. Example: >
g`"
-< jumps to the last known position in a file. See
- $VIMRUNTIME/vimrc_example.vim.
- Also see |:keepjumps|.
+< jumps to the last known position in a file.
+ See also |:keepjumps|.
*:marks*
:marks List all the current marks (not a motion command).
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index f3a5728d72..bc55e7cdce 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -57,12 +57,11 @@ make them visible with: >
==============================================================================
*01.2* Vim installed *setup-vimrc_example*
-It's not required for this tutorial, but we provide an example vimrc you may
-use:
+To create an empty vimrc: >
- :!cp -i $VIMRUNTIME/vimrc_example.vim ~/.config/nvim/init.vim
-
-If the file already exists you probably want to keep it.
+ :call mkdir(stdpath('config'),'p')
+ :exe 'edit' stdpath('config').'/init.vim'
+ :write
For more info see |vimrc|.
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index cb7bf94ddc..d1491e6b31 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -58,10 +58,9 @@ to write a Vim script file: |usr_41.txt|.
==============================================================================
*05.2* The example vimrc file explained *vimrc_example.vim*
-In the first chapter was explained how the example vimrc file can be used.
-The file can be found here:
+In the first chapter was explained how to create a vimrc file. >
- $VIMRUNTIME/vimrc_example.vim ~
+ :exe 'edit' stdpath('config').'/init.vim'
In this section we will explain the various commands used in this file. This
will give you hints about how to set up your own preferences. Not everything
diff --git a/runtime/tutor/en/vim-01-beginner.tutor b/runtime/tutor/en/vim-01-beginner.tutor
index dce98d53a4..0d03103bca 100644
--- a/runtime/tutor/en/vim-01-beginner.tutor
+++ b/runtime/tutor/en/vim-01-beginner.tutor
@@ -906,16 +906,13 @@ You can find help on just about any subject, by giving an argument to the
Vim has many more features than Vi, but most of them are disabled by
default. To start using more features you have to create a "vimrc" file.
- 1. Start editing the "vimrc" file. This depends on your system:
- `:e ~/.config/nvim/init.vim`{vim} for Unix-like systems
+ 1. Start editing the "vimrc" file.
+ `:call mkdir(stdpath('config'),'p')`{vim}
+ `:exe 'edit' stdpath('config').'/init.vim'`{vim}
- 2. Now read the example "vimrc" file contents:
- `:r $VIMRUNTIME/vimrc_example.vim`{vim}
-
- 3. Write the file with:
+ 2. Write the file with:
`:w`{vim}
- The next time you start Vim it will use syntax highlighting.
You can add all your preferred settings to this "vimrc" file.
For more information type `:help vimrc-intro`{vim}.