merge from trunk

3 files changed, 11 insertions, 5 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f7e607f03cf..f94db60f25f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-17  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * text.texi (Enriched Justification): Minor fixes.
+
 2013-08-14  Xue Fuqiao  <xfq.free@gmail.com>
 
         * files.texi (Filesets): Add an index.
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index d50a841d509..e5743b064fb 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2255,6 +2255,7 @@ Prefix}.
 
 @node Enriched Justification
 @subsection Justification in Enriched Text
+@cindex justification style
 
   In Enriched mode, you can use the following commands to specify
 various @dfn{justification styles} for filling.  These commands apply
@@ -2293,13 +2294,13 @@ commands do nothing on text with this setting.  You can, however,
 still indent the left margin.
 @end table
 
+@c FIXME: We should explain the effect of these symbols.  --xfq
 @vindex default-justification
   You can also specify justification styles using the Justification
-submenu in the Text Properties menu.
-  The default justification style is specified by the per-buffer
-variable @code{default-justification}.  Its value should be one of the
-symbols @code{left}, @code{right}, @code{full}, @code{center}, or
-@code{none}.
+submenu in the Text Properties menu.  The default justification style
+is specified by the per-buffer variable @code{default-justification}.
+Its value should be one of the symbols @code{left}, @code{right},
+@code{full}, @code{center}, or @code{none}.
 
 @node Enriched Properties
 @subsection Setting Other Text Properties
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index a1ab35bab06..6205d10ce1b 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1499,6 +1499,7 @@ the header lines.  If @var{citation-regexp} is a string, it is used as
 a regular expression; if it matches the beginning of a line, that line
 is treated as a citation marker.
 
+@c FIXME: "That mode" is confusing.  It isn't a major/minor mode.
 Ordinarily, @code{fill-individual-paragraphs} regards each change in
 indentation as starting a new paragraph.  If
 @code{fill-individual-varying-indent} is non-@code{nil}, then only