4 files changed, 13 insertions, 13 deletions
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 160c4bad9..4f167afbc 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -211,9 +211,9 @@
    One was in SCXX, PWONumber.h - ouch and apologies (jcw).  Changed
    comparison logic in mk4too.cpp (64-bit ints, new code).
 
-2003-02-28    Fixed relaxed layout in Mk4tcl, several Mk4py fixes
+2003-02-28    Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
 
-   Use list operators to convert a Tcl layout to MK format.  This used
+   Use list operators to convert a Tcl tqlayout to MK format.  This used
    to crash, Tcl test 6.7 added to verify the fix.  Changed test 3.1 to
    use a different notation for nested defs (^).
 
@@ -605,13 +605,13 @@
    c4_Storage::SaveTo function, memo's would sometimes not be written,
    leading to a *damaged* datafile (and incorrect free-space tracking).
 
-2002-03-15    Better configure logic, "mk::view layout" fix
+2002-03-15    Better configure logic, "mk::view tqlayout" fix
 
    Many tweaks to configures, makes, and libtool setup.  Get rid of the
    library version numbers and the special Mk4*.so targets.  Instead of
    Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
 
-   Fixed "mk::view layout", it was broken by the 10-2-2002 change.
+   Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
 
 2002-03-13    Extend partial access 'B' usage
 
@@ -658,9 +658,9 @@
    causing it to detach empty top-level views, even when in use.  Fixed,
    added s39 to test for this case.
 
-2002-02-10    Improve Mk4tcl's "mk::view layout"
+2002-02-10    Improve Mk4tcl's "mk::view tqlayout"
 
-   Avoid crash when asking for the layout of a non-existent view.  Now
+   Avoid crash when asking for the tqlayout of a non-existent view.  Now
    returns an error instead.
 
 2002-02-07    Fast commit with many empty subviews
@@ -996,9 +996,9 @@
     M-solaris.sh and M-dyn.sh scripts need to be manually edited when
     choosing between CC and gcc.
 
-2001-03-27    Double-alignment bug on Solaris
+2001-03-27    Double-tqalignment bug on Solaris
 
-    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
+    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
     problem for 8-byte doubles on Solaris.  This caused tests b17, b23,
     b24, s22, and s28 to fail.
 
@@ -1084,7 +1084,7 @@
 
 2000-10-03    Fixes for Alpha Unix
 
-    Moved _item in column.h up to fix alignment sensitivity.  Config.h
+    Moved _item in column.h up to fix tqalignment sensitivity.  Config.h
     did not get SIZE_LONG right on Alpha Unix (0?).
 
 2000-09-27    Contributed fixes and Python 2.0b2
@@ -1614,7 +1614,7 @@
     new version in c4_Sequence allocate the c4_Bytes object lazily.
     Faster, and decreases sequence object size (for lots of subviews).
 
-    Mk4tcl, mk::layout now returns the proper layout even if the views
+    Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
     are empty.  Solved by adding extra arg to c4_Storage::Description,
     to return structure of a single top-level view.  Fixes "mk8basic.1",
     and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 21edd0fc2..314c956b9 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
     License info:   http://www.equi4.com/mklicense.html
     Contact info:   http://www.equi4.com/contact.html
 
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
     including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
     Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
     Nicholas Riley, Brian Kelley, and many more people who have reported bugs
diff --git a/akregator/src/mk4storage/metakit/src/column.h b/akregator/src/mk4storage/metakit/src/column.h
index 3f6e4f157..96d1622ef 100644
--- a/akregator/src/mk4storage/metakit/src/column.h
+++ b/akregator/src/mk4storage/metakit/src/column.h
@@ -169,7 +169,7 @@ private:
   tSetter _setter;
 
   union {
-  t4_byte _item[8]; // holds temp result (careful with alignment!)
+  t4_byte _item[8]; // holds temp result (careful with tqalignment!)
   double _aligner;  // needed for SPARC
   };
 
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 0725f57f5..2cd5f0841 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -100,7 +100,7 @@ main()
 }
 
 // Recursively display the entire view contents. The results shown do not
-// depend on file layout (free space, file positions, flat vs. on-demand).
+// depend on file tqlayout (free space, file positions, flat vs. on-demand).
 
 static void ViewDisplay(const c4_View& v_, FILE* fp, int l_ =0)
 {