From b056523706074c81f3802c537d2e0b5e254c4d02 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Tue, 17 Nov 2009 15:25:15 +0000
Subject: [PATCH] r32063 for branch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@32064 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/doc/Customization.lyx | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 8bfa4ff1cd..ad9a98903d 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1,4 +1,4 @@
-#LyX 1.6.4svn created this file. For more info see http://www.lyx.org/
+#LyX 1.6.5svn created this file. For more info see http://www.lyx.org/
 \lyxformat 345
 \begin_document
 \begin_header
@@ -13042,6 +13042,34 @@ no_bar
 
 .
  Each of these turns on or off the corresponding attribute.
+\begin_inset Newline newline
+\end_inset
+
+For example, 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+emph
+\end_layout
+
+\end_inset
+
+ turns on emphasis, and no_emph turns it off.
+ If the latter seems puzzling, remember that the font settings for the present
+ context are generally inherited from the surrounding context.
+ So 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+no_emph
+\end_layout
+
+\end_inset
+
+ would turn off the emphasis that was anyway in effect, say, in a theorem
+ environment.
 \end_layout
 
 \begin_layout Description