summaryrefslogtreecommitdiffstats
path: root/generic/tclBasic.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-31 12:42:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-31 12:42:36 (GMT)
commit9cb408090e79c6325997567369d81e192eeb6c51 (patch)
tree3cc46f62dcef1daf0a273ee2391d8e9b6f4a0931 /generic/tclBasic.c
parent4047fa1ba88c8264976adce71c088921ec49c0e6 (diff)
parent30fd8c842c97d0977b8ef7a4f4ee8528d260f6f2 (diff)
downloadtcl-9cb408090e79c6325997567369d81e192eeb6c51.zip
tcl-9cb408090e79c6325997567369d81e192eeb6c51.tar.gz
tcl-9cb408090e79c6325997567369d81e192eeb6c51.tar.bz2
Merge 8.6. More documentation updates
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r--generic/tclBasic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 2b1bae9..24440dc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4321,7 +4321,7 @@ TclResetCancellation(
* Tcl_Canceled --
*
* Check if the script in progress has been canceled, i.e.,
- * Tcl_CancelEval was called for this interpreter or any of its master
+ * Tcl_CancelEval was called for this interpreter or any of its parent
* interpreters.
*
* Results: