Improved documentation for tip-496. Compiles, but there is still an issue regarding cross-linking to ttk_entry.n

4 files changed, 17 insertions, 15 deletions

diff --git a/doc/entry.n b/doc/entry.n
index 7e52327..4557936 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -37,12 +37,12 @@ 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 an help text to display if no text is otherwise displayed.
-The displayed text will be displayed using the \fB\-font\fR and
-\fB\-justify\fR options.
+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 normal placeholder foreground color
+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
diff --git a/doc/spinbox.n b/doc/spinbox.n
index e826713..00fed89 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -68,12 +68,12 @@ A floating-point value specifying the increment.  When used with
 \fB\-increment\fR when a spin button is pressed (up adds the value,
 down subtracts the value).
 .OP \-placeholder placeHolder PlaceHolder
-Specifies an help text to display if no text is otherwise displayed.
-The displayed text will be displayed using the \fB\-font\fR and
-\fB\-justify\fR options.
+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 normal placeholder foreground color
+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
diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index dad2e8b..c26b4ec 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -20,6 +20,7 @@ values in the list.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
 \-style
+.SE
 .SO ttk_entry
 \-placeholder
 .SE
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 343d2f4..45b7804 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -44,14 +44,15 @@ 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
-.OP \-placeholder placeHolder PlaceHolder
-Specifies an help text to display if no text is otherwise displayed.
-The displayed text will be displayed using the \fB\-font\fR and
-\fB\-justify\fR options. The foreground color of the displayed text
-can be changed using the \fB\-placeholderforeground\fR style option.
 .OP \-show show Show
 If this option is specified, then the true contents of the entry
 are not displayed in the window.