From 0332e90ed15528998f44ca91456e6a6f99da2620 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 20 Mar 2012 01:26:55 +0100
Subject: [PATCH] - lyx2lyx/lyx_2_1.py: remove wrong info (was a copy/paste
 mistake) - GuiTabular.cpp: fix a comment

---
 lib/lyx2lyx/lyx_2_1.py           | 2 --
 src/frontends/qt4/GuiTabular.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index fdab927b34..1c7f781250 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -581,7 +581,6 @@ def revert_cell_rotation(document):
   try:
     while True:
       # first, let's find out if we need to do anything
-      # cell type 3 is multirow begin cell
       i = find_token(document.body, '<cell ', i)
       if i == -1:
         return
@@ -620,7 +619,6 @@ def convert_cell_rotation(document):
     i = 0
     while True:
       # first, let's find out if we need to do anything
-      # cell type 3 is multirow begin cell
       i = find_token(document.body, '<cell ', i)
       if i == -1:
         return
diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 0fe74e906f..8e9d7a4afe 100644
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -449,7 +449,7 @@ docstring GuiTabular::dialogToParams() const
 
 	// apply the column alignment
 	// multirows inherit the alignment from the column; if a column width
-	// is set, multicolumns are always left-aligned so that in this case
+	// is set, multirows are always left-aligned so that in this case
 	// its alignment must not be applied (see bug #8084)
 	if (!(multirowCB->isChecked() && width != "0pt"))
 		setHAlign(param_str);
-- 
2.39.2