diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 7c82d0b33c..0a0108ee0c 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -1,5 +1,5 @@
 #LyX 2.0.0svn created this file. For more info see http://www.lyx.org/
-\lyxformat 407
+\lyxformat 410
 \begin_document
 \begin_header
 \textclass scrbook
@@ -74,7 +74,7 @@ End
 \font_sans default
 \font_typewriter default
 \font_default_family default
-\use_xetex false
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
@@ -6742,6 +6742,46 @@ ip
  page of the file --- Evince or xpdf --- for these cases you can use external
  call of synctex.
  Please study the prepared examples in the Preferences dialog.
+ The values replaced in the setting: 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+$$n
+\end_layout
+
+\end_inset
+
+ for row number, 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+$$t
+\end_layout
+
+\end_inset
+
+ for exported temporary .tex file, 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+$$o
+\end_layout
+
+\end_inset
+
+ exported output file (either dvi or pdf, depending on which one exists
+ in the temp dir).
+ 
+\end_layout
+
+\begin_layout Standard
+When viewing, LyX dynamically choose proper preview format based on the
+ presence of .dvi or .pdf file in the temporary directory (i.e.
+ what format have you used for viewing this particular document).
+ 
 \end_layout
 
 \begin_layout Chapter
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 179bf3a2a9..e25eb78294 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -2828,16 +2828,11 @@ void LyXAction::init()
 		{ LFUN_SERVER_GOTO_FILE_ROW, "server-goto-file-row", ReadOnly | NoBuffer, System },
 /*!
  * \var lyx::FuncCode lyx::LFUN_FORWARD_SEARCH
- * \li Action: Sets the cursor position in the previewed (e.g. dvi) file based on the row
+ * \li Action: Sets the cursor position in the previewed (dvi/pdf) file based on the row
                number in LyX window.
  * \li Notion: The external program used for forward search call can be specified in
-               \forward_search_dvi and \forward_search_pdf RC settings.
-               By default, the value for pdf is empty, while for dvi it is\n
-               "xdvi -sourceposition $$n:$$t $$o"\n
-               The values replaced in the call: $$n for row number, $$t for
-               exported temporary .tex file, $$o exported output file, either
-               dvi or pdf, depending on which one exists in the temp dir
-               (preferred is dvi).
+               LyX Output preferences. See Additional manual for details of these
+	       settings.
  * \li Syntax: forward-search
  * \li Origin: sanda, 14 Apr 2010
  * \endvar