Remove last remnants of flavour images

res/mdbook-latex

@@ -354,30 +354,18 @@ sub create_table {
     my $result;
     my @lines;
     my $header;
-    my $type = "general";
     my @body;
     my $column_count;
 
     @lines = split(/\n/, $table);
     $header = $lines[0];
-    if ($header =~ /Enlightenment/) {
-        $type = "flavors";
-    }
     $header =~ s/[^|]//g;
     $column_count = length($header) - 1;
 
     $result .= "\n\\bigskip";
-    if ($type eq "flavors") {
-        $result .= "\\newgeometry{left=1.5cm,right=1.5cm}\n"
-    }
     $result .= "\n\\begin{tabular}{ | ";
-    if ($type eq "flavors") {
-        $result .= "p{2.3cm} | " x ($column_count - 1);
-        $result .= "p{2.3cm} | }\n";
-    } else {
-        $result .= "l | " x ($column_count - 1);
-        $result .= "l | }\n";
-    }
+    $result .= "l | " x ($column_count - 1);
+    $result .= "l | }\n";
     $result .= "\\hline\n";
     $header = $lines[0];
     $header =~ s/^\|//;
@@ -396,9 +384,6 @@ sub create_table {
         }
     }
     $result .= "\n\\end{tabular}\n";
-    if ($type eq "flavors") {
-        $result .= "\n\\restoregeometry\n";
-    }
     $result .= "\n\\bigskip\n";
 
 }

src/config/graphical-session/xorg.md

@@ -2,8 +2,8 @@
 
 This section details the manual installation and configuration of the Xorg
 display server and common related services and utilities. If you would just like
-to install a full desktop environment, it is recommended to try one of the
-[flavor images](../../installation/live-images/index.md#flavor-images)
+to install a full desktop environment, it is recommended to try the [xfce
+image](../../installation/live-images/index.md#xfce-image).
 
 ## Installation
 

src/installation/index.md

@@ -15,8 +15,7 @@ following minimums for most installations:
 | x86_64-musl  | x86_64           | 96MB | 600MB   |
 | i686-glibc   | Pentium 4 (SSE2) | 96MB | 700MB   |
 
-Note that flavor installations require more resources; how much more depends on
-the flavor.
+Note that xfce image installations require more resources.
 
 Void is not available for the i386, i486, or i586 architectures.
 

src/installation/live-images/guide.md

@@ -49,8 +49,8 @@ To install packages provided on the install image, select `Local`. Otherwise,
 you may select `Network` to download the latest packages from the Void
 repository.
 
-**Warning!**: If you are installing a desktop environment from a ''flavor''
-image, you MUST choose `Local` for the source!
+> **Warning:** If you are installing the desktop environment from the xfce
+> image, you MUST choose `Local` for the source!
 
 ## Hostname
 

src/installation/live-images/index.md

@@ -13,10 +13,10 @@ manually.
 
 ## Installer images
 
-Void releases two types of images: base images and "flavor" images. Linux
-beginners are encouraged to try one of the more full-featured flavor images, but
-more advanced users may often prefer to start from a base image to install only
-the packages they need.
+Void releases two types of images: base images and xfce images. Linux beginners
+are encouraged to try one of the more full-featured xfce images, but more
+advanced users may often prefer to start from a base image to install only the
+packages they need.
 
 ### Base images
 
@@ -36,7 +36,7 @@ The following software is included:
 - **File manager:** Thunar
 - **Web Browser:** Firefox ESR
 - **Terminal:** xfce4-terminal
-- **Plain text editor:** Mousepadd
+- **Plain text editor:** Mousepad
 - **Image viewer:** Ristretto
 - **Other:** Bulk rename, Orage Globaltime, Orage Calendar, Task Manager, Parole
    Media Player, Audio Mixer, MIME type editor, Application finder