7 files changed, 22 insertions, 29 deletions
diff --git a/doc/entry.n b/doc/entry.n
index 4557936..abbf53d 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -23,6 +23,7 @@ entry \- Create and manipulate 'entry' one-line text entry widgets
 \-foreground	\-insertwidth	\-xscrollcommand
 \-highlightbackground	\-justify
 \-highlightcolor	\-relief
+\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-disabledbackground disabledBackground DisabledBackground
@@ -36,14 +37,6 @@ Specifies a script to eval when \fB\-validatecommand\fR returns 0.
 Setting it to {} disables this feature (the default).  The best use
 of this option is to set it to \fIbell\fR.  See \fBVALIDATION\fR
 below for more information.
-.OP \-placeholder placeHolder PlaceHolder
-Specifies a help text string to display if no text is otherwise displayed,
-that is when the widget is empty. The placeholder text is displayed using
-the values of the \fB\-font\fR and \fB\-justify\fR options.
-.OP \-placeholderforeground placeholderForeground PlaceholderForeground
-Specifies the foreground color to use when the placeholder text is
-displayed. If this option is the empty string, the default color gray70
-is used.
 .OP \-readonlybackground readonlyBackground ReadonlyBackground
 Specifies the background color to use when the entry is readonly.  If
 this option is the empty string, the normal background color is used.
diff --git a/doc/options.n b/doc/options.n
index 738a1c6..ec4884e 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -221,6 +221,14 @@ internal space above and/or below what it displays inside.
 Most widgets only use this option for padding text:  if they are
 displaying a bitmap or image, then they usually ignore padding
 options.
+.OP \-placeholder placeHolder PlaceHolder
+Specifies a help text string to display if no text is otherwise displayed,
+that is when the widget is empty. The placeholder text is displayed using
+the values of the \fB\-font\fR and \fB\-justify\fR options.
+.OP \-placeholderforeground placeholderForeground PlaceholderForeground
+Specifies the foreground color to use when the placeholder text is
+displayed. If this option is the empty string, the default color gray70
+is used.
 .OP \-relief relief Relief
 Specifies the 3-D effect desired for the widget.  Acceptable
 values are \fBraised\fR, \fBsunken\fR, \fBflat\fR, \fBridge\fR,
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 00fed89..f2b1ff2 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -23,6 +23,7 @@ spinbox \- Create and manipulate 'spinbox' value spinner widgets
 \-foreground	\-justify	\-xscrollcommand
 \-highlightbackground	\-relief
 \-highlightcolor	\-repeatdelay
+\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-buttonbackground buttonBackground Background
@@ -67,14 +68,6 @@ A floating-point value specifying the increment.  When used with
 \fB\-from\fR and \fB\-to\fR, the value in the widget will be adjusted by
 \fB\-increment\fR when a spin button is pressed (up adds the value,
 down subtracts the value).
-.OP \-placeholder placeHolder PlaceHolder
-Specifies a help text string to display if no text is otherwise displayed,
-that is when the widget is empty. The placeholder text is displayed using
-the values of the \fB\-font\fR and \fB\-justify\fR options.
-.OP \-placeholderforeground placeholderForeground PlaceholderForeground
-Specifies the foreground color to use when the placeholder text is
-displayed. If this option is the empty string, the default color gray70
-is used.
 .OP \-readonlybackground readonlyBackground ReadonlyBackground
 Specifies the background color to use when the spinbox is readonly.  If
 this option is the empty string, the normal background color is used.
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index c26b4ec..c9353f3 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -19,10 +19,7 @@ the user may select the value of the text field from among the
 values in the list.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
-\-style
-.SE
-.SO ttk_entry
-\-placeholder
+\-style	\-placeholder
 .SE
 .\" ALSO: Other entry widget options
 .SH "WIDGET-SPECIFIC OPTIONS"
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 45b7804..8497a05 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -26,7 +26,7 @@ standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 \-class	\-cursor
 \-font	\-foreground
 \-style
-\-takefocus	\-xscrollcommand
+\-takefocus	\-xscrollcommand	\-placeholder
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
@@ -44,12 +44,6 @@ See \fBVALIDATION\fR below for more information.
 .OP \-justify justify Justify
 Specifies how the text is aligned within the entry widget.
 One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
-.OP \-placeholder placeHolder PlaceHolder
-Specifies a help text string to display if no text is otherwise displayed,
-that is when the widget is empty. The placeholder text is displayed using
-the values of the \fB\-font\fR and \fB\-justify\fR options. The foreground
-color of the placeholder text can be changed using the
-\fB\-placeholderforeground\fR style option.
 .\" MAYBE: .OP \-selectbackground selectBackground Foreground
 .\" MAYBE: .OP \-selectborderwidth selectBorderWidth BorderWidth
 .\" MAYBE: .OP \-selectforeground selectForeground Background
diff --git a/doc/ttk_spinbox.n b/doc/ttk_spinbox.n
index fec726c..925a8df 100644
--- a/doc/ttk_spinbox.n
+++ b/doc/ttk_spinbox.n
@@ -22,10 +22,10 @@ of the \fBttk::entry\fR widget including support of the
 to a Tcl variable.
 .SO ttk_widget
 \-class	\-cursor	\-state	\-style
-\-takefocus	\-xscrollcommand
+\-takefocus	\-xscrollcommand	\-placeholder
 .SE
 .SO ttk_entry
-\-placeholder	\-validate	\-validatecommand
+\-validate	\-validatecommand
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 3ba8df8..9e9f3db 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -148,6 +148,14 @@ acceptable to \fBTk_GetPixels\fR. If this option is less than or equal
 to zero, then automatic wrapping is not performed; otherwise
 the text is split into lines such that no line is longer
 than the specified value.
+.SH "ENTRY OPTIONS"
+The following option is supported by entry, spinbox and combobox:
+.OP \-placeholder placeHolder PlaceHolder
+Specifies a help text string to display if no text is otherwise displayed,
+that is when the widget is empty. The placeholder text is displayed using
+the values of the \fB\-font\fR and \fB\-justify\fR options. The foreground
+color of the placeholder text can be changed using the
+\fB\-placeholderforeground\fR style option.
 .SH "COMPATIBILITY OPTIONS"
 This option is only available for themed widgets that have
 .QW corresponding