commit cc241bdaaf0f63daf5e1afb4d8623a2f075943e5
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Fri Sep 25 18:14:53 2015 +0200
Repeat after me: into account, into account, into account
diff --git a/development/attic/changelogs/ChangeLog-1.txt
b/development/attic/changelogs/ChangeLog-1.txt
index 89d6eb6..bd63d66 100644
--- a/development/attic/changelogs/ChangeLog-1.txt
+++ b/development/attic/changelogs/ChangeLog-1.txt
@@ -12035,7 +12035,7 @@
* src/Makefile.am (lyx_DEPENDENCIES): give the explicit object
file name in insets and mathed directories (otherwise the
- dependency is not taken in account under cygwin).
+ dependency is not taken into account under cygwin).
* src/text2.C (InsertString[AB]): make sure that we do not try to
read characters past the string length.
diff --git a/development/attic/changelogs/ChangeLog-src.txt
b/development/attic/changelogs/ChangeLog-src.txt
index fb35839..dc2c1ae 100644
--- a/development/attic/changelogs/ChangeLog-src.txt
+++ b/development/attic/changelogs/ChangeLog-src.txt
@@ -822,7 +822,7 @@
* buffer_funcs.C (getItemDepth): renamed from incrementItemDepth
and changed to just return the value of the item depth; take a
ParIterator as argument; take the itemdepth at outer nesting level
- in account if necessary; cleanup and comment the code.
+ into account if necessary; cleanup and comment the code.
(resetEnumCounterNeeded): renamed from resetEnumCounterIfNeeded
and changed to just return true if reset is needed; take a
ParIterator as argument; cleanup and comment the code.
@@ -13899,7 +13899,7 @@
2002-03-05 Jos�Ab�io Oliveira Matos <[email protected]>
- * buffer.C (makeLinuxDocFile, makeDocBookFile): take in account the
+ * buffer.C (makeLinuxDocFile, makeDocBookFile): take into account the
final location of file, for the included files, and graphics.
2002-03-05 Juergen Vigna <[email protected]>
@@ -16658,7 +16658,7 @@
* text2.C (insertInset):
* paragraph.C (insetAllowed):
- * BufferView_pimpl.C (insertInset): update to take in account the
+ * BufferView_pimpl.C (insertInset): update to take into account the
renaming of insertInsetAllowed
* lyxfunc.C (getStatus): add support for LFUN_INSET_TOGGLE.
diff --git a/development/attic/changelogs/OLD-CHANGES
b/development/attic/changelogs/OLD-CHANGES
index 36add72..1335ed1 100644
--- a/development/attic/changelogs/OLD-CHANGES
+++ b/development/attic/changelogs/OLD-CHANGES
@@ -891,7 +891,7 @@ since 0.12.0pre7
- fixlets to the documentations (JMarc)
- added close handler to table_options forms (JMarc)
- fixed the LaTeX output routines so that the length of insets is
- taken in account (JMarc)
+ taken into account (JMarc)
- Changed the double keystroke deadkey behavior (alkis)
- Updated de.po (Peter)
- Small changes to AdvancedEdit (section aapaper) (Peter)
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2faf7aa..625be3a 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -986,7 +986,7 @@ void BufferView::updateDocumentClass(DocumentClassConstPtr
olddc)
}
-/** Return the change status at cursor position, taking in account the
+/** Return the change status at cursor position, taking into account the
* status at each level of the document iterator (a table in a deleted
* footnote is deleted).
* When \param outer is true, the top slice is not looked at.
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index c21e967..cd6e227 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -1448,7 +1448,7 @@ int TextMetrics::cursorX(CursorSlice const & sl,
for ( ; cit != row.end() ; ++cit) {
/** Look whether the cursor is inside the element's
* span. Note that it is necessary to take the
- * boundary in account, and to accept virtual
+ * boundary into account, and to accept virtual
* elements, which have pos == endpos.
*/
if (pos + boundary_corr >= cit->pos
diff --git a/src/Undo.h b/src/Undo.h
index bacce03..59f3ca4 100644
--- a/src/Undo.h
+++ b/src/Undo.h
@@ -88,7 +88,7 @@ public:
/**
* This cursor takes precedence over what is passed to recordUndo.
* In the case of nested groups, only the first cur_before is
- * taken in account. The cursor is reset at the end of the
+ * taken into account. The cursor is reset at the end of the
* top-level group.
*/
void beginUndoGroup(CursorData const & cur_before);
