X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.cpp;h=8b13630d8688552b990ad00f5d158f1dc8b2b2c8;hb=5887601f6836ebf6f2b16cc7587a98cc3aa6c391;hp=3e1e023550882fbfc8aa1c1d1b6a4f594439f13c;hpb=e648202e7e35b41851407de449ec454c9b38e68b;p=lyx.git

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 3e1e023550..8b13630d86 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -2386,9 +2386,9 @@ void LyXAction::init()
 /*!
  * \var lyx::FuncCode lyx::LFUN_LAYOUT
  * \li Action: Sets the layout (that is, environment) for the current paragraph.
- * \li Syntax: layout <LAYOUT> [ignorenests]
+ * \li Syntax: layout <LAYOUT> [ignoreautonests]
  * \li Params: <LAYOUT>: the layout to use\n
-               ignorenests: If specified, nesting advices will be ignored.
+               ignoreautonests: If specified, nesting advices will be ignored.
  * \endvar
  */
 		{ LFUN_LAYOUT, "layout", Noop, Layout },
@@ -2399,9 +2399,9 @@ void LyXAction::init()
  * \li Notion: Contrary to `layout', this function resets the current
  *             (or selection) layout to the standard layout it already has the
  *             correct layout. Useful for toolbar icons.
- * \li Syntax: layout-toggle <LAYOUT> [ignorenests]
+ * \li Syntax: layout-toggle <LAYOUT> [ignoreautonests]
  * \li Params: <LAYOUT>: the layout to toggle\n
-               ignorenests: If specified, nesting advices will be ignored.
+               ignoreautonests: If specified, nesting advices will be ignored.
  * \li Origin: lasgouttes, 14 May 2018
  * \endvar
  */
@@ -4490,9 +4490,9 @@ LyXAction::LyXAction()
 }
 
 
-FuncRequest LyXAction::lookupFunc(string const & func) const
+FuncRequest LyXAction::lookupFunc(string const & func_name) const
 {
-	string const func2 = trim(func);
+	string const func2 = trim(func_name);
 
 	if (func2.empty())
 		return FuncRequest(LFUN_NOACTION);