doc/clipboard: cleanup

runtime/autoload/provider/clipboard.vim

@@ -58,7 +58,7 @@ elseif executable('doitclient')
   let s:copy['*'] = s:copy['+']
   let s:paste['*'] = s:paste['+']
 else
-  echom 'clipboard: No clipboard tool available. See :help nvim-clipboard'
+  echom 'clipboard: No clipboard tool available. See :help clipboard'
   finish
 endif
 

runtime/doc/change.txt

@@ -1250,7 +1250,7 @@ register.
 Use these registers for storing and retrieving the selected text for the GUI.
 See |quotestar| and |quoteplus|.  When the clipboard is not available or not
 working, the unnamed register is used instead.  For Unix systems and Mac OS X,
-see |nvim-clipboard|.
+see |primary-selection|.
 
 9. Black hole register "_				*quote_*
 When writing to this register, nothing happens.  This can be used to delete

runtime/doc/gui.txt

@@ -395,9 +395,9 @@ You may make selections with the mouse (see |gui-mouse-select|), or by using
 Vim's Visual mode (see |v|).  If 'a' is present in 'guioptions', then
 whenever a selection is started (Visual or Select mode), or when the selection
 is changed, Vim becomes the owner of the windowing system's primary selection
-(on MS-Windows the |gui-clipboard| is used).
+(on MS-Windows the |clipboard| is used).
 
-							*clipboard*
+							*primary-selection*
 There is a special register for storing this selection, it is the "*
 register.  Nothing is put in here unless the information about what text is
 selected is about to change (e.g. with a left mouse click somewhere), or when

runtime/doc/nvim.txt

@@ -15,7 +15,7 @@ see |help.txt|.
 3. Msgpack-RPC			 |msgpack-rpc|
 4. Job control			 |job-control|
 5. Python plugins		 |nvim-python|
-6. Clipboard integration	 |nvim-clipboard|
+6. Clipboard integration	 |clipboard|
 7. Remote plugins		 |remote-plugin|
 8. Provider infrastructure	 |nvim-provider|
 9. Integrated terminal emulator	 |nvim-terminal-emulator|

runtime/doc/nvim_clipboard.txt

@@ -4,28 +4,26 @@
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
 
-Clipboard integration for Nvim					*nvim-clipboard*
+Clipboard integration for Nvim					     *clipboard*
 
-1. Intro			|nvim-clipboard-intro|
-2. X11 selection mechanism	|nvim-clipboard-x11|
+1. Intro			|clipboard-intro|
+2. X11 selection mechanism	|clipboard-x11|
 
 ==============================================================================
-1. Intro						  *nvim-clipboard-intro*
+1. Intro						       *clipboard-intro*
 
-Nvim has no direct connection to the system clipboard. Instead, it is
-accessible through the |nvim-provider| infrastructure, which transparently
-uses shell commands for communicating with the clipboard.
+Nvim has no direct connection to the system clipboard. Instead it is
+accessible through a |provider| which transparently uses shell commands for
+communicating with the clipboard.
 
 Clipboard access is implicitly enabled if any of the following clipboard tools
-is found in your `$PATH`.
+are found in your `$PATH`.
 
-- xclip
-- xsel (newer alternative to xclip)
-- pbcopy/pbpaste (only for Mac OS X)
-- lemonade (useful for SSH machine)
-  https://github.com/pocke/lemonade
-- doitclient (another option for SSH setups from the maintainer of PuTTY)
-  http://www.chiark.greenend.org.uk/~sgtatham/doit/
+  - xclip
+  - xsel (newer alternative to xclip)
+  - pbcopy/pbpaste (Mac OS X)
+  - lemonade (for SSH) https://github.com/pocke/lemonade
+  - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
 
 The presence of a suitable clipboard tool implicitly enables the '+' and '*'
 registers.
@@ -39,7 +37,7 @@ following option:
 See 'clipboard' for details and more options.
 
 ==============================================================================
-2. X11 selection mechanism		      *nvim-clipboard-x11* *x11-selection*
+2. X11 selection mechanism			   *clipboard-x11* *x11-selection*
 
 The clipboard providers for X11 store text in what is known as "selections".
 Selections are "owned" by an application, so when the application is closed,

runtime/doc/nvim_from_vim.txt

@@ -16,8 +16,8 @@ it:
     ln -s ~/.vim $XDG_CONFIG_HOME/nvim
     ln -s ~/.vimrc $XDG_CONFIG_HOME/nvim/init.vim
 <
-See |nvim-intro|, especially |nvim-python| and |nvim-clipboard|, for
-additional software you might need to install to use all of Nvim's features.
+See |nvim-intro|, especially |nvim-python| and |clipboard|, for additional
+software you might need to install to use all of Nvim's features.
 
 Your Vim configuration might not be entirely compatible with Nvim. For a
 full list of differences between Vim and Nvim, see |vim-differences|.

runtime/doc/nvim_provider.txt

@@ -6,11 +6,10 @@
 
 Nvim provider infrastructure			       *nvim-provider*
 
-This document is written for developers. If you are a normal user or plugin
-developer looking to learn about Nvim |rpc| infrastructure for implementing
-plugins in other programming languages, see |remote-plugin|.
-For instructions on how to enable Python plugins, see |nvim-python|. For
-clipboard, see |nvim-clipboard|.
+This document is for developers. If you are a normal user or plugin developer
+looking to learn about Nvim |rpc| for implementing plugins in other
+programming languages, see |remote-plugin|. For instructions on how to enable
+Python plugins, see |nvim-python|. For clipboard, see |clipboard|.
 
 Instead of doing everything by itself, Nvim aims to simplify its own
 maintenance by delegating as much work as possible to external systems. But

runtime/doc/options.txt

@@ -1353,7 +1353,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			used regardless of whether "unnamed" is in 'clipboard'
 			or not.  The clipboard register can always be
 			explicitly accessed using the "* notation.  Also see
-			|gui-clipboard|.
+			|clipboard|.
 
 						*clipboard-unnamedplus*
 	unnamedplus	A variant of the "unnamed" flag which uses the
@@ -1363,7 +1363,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			register.  When "unnamed" is also included to the
 			option, yank and delete operations (but not put)
 			will additionally copy the text into register
-			'*'. See |nvim-clipboard|.
+			'*'. See |clipboard|.
 
 						*clipboard-autoselect*
 	autoselect	Works like the 'a' flag in 'guioptions': If present,