merge trunk

5 files changed, 14 insertions, 12 deletions

diff --git a/doc/3DBorder.3 b/doc/3DBorder.3
index 0bc41d0..a6deb30 100644
--- a/doc/3DBorder.3
+++ b/doc/3DBorder.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_Alloc3DBorderFromObj, Tk_ClipDrawableToRect, Tk_DrawHighlightBorder, Tk_Get3DBorder, fBTk_Get3DBorderColors, Tk_Get3DBorderFromObj, Tk_Draw3DRectangle, Tk_Fill3DRectangle, Tk_Draw3DPolygon, Tk_Fill3DPolygon, Tk_3DVerticalBevel, Tk_3DHorizontalBevel, Tk_SetBackgroundFromBorder, Tk_NameOf3DBorder, Tk_3DBorderColor, Tk_3DBorderGC, Tk_Free3DBorderFromObj, Tk_Free3DBorder \- draw borders with three-dimensional appearance
+Tk_Alloc3DBorderFromObj, Tk_ClipDrawableToRect, Tk_DrawHighlightBorder, Tk_Get3DBorder, Tk_Get3DBorderColors, Tk_Get3DBorderFromObj, Tk_Draw3DRectangle, Tk_Fill3DRectangle, Tk_Draw3DPolygon, Tk_Fill3DPolygon, Tk_3DVerticalBevel, Tk_3DHorizontalBevel, Tk_SetBackgroundFromBorder, Tk_NameOf3DBorder, Tk_3DBorderColor, Tk_3DBorderGC, Tk_Free3DBorderFromObj, Tk_Free3DBorder \- draw borders with three-dimensional appearance
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
diff --git a/doc/AddOption.3 b/doc/AddOption.3
index a331455..fc46492 100644
--- a/doc/AddOption.3
+++ b/doc/AddOption.3
@@ -14,7 +14,7 @@ Tk_AddOption \- Add an option to the option database
 void
 \fBTk_AddOption\fR(\fItkwin, name, value, priority\fR)
 .sp
-void
+Tcl_Obj *
 \fBTk_GetSystemDefault\fR(\fItkwin, dbName, className\fR)
 .SH ARGUMENTS
 .AP Tk_Window tkwin in
@@ -40,20 +40,22 @@ classes separated by asterisks or dots, in the usual X format.
 this value will be returned in calls to \fBTk_GetOption\fR.
 \fIPriority\fR specifies the priority of the value; when options are
 queried using \fBTk_GetOption\fR, the value with the highest priority
-is returned.  \fIPriority\fR must be between 0 and \fBTK_MAX_PRIO\fR.  Some
-common priority values are:
-.IP 20
+is returned.  \fIPriority\fR must be between 0 and \fBTK_MAX_PRIO\fR (100).
+Some common priority values are:
+.IP \fBTK_WIDGET_DEFAULT_PRIO\fR (20)
 Used for default values hard-coded into widgets.
-.IP 40
+.IP \fBTK_STARTUP_FILE_PRIO\fR (40)
 Used for options specified in application-specific startup files.
-.IP 60
+.IP \fBTK_USER_DEFAULT_PRIO\fR (60)
 Used for options specified in user-specific defaults files, such as
 \fB.Xdefaults\fR, resource databases loaded into the X server, or
 user-specific startup files.
-.IP 80
+.IP \fBTK_INTERACTIVE_PRIO\fR (80)
 Used for options specified interactively after the application starts
 running.
-\fBTk_GetSystemDefault\fR return a Tk_Uid string representation of the given \fIdbname\fR and \fIclassName\fR of a configuration option.
+.PP
+\fBTk_GetSystemDefault\fR returns a Tcl_Obj* with the string identifying
+a configuration option matching the given \fIdbname\fR and \fIclassName\fR.
 Returns NULL if there are no system defaults that match this pair.
 .SH KEYWORDS
 class, name, option, add
diff --git a/macosx/tkMacOSXConfig.c b/macosx/tkMacOSXConfig.c
index cf90577..a85c6a9 100644
--- a/macosx/tkMacOSXConfig.c
+++ b/macosx/tkMacOSXConfig.c
@@ -23,7 +23,7 @@
  *	return a string representation of the option.
  *
  * Results:
- *	Returns a Tk_Uid that is the string identifier that identifies
+ *	Returns a Tcl_Obj* with the string identifier that identifies
  *	this option. Returns NULL if there are no system defaults
  *	that match this pair.
  *
diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c
index 3a5aed1..055c004 100644
--- a/unix/tkUnixConfig.c
+++ b/unix/tkUnixConfig.c
@@ -22,7 +22,7 @@
  *	string representation of the option.
  *
  * Results:
- *	Returns a Tk_Uid that is the string identifier that identifies this
+ *	Returns a Tcl_Obj* with the string identifier that identifies this
  *	option. Returns NULL if there are no system defaults that match this
  *	pair.
  *
diff --git a/win/tkWinConfig.c b/win/tkWinConfig.c
index ab0bb5f..e2f8ac1 100644
--- a/win/tkWinConfig.c
+++ b/win/tkWinConfig.c
@@ -22,7 +22,7 @@
  *	string representation of the option.
  *
  * Results:
- *	Returns a Tk_Uid that is the string identifier that identifies this
+ *	Returns a Tcl_Obj* with the string identifier that identifies this
  *	option. Returns NULL if there are no system defaults that match this
  *	pair.
  *