From 80dd0fdf7881eddc97526d2ef8f762046f9040f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ramon=20Buld=C3=B3?= <rbuldo@gmail.com>
Date: Fri, 15 May 2015 17:16:50 +0200
Subject: [PATCH] [man: profile.conf] change wording, add new configuration
 options.

---
 man/profile.conf.xml | 98 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 23 deletions(-)

diff --git a/man/profile.conf.xml b/man/profile.conf.xml
index 8bda341..12f4daa 100644
--- a/man/profile.conf.xml
+++ b/man/profile.conf.xml
@@ -73,32 +73,74 @@
         <listitem><para>Takes <option>systemd</option> (the default)
         or <option>openrc</option>. Selecting and option will change
         how the hostname, the displaymanager and services will be configured.
-        For services also controls if buildiso will use start_systemd... or
-        start_openrc... to determine the default services that will be enabled
-        automatically.</para></listitem>
+        For services also controls if buildiso will use start_systemd and
+        start_systemd_live or start_openrc and start_openrc_live to determine
+        the default services that will be enabled automatically.
+        </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>displaymanager=</varname></term>
 
-        <listitem><para><listitem><para>Takes a value of
-        <literal>lightdm</literal>,
-        <literal>sddm</literal>,
-        <literal>gdm</literal>,
-        <literal>mdm</literal>,
-        <literal>lxdm</literal>. Defaults to empty value, 
-        which wont configure any display manager.
-        </para></listitem></para></listitem>
+        <listitem><para>Takes a value of
+        <option>lightdm</option>,
+        <option>sddm</option>,
+        <option>gdm</option>,
+        <option>mdm</option>,
+        <option>lxdm</option>. Defaults to "none" value,
+        which won't configure any display manager.
+        </para></listitem>
       </varlistentry>
-      
+
+      <varlistentry>
+        <term><varname>default_desktop_executable=</varname></term>
+        <term><varname>default_desktop_file=</varname></term>
+
+        <listitem><para>Executable and desktop file used to set witch
+        desktop environment the display manager will run by default.
+        default_desktop_executable= defines a binary in /usr/bin and
+        default_desktop_file a .desktop file in /usr/share/xsessions,
+        skipping the .desktop part.
+        <screen>
+        default_desktop_executable=startxfce4
+        default_desktop_file=xfce
+        </screen>
+        If one or both values are not set or "none" (the default) buildiso
+        will try to autodetect the desktop environment.
+        </para>
+        <para>
+        Incomplete list of possible values:
+        </para>
+        <screen>
+        Desktop         Desktop executable      Desktop file
+        --------------------------------------------------------
+        Budgie          budgie-session          budgie-session
+        Cinnamon        cinnamon-session        cinnamon-session
+        Enlightenment   enlightenment_start     enlightenment
+        Gnome           gnome-session           gnome
+        i3              i3                      i3
+        KDE Plasma 4    startkde                kde-plasma
+        KDE Plasma 5    startkde                plasma
+        LXDE            lxsession               LXDE
+        LXDE            startlxde               LXDE
+        LXQt            lxqt-session            lxqt
+        Mate            mate-session            mate
+        Openbox         openbox-session         openbox
+        Pantheon        pantheon-session        pantheon
+        PekWM           pekwm                   pekwm
+        Xfce            startxfce4              xfce
+        </screen>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>kernel=</varname></term>
 
         <listitem><para>Takes a string corresponding to a 
-        manjaro kernel package (ex: linu310 or linux 310). 
+        manjaro kernel package (ex: linux318 for linux 3.18). 
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>efi_boot_loader=</varname></term>
 
@@ -106,7 +148,17 @@
         calamares to use that bootloader.
         </para></listitem>
       </varlistentry>
-      
+
+      <varlistentry>
+        <term><varname>efi_part_size=</varname></term>
+
+        <listitem><para>Size in MiB of the fat partition where
+        the kernel is. This is useful if you add extra hooks
+        in the mkinitcpio.conf and it's to big to fit in the 
+        partition. The default is "32M".
+        </para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>plymouth_theme=</varname></term>
 
@@ -115,7 +167,7 @@
         plymouth theme installed in /usr/share/plymouth/themes/
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>start_systemd=</varname></term>
 
@@ -124,7 +176,7 @@
         the names of .service systemd files.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>start_openrc=</varname></term>
 
@@ -132,14 +184,14 @@
         enabled in openrc systems.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>hostname=</varname></term>
 
         <listitem><para>Hostname for the ISO.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>username=</varname></term>
 
@@ -147,7 +199,7 @@
         that will be created in the live-cd.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>password=</varname></term>
 
@@ -155,7 +207,7 @@
         that will be created in the live-cd.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>addgroups=</varname></term>
 
@@ -164,7 +216,7 @@
         the iso using calamares.
         </para></listitem>
       </varlistentry>
-      
+
       <varlistentry>
         <term><varname>start_systemd_live=</varname></term>