diff --git a/Doc/lib/libtemplate.tex b/Doc/lib/libtemplate.tex
index a4fae281793..2e56c4710fe 100644
--- a/Doc/lib/libtemplate.tex
+++ b/Doc/lib/libtemplate.tex
@@ -5,7 +5,10 @@
 % ==== 1. ====
 % Choose one of the following section headers and index entries;
 % \section{} generates the section header,
-% \bimodindex{} or \stmodundex{} generates an index entry for this module.
+% \bimodindex{} or \stmodindex{} generates an index entry for this
+% module.  Note that these should only be used for the defining entry
+% for the module.  Other references to the module should use
+% \refbimodindex{} or \refstmodindex{}.
 % The \label{module-spam} line is for the \seealso{} command.
 
 \section{Built-in Module \sectcode{spam}}	% If implemented in C
diff --git a/Doc/libtemplate.tex b/Doc/libtemplate.tex
index a4fae281793..2e56c4710fe 100644
--- a/Doc/libtemplate.tex
+++ b/Doc/libtemplate.tex
@@ -5,7 +5,10 @@
 % ==== 1. ====
 % Choose one of the following section headers and index entries;
 % \section{} generates the section header,
-% \bimodindex{} or \stmodundex{} generates an index entry for this module.
+% \bimodindex{} or \stmodindex{} generates an index entry for this
+% module.  Note that these should only be used for the defining entry
+% for the module.  Other references to the module should use
+% \refbimodindex{} or \refstmodindex{}.
 % The \label{module-spam} line is for the \seealso{} command.
 
 \section{Built-in Module \sectcode{spam}}	% If implemented in C
diff --git a/Doc/templates/module.tex b/Doc/templates/module.tex
index a4fae281793..2e56c4710fe 100644
--- a/Doc/templates/module.tex
+++ b/Doc/templates/module.tex
@@ -5,7 +5,10 @@
 % ==== 1. ====
 % Choose one of the following section headers and index entries;
 % \section{} generates the section header,
-% \bimodindex{} or \stmodundex{} generates an index entry for this module.
+% \bimodindex{} or \stmodindex{} generates an index entry for this
+% module.  Note that these should only be used for the defining entry
+% for the module.  Other references to the module should use
+% \refbimodindex{} or \refstmodindex{}.
 % The \label{module-spam} line is for the \seealso{} command.
 
 \section{Built-in Module \sectcode{spam}}	% If implemented in C