emove references to Xorg "katamari"

Also tweak a tar command in llvm.

general.ent

@@ -165,10 +165,8 @@
 export -f as_root</userinput></screen>
 </note>">
 
-<!ENTITY not-katamari         "<para>This package is not a part of the Xorg
-                              katamari and is provided only as a dependency to
-                              other packages or for testing the completed Xorg
-                              installation.</para>">
+<!ENTITY not-katamari         "<para>This package is provided for testing the 
+                               completed Xorg installation.</para>">
 
 <!ENTITY % package-entities SYSTEM      "packages.ent">
 %package-entities;

general/prog/llvm.xml

@@ -219,7 +219,7 @@
         <filename class="directory">cmake</filename>.
       </para>
 
-<screen><userinput>tar xf ../llvm-cmake-&llvm-version;.src.tar.xz &amp;&amp;
+<screen><userinput>tar -xf ../llvm-cmake-&llvm-version;.src.tar.xz &amp;&amp;
 mv cmake-&llvm-version;.src ../cmake</userinput></screen>
 
     </note>

x/installing/installing.xml

@@ -70,10 +70,9 @@
   <para>
     This chapter provides the basic components of the X Window System and
     Wayland. For X, the chosen implementation is Xorg, which is a modular
-    implementation and requires more than 100 packages to be installed.
-    The distribution of Xorg is given a release number by the developers,
-    in this case Xorg-&xorg-version;, and is referred to as the "katamari" by
-    the upstream developers. Individual packages are updated as needed without
+    implementation and requires more than 100 packages to be installed.  The
+    distribution of Xorg is given a release number by the developers, in this
+    case Xorg-&xorg-version;. Individual packages are updated as needed without
     changing this number.
   </para>
 

x/installing/xinit.xml

@@ -30,8 +30,6 @@
       to start the xserver.
     </para>
 
-    &not-katamari;
-
     &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>