--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -576,7 +576,7 @@ There are many functions.  We will menti
 used for.  You can find an alphabetical list here: |functions|.  Use CTRL-] on
 the function name to jump to detailed help on it.
 
-String manipulation:
+String manipulation:					*string-functions*
 	nr2char()		get a character by its ASCII value
 	char2nr()		get ASCII value of a character
 	str2nr()		convert a string to a Number
@@ -605,7 +605,7 @@ String manipulation:
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
 
-List manipulation:
+List manipulation:					*list-functions*
 	get()			get an item without error for wrong index
 	len()			number of items in a List
 	empty()			check if List is empty
@@ -630,7 +630,7 @@ List manipulation:
 	count()			count number of times a value appears in a List
 	repeat()		repeat a List multiple times
 
-Dictionary manipulation:
+Dictionary manipulation:				*dict-functions*
 	get()			get an entry without an error for a wrong key
 	len()			number of entries in a Dictionary
 	has_key()		check whether a key appears in a Dictionary
@@ -649,7 +649,7 @@ Dictionary manipulation:
 	min()			minimum value in a Dictionary
 	count()			count number of times a value appears
 
-Floating point computation:
+Floating point computation:				*float-functions*
 	float2nr()		convert Float to Number
 	abs()			absolute value (also works for Number)
 	round()			round off
@@ -663,7 +663,7 @@ Floating point computation:
 	cos()			cosine
 	atan()			arc tangent
 
-Variables:
+Variables:						*var-functions*
 	type()			type of a variable
 	islocked()		check if a variable is locked
 	function()		get a Funcref for a function name
@@ -677,7 +677,7 @@ Variables:
 	settabwinvar()		set a variable in a specific window & tab page
 	garbagecollect()	possibly free memory
 
-Cursor and mark position:
+Cursor and mark position:		*cursor-functions* *mark-functions*
 	col()			column number of the cursor or a mark
 	virtcol()		screen column of the cursor or a mark
 	line()			line number of the cursor or mark
@@ -690,7 +690,7 @@ Cursor and mark position:
 	line2byte()		byte count at a specific line
 	diff_filler()		get the number of filler lines above a line
 
-Working with text in the current buffer:
+Working with text in the current buffer:		*text-functions*
 	getline()		get a line or list of lines from the buffer
 	setline()		replace a line in the buffer
 	append()		append line or list of lines in the buffer
@@ -705,6 +705,7 @@ Working with text in the current buffer:
 	searchpairpos()		find the other end of a start/skip/end
 	searchdecl()		search for the declaration of a name
 
+					*system-functions* *file-functions*
 System functions and manipulation of files:
 	glob()			expand wildcards
 	globpath()		expand wildcards in a number of directories
@@ -732,13 +733,14 @@ System functions and manipulation of fil
 	readfile()		read a file into a List of lines
 	writefile()		write a List of lines into a file
 
-Date and Time:
+Date and Time:				*date-functions* *time-functions*
 	getftime()		get last modification time of a file
 	localtime()		get current time in seconds
 	strftime()		convert time to a string
 	reltime()		get the current or elapsed time accurately
 	reltimestr()		convert reltime() result to a string
 
+			*buffer-functions* *window-functions* *arg-functions*
 Buffers, windows and the argument list:
 	argc()			number of entries in the argument list
 	argidx()		current position in the argument list
@@ -756,32 +758,32 @@ Buffers, windows and the argument list:
 	winbufnr()		get the buffer number of a specific window
 	getbufline()		get a list of lines from the specified buffer
 
-Command line:
+Command line:					*command-line-functions*
 	getcmdline()		get the current command line
 	getcmdpos()		get position of the cursor in the command line
 	setcmdpos()		set position of the cursor in the command line
 	getcmdtype()		return the current command-line type
 
-Quickfix and location lists:
+Quickfix and location lists:			*quickfix-functions*
 	getqflist()		list of quickfix errors
 	setqflist()		modify a quickfix list
 	getloclist()		list of location list items
 	setloclist()		modify a location list
 
-Insert mode completion:
+Insert mode completion:				*completion-functions*
 	complete()		set found matches
 	complete_add()		add to found matches
 	complete_check()	check if completion should be aborted
 	pumvisible()		check if the popup menu is displayed
 
-Folding:
+Folding:					*folding-functions*
 	foldclosed()		check for a closed fold at a specific line
 	foldclosedend()		like foldclosed() but return the last line
 	foldlevel()		check for the fold level at a specific line
 	foldtext()		generate the line displayed for a closed fold
 	foldtextresult()	get the text displayed for a closed fold
 
-Syntax and highlighting:
+Syntax and highlighting:	  *syntax-functions* *highlighting-functions*
 	clearmatches()		clear all matches defined by |matchadd()| and
 				the |:match| commands
 	getmatches()		get all matches defined by |matchadd()| and
@@ -799,18 +801,18 @@ Syntax and highlighting:
 	setmatches()		restore a list of matches saved by
 				|getmatches()|
 
-Spelling:
+Spelling:					*spell-functions*
 	spellbadword()		locate badly spelled word at or after cursor
 	spellsuggest()		return suggested spelling corrections
 	soundfold()		return the sound-a-like equivalent of a word
 
-History:
+History:					*history-functions*
 	histadd()		add an item to a history
 	histdel()		delete an item from a history
 	histget()		get an item from a history
 	histnr()		get highest index of a history list
 
-Interactive:
+Interactive:					*interactive-functions*
 	browse()		put up a file requester
 	browsedir()		put up a directory requester
 	confirm()		let the user make a choice
@@ -824,12 +826,12 @@ Interactive:
 	inputsave()		save and clear typeahead
 	inputrestore()		restore typeahead
 
-GUI:
+GUI:						*gui-functions*
 	getfontname()		get name of current font being used
 	getwinposx()		X position of the GUI Vim window
 	getwinposy()		Y position of the GUI Vim window
 
-Vim server:
+Vim server:					*server-functions*
 	serverlist()		return the list of server names
 	remote_send()		send command characters to a Vim server
 	remote_expr()		evaluate an expression in a Vim server
@@ -839,14 +841,14 @@ Vim server:
 	foreground()		move the Vim window to the foreground
 	remote_foreground()	move the Vim server window to the foreground
 
-Window size and position:
+Window size and position:			*window-size-functions*
 	winheight()		get height of a specific window
 	winwidth()		get width of a specific window
 	winrestcmd()		return command to restore window sizes
 	winsaveview()		get view of current window
 	winrestview()		restore saved view of current window
 
-Various:
+Various:					*various-functions*
 	mode()			get current editing mode
 	visualmode()		last visual mode used
 	hasmapto()		check if a mapping exists