Merge branch 'rebrand/releng'

Conflicts:
	Makefile
	configs/profile/build.sh
	configs/profile/mkinitcpio.conf
	configs/profile/pacman-key-4.0.3_unattended-keyring-init.patch
	configs/profile/root-image/root/customize_root_image.sh
	configs/profile/root-image/root/install.txt
	configs/profile/syslinux/splash.png

5 files changed, 18 insertions, 18 deletions

diff --git a/configs/profile/syslinux/parabolaiso_pxe32.cfg b/configs/profile/syslinux/parabolaiso_pxe32.cfg
index f61664e..60bc713 100644
--- a/configs/profile/syslinux/parabolaiso_pxe32.cfg
+++ b/configs/profile/syslinux/parabolaiso_pxe32.cfg
@@ -1,7 +1,7 @@
 LABEL parabola32_nbd
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
 LINUX boot/i686/vmlinuz
@@ -11,8 +11,8 @@ IPAPPEND 3
 
 LABEL parabola32_nfs
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS)
 LINUX boot/i686/vmlinuz
@@ -22,8 +22,8 @@ IPAPPEND 3
 
 LABEL parabola32_http
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP)
 LINUX boot/i686/vmlinuz
diff --git a/configs/profile/syslinux/parabolaiso_pxe64.cfg b/configs/profile/syslinux/parabolaiso_pxe64.cfg
index db7a58a..34bf7d7 100644
--- a/configs/profile/syslinux/parabolaiso_pxe64.cfg
+++ b/configs/profile/syslinux/parabolaiso_pxe64.cfg
@@ -1,7 +1,7 @@
 LABEL parabola64_nbd
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
 LINUX boot/x86_64/vmlinuz
@@ -11,8 +11,8 @@ IPAPPEND 3
 
 LABEL parabola64_nfs
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS)
 LINUX boot/x86_64/vmlinuz
@@ -22,8 +22,8 @@ IPAPPEND 3
 
 LABEL parabola64_http
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP).
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP)
 LINUX boot/x86_64/vmlinuz
diff --git a/configs/profile/syslinux/parabolaiso_sys32.cfg b/configs/profile/syslinux/parabolaiso_sys32.cfg
index 6aeeb69..4abdf7a 100644
--- a/configs/profile/syslinux/parabolaiso_sys32.cfg
+++ b/configs/profile/syslinux/parabolaiso_sys32.cfg
@@ -1,7 +1,7 @@
 LABEL parabola32
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (i686) live medium. It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (i686) live medium.
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686)
 LINUX boot/i686/vmlinuz
diff --git a/configs/profile/syslinux/parabolaiso_sys64.cfg b/configs/profile/syslinux/parabolaiso_sys64.cfg
index 7c256bb..b154459 100644
--- a/configs/profile/syslinux/parabolaiso_sys64.cfg
+++ b/configs/profile/syslinux/parabolaiso_sys64.cfg
@@ -1,7 +1,7 @@
 LABEL parabola64
 TEXT HELP
-Boot the Parabola GNU/Linux-libre (x86_64) live medium. It allows you to install Parabola GNU/Linux-libre or
-perform system maintenance.
+Boot the Parabola GNU/Linux-libre (x86_64) live medium.
+It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64)
 LINUX boot/x86_64/vmlinuz
diff --git a/configs/profile/syslinux/parabolaiso_tail.cfg b/configs/profile/syslinux/parabolaiso_tail.cfg
index a55548c..5d95b3b 100644
--- a/configs/profile/syslinux/parabolaiso_tail.cfg
+++ b/configs/profile/syslinux/parabolaiso_tail.cfg
@@ -1,7 +1,7 @@
 LABEL existing
 TEXT HELP
-Boot an existing operating system. Press TAB to edit the disk and partition
-number to boot.
+Boot an existing operating system.
+Press TAB to edit the disk and partition number to boot.
 ENDTEXT
 MENU LABEL Boot existing OS
 COM32 boot/syslinux/chain.c32