diff --git a/hugo-site/content/docs/_index.md b/hugo-site/content/docs/_index.md
deleted file mode 100644
index c7de787..0000000
--- a/hugo-site/content/docs/_index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-+++
-title = "Documentation"
-MenuTitle = "Documentation"
-chapter = false
-weight = 2
-pre = " "
-+++
-
-{{< subpages "docs" >}}
diff --git a/hugo-site/content/docs/introduction.md b/hugo-site/content/docs/introduction.md
deleted file mode 100644
index 5afea43..0000000
--- a/hugo-site/content/docs/introduction.md
+++ /dev/null
@@ -1,146 +0,0 @@
-+++
-title = "Introduction"
-MenuTitle = "Introduction"
-Description = "Overview of Project Trident"
-chapter = false
-weight = 2
-pre = " "
-+++
-
-Welcome to Project Trident!
-
-Project Trident is a desktop distribution of [TrueOS](https://www.trueos.org), which is a rolling-release variant of [FreeBSD](https://www.freebsd.org).
-The goal of the Project is to provide a simple, secure, and highly usable FreeBSD experience.
-Project Trident is completely independent and [financially backed through the generous contributions of the Open Source community](/sponsors).
-
-[Project Trident](https://project-trident.org) began in 2018 when TrueOS was reorganized into a scaled down server installation of FreeBSD.
-The discontinued desktop portion of TrueOS was adopted by Ken Moore and J.T. Pennington, two desktop-focused TrueOS developers, and rebuilt into Project Trident.
-
-Project Trident is essentially a customized installation of TrueOS and FreeBSD, not a forked derivative.
-Project Trident has a simple graphical installer that has partition support and other customization options.
-The underlying TrueOS/FreeBSD system is kept intact and provides a fully functional FreeBSD system.
-Other differences from FreeBSD include:
-
-- Project Trident pre-configures the BSD-licensed Lumina desktop environment.
- Additional desktop environments can be installed and appear in the graphical login menu.
-
-- The Project Trident installer supports configuring ZFS partitions during installation.
-
-- Project Trident has both graphical and command line software management systems.
-
-- Project Trident provides many graphical utilities for system configuration and management.
-
-- Project Trident comes pre-configured with a number of automatic scripts for dynamically configuring the graphics display system and other desktop-oriented automatic systems such as dynamically supporting removable media.
-
-- The Project Trident boot menu supports boot environments or snapshots of the operating system.
- The System Update Manager automatically creates a new boot environment before every update.
- If an update fails, the system can be rebooted into an earlier boot environment.
- This allows for easy recovery if any issues happen during the update process.
-
-These articles cover the installation and use of Project Trident.
-All documentation must be considered a "work in progress" and is wholly dependent on Project Trident community contributions.
-
-## Features
-
-Project Trident provides many features:
-
-- **Easy installation:** Insert the installation media and reboot the system to start the installer.
- Fill in the prompts in the installation menus.
-
-- **Automatically configured hardware:** Video, sound, network, and other devices automatically configure during installation.
-
-- **Customizable desktop interface:** Project Trident installs the Lumina desktop by default.
- Additional desktop environments can also be installed to support user preferences.
-
-- **Easy software management:** The AppCafe makes installing, upgrading, and uninstalling software safe and easy.
-
-- **Lots of software available:** Most software ported to FreeBSD is available on Project Trident.
- There are currently over 26,100 applications available on FreeBSD.
-
-- **Easy to update:** Project Trident has a built-in System Update Manager.
- This notifies the user about available updates and makes it easy to apply TrueOS security fixes, bug fixes, and system enhancements.
- Additionally, the Update Manager is used to upgrade the operating system or update installed software.
-
-- **No fragmentation:** Project Trident hard drives never need defragmenting and are formatted with OpenZFS, a self-healing filesystem.
-
-- **Laptop support:** Provides power saving and automatic switching between wired and wifi network connections.
- The rolling release model of Project Trident provides an environment to quickly add support for new hardware.
-
-- **Easy system administration:** Project Trident provides many graphical tools for performing system administration.
-
-- **Vibrant community:** Project Trident has a friendly and helpful community.
-
-### Security
-
-The Project Trident system is secure by default.
-This section is an overview of the built-in security features.
-There are also tips about increasing the security of the installed system beyond the configured defaults.
-
-The security features built into Project Trident include:
-
-- **Naturally immune to viruses and other malware written for other Operating Systems:** Most viruses are written to exploit the Windows operating system.
- These are incompatible with the binaries and paths found on a Project Trident system.
- Additional antivirus software is also available in the Appcafe.
- This is useful when sending or forwarding email attachments to users running other operating systems.
-
-- **Potential for serious damage is limited:** Privilege separation between users and the administrator account (root) are built-in.
- Files and directories can only be modified by root or users and groups with permission.
- Any executed programs or scripts are only granted the permissions of that user.
- A malicious program can only infect the files and directories owned by the user.
- Core operating system files are protected.
- Only users that are *wheel* and/or *operator* group members can gain administrative access.
- These users are still not allowed to list directory contents or access files outside of the set "user" and "group" permissions.
-
-- **Built-in firewall:** The default firewall ruleset allows Internet access and any available network shares.
- The firewall does not allow any inbound connections to the computer unless authorized by the user.
-
-- **Few default services:** All boot services can be viewed in the Service Manager.
- Service Manager also allows starting, stopping, and adding or removing from boot any system service.
-
-- **SSH is disabled by default:** SSH can only be enabled by the administrator (root).
- This prevents bots and outside individuals from accessing a Project Trident system.
- If SSH access is required, start the service with the Service Manager or by typing `sudo service sshd start` in the command line.
- To enable SSH on each bootup, type `sudo rc-update add sshd` in the command line.
- Root access is required.
- A firewall rule must also be added using the Firewall Manager.
- Allow SSH connections through the default SSH TCP port *22*.
-
-- **SSH root logins are disabled:** If SSH is enabled, login as a regular user and use `su` or `sudo` for administrative actions.
- Do not change this setting, as it prevents an unwanted user from having complete access to the system.
-
-- **sudo is installed:** `sudo` allows users in the *wheel* or *operator* groups permission to run an administrative command after typing the user password, not the *root* password.
- The first user created during installation is added to the *wheel* and *operator* groups.
- Use the User Configuration in Desktop Settings to add other users to the *wheel* or *operator* groups.
- To change the default `sudo` configuration, use `visudo` as *root*.
- This command verifies there are no syntax errors, which could inadvertently prevent root access.
-
-- [AES instruction set](https://en.wikipedia.org/wiki/AES_instruction_set) (AESNI) support is loaded by default for the Intel Core i5/i7 processors that support this encryption set.
- This support speeds up AES encryption and decryption.
-
-- **Automatic notification of security advisories:** The System Update Manager utility automatically checks for any updates available from a [security advisory](https://www.freebsd.org/security/advisories.html) that affects Project Trident.
- The administrator can keep the operating system fully patched against vulnerabilities with a mouse click.
-
-- Tor Mode can be used to anonymously access Internet sites as it automatically forwards all Internet traffic through the [Tor Project's](https://www.torproject.org/) transparent proxy service.
-
-To learn more about security on TrueOS and Project Trident systems, `man security` is a good place to start.
-These resources provide more information about security on FreeBSD-based operating systems:
-
-- [FreeBSD Security Information](https://www.freebsd.org/security/)
-- [Security Section in the FreeBSD Handbook](https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/security.html)
-
-### ZFS
-
-ZFS is an enterprise grade file-system with many features.
-Support for high storage capacities, high reliability, the ability to quickly take snapshots, boot environments, continuous integrity checking and automatic repair, RAIDZ designed to overcome hardware RAID limitations, and native NFSv4 ACLs are all ZFS features available in Project Trident.
-
-The [ZFS Wikipedia entry](https://en.wikipedia.org/wiki/ZFS) provides an excellent starting point to learn about its features.
-[FreeBSD Mastery: ZFS](https://www.michaelwlucas.com/os/fmzfs) by Michael W Lucas and Allan Jude is also a helpful ZFS and FreeBSD resource.
-
-These resources are also useful:
-
-- [ZFS Evil Tuning Guide](https://www.solaris-cookbook.eu/solaris/solaris-10-zfs-evil-tuning-guide/)
-- [FreeBSD ZFS Tuning Guide](https://wiki.FreeBSD.org/ZFSTuningGuide)
-- [ZFS Best Practices Guide](https://documents.irf.se/get_document.php?group=Computer&docid=311)
-- [ZFS Administration Guide](https://docs.oracle.com/cd/E19253-01/819-5461/index.html)
-- [Becoming a ZFS Ninja (video)](https://blogs.oracle.com/video/becoming-a-zfs-ninja)
-- [Blog post explaining ZFS storage stack simplification](https://blogs.oracle.com/bonwick/rampant-layering-violation)
diff --git a/hugo-site/content/docs/virtualbox-create-vm.md b/hugo-site/content/docs/virtualbox-create-vm.md
deleted file mode 100644
index 7e30801..0000000
--- a/hugo-site/content/docs/virtualbox-create-vm.md
+++ /dev/null
@@ -1,137 +0,0 @@
-+++
-title = "Installing: Creating a VirtualBox Virtual Machine"
-MenuTitle = "VirtualBox VMs"
-Description = "Simple instructions to create and configure a virtual machine for Project Trident."
-chapter = false
-weight = 2
-pre = " "
-+++
-
-## Virtualization
-
-A virtualized environment allows users to test drive an operating system without overwriting the current operating system.
-This is an excellent way to test drive an operating system, determine hardware support, or try multiple operating system versions.
-Virtualization software creates a Virtual Machine (VM), a software-created computer environment that can install and run an operating system.
-The only limitation to virtualization is the system hardware.
-The virtual environment operating system can run slowly if the host computer has limited amounts CPU and RAM.
-Closing other non-essential applications on the host computer can free more CPU and RAM for the virtual machine.
-
-### Quickstart
-
-Trident Guest Virtual Machine (VM) Recommendations:
-
-- **Operating System**: *BSD*
-- **Version**: *FreeBSD (64-bit)*
-- **CPUs**: *1+*
-- **Memory**: *2048 MB* minimum, *4096 MB* recommended
-- **Disk Space**: *15 GB* minimum, *20 GB+* recommended
-
-### VirtualBox
-
-VirtualBox is a popular virtualization software available for Project Trident.
-Installing VirtualBox through the AppCafe or typing `sudo pkg install virtualbox-ose` on the command line installs all required dependencies.
-Installing the *virtualbox-ose-additions* package (also known as VirtualBox Guest Additions) can greatly improve the performance of Project Trident or other guest operating systems.
-The guest additions add mouse pointer integration, shared folders between the host and guest (depending on the guest OS), improved video support, and a shared clipboard.
-
-VirtualBox does not currently support the shared folders feature with a Project Trident guest.
-To share files between the host and a Project Trident guest, use an NFS share.
-
-Please see the [VirtualBox website](https://www.virtualbox.org/) for additional information.
-The [VirtualBox Guest Additions](http://www.virtualbox.org/manual/ch04.html) page has support information and usage instructions.
-
-Using VirtualBox on a Project Trident host requires opening **Control Panel > Users > Groups**, adding user accounts to the **vboxusers** group, and logging out and in again.
-
-### Creating a Virtual Machine for a Project Trident Install
-
-This section describes how to prepare VirtualBox for an installation of Project Trident using an *.iso* file.
-
-Install VirtualBox on the host system, download a Project Trident ISO from [the website](https://www.Trident.org/downloads/), and create a new virtual machine to install Project Trident as a guest OS.
-Configure the virtual machine (VM) for a Project Trident guest:
-
-- Assign memory to the VM: 4 GB is recommended, but the system can run slowly with 2 GB.
-- Create a 30-50 GB virtual disk for the guest operating system and any downloaded software.
- Adjust the virtual disk size as necessary to match the intended use for the operating system, but the virtual disk should not be less than 15 GB.
-- Open the settings for the VM after it is created and set the network adapter to be *bridged*.
- This will allow the guest operating system to connect to the Internet through the host system.
-
-Start VirtualBox to begin creating the VM.
-
-
-
-Click *New* to start the new virtual machine wizard.
-
-
-
-Enter a descriptive name for the virtual machine.
-Open the **Operating System** drop-down menu and select *BSD*.
-In the **Version** drop-down menu, select *FreeBSD (64 bit)*.
-Click *Next*.
-
-
-
-The base memory size must be changed to **at least 2048 MB.**
-Assigning more RAM improves the guest operating system performance.
-Any number within the green area is considered a "safe" value by VirtualBox and should not impact the host computer performance.
-When finished, click *Next*.
-
-
-
-This section is for allocating host computer disk space to the guest operating system or creating a virtual hard drive.
-Using the default choices is generally recommended.
-Click *Create* to configure the virtual hard disk.
-An existing virtual disk can be reused by selecting *Use an existing virtual hard drive file* from the drop-down menu.
-Create as many virtual drives as desired.
-Consider reusing existing virtual hard drives to save space on the physical hard drive.
-
-
-
-Select *VDI* and click *Next*.
-
-
-
-Choose whether to have *Dynamically allocated* or *Fixed size* storage.
-*Dynamically allocated* uses disk space as needed until it reaches a specified maximum size.
-The *Fixed size* option reserved physical space from the physical hard disk, regardless if the virtual machine uses the space.
-Choose *Dynamically allocated* when physical disk space is a concern.
-Choose *Fixed size* when space is not a concern, as it allows the virtual machine to run slightly faster.
-Click *Next*.
-
-
-
-Set the virtual disk size or upper limit.
-When installing Project Trident as the virtual machine guest OS, set the size to at least **20 GB**.
-Set the size to a minimum **50 GB** when planning to use the virtual machine more extensively.
-Whatever size is set, be sure the computer has enough free disk space to accommodate the virtual disk size.
-Use the folder icon to choose a directory with sufficient space to hold the virtual disk.
-
-Click *Create* to finish the process and return to the main screen.
-
-
-
-Configure a bridged network to enable internet access for the virtual machine.
-Right-click the virtual machine and go to Settings --\> Network.
-Open the **Attached to** drop-down menu and select *Bridged Adapter*.
-The interface **Name** is automatically detected or can be chosen from the drop-down menu.
-
-
-
-Now configure the VM to use the ISO installation media previously downloaded.
-Click the **Storage** tab in the VM **Settings** menu.
-Look for the *Empty* optical drive entry in the **Storage Devices** menu and highlight it.
-In the **Attributes** panel, confirm the **Optical Drive** drop-down menu is set to *IDE Secondary Master*, click the **Disk** icon and select *Choose Virtual Optical Disk File...*.
-
-
-
-Browse to the ISO location and select it.
-The ISO name is added to the **Storage Devices** window.
-Click **OK** to return to the VirtualBox dashboard.
-
-Project Trident is now ready to be installed into the virtual machine as a guest OS.
-Highlight the virtual machine and click **Start**.
-A new window opens and shows the startup process.
-Wait for the VM to boot from the ISO and continue to install Project Trident.
-
-> **Note:**
->
-> If the installer GUI doesn't appear to load after configuring the virtual machine, try enabling **EFI**.
-> Go to Settings --\> System --\> Motherboard and set **Enable EFI (special OSes only)**
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-add-iso.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-add-iso.png
deleted file mode 100644
index 8988a90..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-add-iso.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-bridged-adapter.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-bridged-adapter.png
deleted file mode 100644
index 02466e0..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-bridged-adapter.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-dashboard-trident-vm.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-dashboard-trident-vm.png
deleted file mode 100644
index 70e57a6..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-dashboard-trident-vm.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-memory-size.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-memory-size.png
deleted file mode 100644
index ab226fb..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-memory-size.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-name-os.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-name-os.png
deleted file mode 100644
index 2b72d63..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-name-os.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-location-size.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-location-size.png
deleted file mode 100644
index 472b708..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-location-size.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-new-existing.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-new-existing.png
deleted file mode 100644
index a1e51ca..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-new-existing.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-storage.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-storage.png
deleted file mode 100644
index 86087a1..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-storage.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-type.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-type.png
deleted file mode 100644
index c95a9b7..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-virtual-hard-disk-type.png and /dev/null differ
diff --git a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-welcome.png b/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-welcome.png
deleted file mode 100644
index 5829680..0000000
Binary files a/hugo-site/content/docs/virtualbox-create-vm/images/virtualbox-welcome.png and /dev/null differ
diff --git a/hugo-site/content/download/Errata.md b/hugo-site/content/download/Errata.md
index 4a4b139..52f9ddd 100755
--- a/hugo-site/content/download/Errata.md
+++ b/hugo-site/content/download/Errata.md
@@ -11,23 +11,3 @@ pre: " "
## Known Virtualization Issues
* **VirtualBox Guest**: When resizing the window for the Project Trident VM, there may be a delay in the session detecting/adjusting to the new "screen" size. When using the Lumina desktop, you may also need to run `killall fluxbox` from the command-line to re-initialize the window manager if the borders around windows disappear after a session resize from outsize the VM.
* **Bug Bypass**: Use the "Preferences -> Display" settings utility (`lumina-xconfig`) from within the VM to change the session size. This will ensure that the session resize is performed in a consistent manner for the entire VM.
-
-
-## Known Upgrade Issues
-This page details any additional steps that may be required before/during an upgrade from an older version of Project Trident. Make sure you apply **all** upgrade errata that impact your system version, from oldest to newest, before starting the upgrade process.
-
-### 19.05 or older
-The system update utility "sysup" needs to be forcibly updated **before** starting the upgrade procedures. Failure to follow this step will result in your system users and groups getting reset to FreeBSD defaults as well as other loss of system configurations.
-
-* Run command: `sudo pkg install -fy sysup`
-* Then start upgrade procedures normally
-
-Post-Upgrade Test:
-
-* If your user can no longer initiate the "shutdown" or "reboot" procedures from within the Lumina desktop environment, then you failed to follow this Errata properly. Roll back to the pre-upgrade boot environment and try again.
-
-### 18.12 or older
-FreeBSD removed the Qt4 "flavor" of packages from the FreeBSD ports tree prior to this release. The "pkg" utility was noticed to crash unexpectedly during the system upgrade procedures if Qt4 packages were currently installed. If the upgrade process fails, you will need to manually remove all the Qt4 packages on your system first, and then restart the upgrade process.
-
-* Run Command: `sudo pkg remove -Ry qt4-corelib`
-* Then start upgrade procedures normally
diff --git a/hugo-site/content/download/Migrating.md b/hugo-site/content/download/Migrating.md
deleted file mode 100755
index 16abc4a..0000000
--- a/hugo-site/content/download/Migrating.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "Migrating to Project Trident"
-menutitle: "Migrating"
-description : "Migration from other FreeBSD-based distributions"
-chapter: false
-draft: false
-weight: 2
-pre: " "
----
-
-While migrating from other FreeBSD-based distibutions is not officially supported, it is sometimes still possible with a little bit of work. On this page we try to document some of the key steps, even if it is not a full walkthrough.
-
-
-{{% notice warning %}}
-Always backup any sensitive or important data to an external USB stick or system first.
-{{% /notice %}}
-
-## Important References
-**Package repository URL's**
-
-* UNSTABLE version: https://pkg.project-trident.org/pkg/release
-* STABLE version: https://pkg.project-trident.org/pkg/stable
-
-Public key for package verification can be found on the [Download Page](/download) (same key that is used for signing the ISO images).
-
-## If your current system uses base packages
-It might be possible to switch to Project Trident with a few steps:
-
-1. Reconfigure your package repository settings to point to one of the Project Trident repositories.
- * Configuration files are typically located in "/etc/pkg" or "/usr/local/etc/pkg"
-2. Install/update the "sysup" system update utility from the Project Trident repository
- * Run command: `sudo pkg install -fy sysup`
-3. Perform a full system update to move completely over to the Project Trident repository
- * Run command: `sudo sysup -update -fullupdate`
- * When this process finishes successfully, reboot the computer: `shutdown -r now`
-4. Install the Project Trident "core" package
- * Run command: `sudo pkg install trident-core`
-5. Install any optional graphics drivers for your hardware
- * Nvidia GPU's: nvidia-driver, nvidia-driver-340, nvidia-driver-304 (pick one)
- * Virtualbox Guest additions: virtualbox-ose-guestadditions
-6. [Optional] Run the Project Trident system-setup script
- * Run command: `sudo /usr/local/share/trident/scripts/sys-init.sh`
-7. Reboot the system.
- * Project Trident installs bootup services which scan and configure your graphical settings automatically.
- * A graphical login screen should appear indicating that your system is now ready to use.
-
-
-
diff --git a/hugo-site/content/download/_index.md b/hugo-site/content/download/_index.md
index a048f70..416f04f 100755
--- a/hugo-site/content/download/_index.md
+++ b/hugo-site/content/download/_index.md
@@ -14,36 +14,15 @@ pre: " "
|Architecture| 64-bit | 64-bit |
| Memory | 4GB | 2GB |
|Disk Space| 20GB+ | 10GB |
-|Virtualization| VMWare, bhyve | VirtualBox |
-{{< download2 "https://raw.githubusercontent.com/project-trident/trident-website/master/hugo-site/static/iso-manifests/" "Void Linux BETA" >}}
-For details about what this BETA image provides, please see [the announcement](/post/void-beta-available/).
+{{< download2 "https://raw.githubusercontent.com/project-trident/trident-website/master/hugo-site/static/iso-manifests/" "Void Linux" >}}
-{{< downloads "https://pkg.project-trident.org/iso/stable/" "[Deprecated Jan 2020] Last FreeBSD STABLE" >}}
-
-## Differences Between Versions
-| Version | Repository Name | OS | OS Branch | Package Updates | Notes |
-| :---: | :---: | :---: | :---: | :---: | :---: |
-| STABLE | Trident-stable | TrueOS 12 | trueos/stable/12 | ~Weekly | Latest Release of FreeBSD |
-| CURRENT | Trident-release | TrueOS 13 | trueos/master | No More Updates - Will be removed Dec 31, 2019 | Development branch of FreeBSD |
-
-### Security Updates
-Both versions receive regular security updates from FreeBSD which are then imported into TrueOS. These security fixes are included in the regularly scheduled package updates.
-
-### Stability
-The CURRENT version is based off of the development branch of FreeBSD and TrueOS, and may periodically contain work that is only partially-completed. While Project Trident attempts to catch and fix any issues from this, there is still a possibility that an issue will sneak past our QA and impact a release.
-
-The STABLE version is based off of the most recent release verson of FreeBSD and TrueOS, with regular backports of security fixes after initial testing on the development branch. This results in many additional layers of QA for changes and is a much more "stable" experience.
-
-### System ABI
-The STABLE version has a static system ABI, meaning that self-created binaries and packages built for this version of the OS will continue to work across updates until it changes to the next major version number. The CURRENT version changes system ABI very regularly, typically every update or two.
-
-### Driver Support
-The STABLE version tends to lag quite a bit behind with regards to driver support for newer hardware. The CURRENT version contains all the latest hardware drivers and updates that have been committed to FreeBSD. For optimal hardware support on systems that were created within the last 2-3 years, it is recommended to use the CURRENT version.
+### Security Updates
+Package updates are available daily from Void Linux. These include security updates, kernel updates, and application updates on a frequent basis.
## Verify ISO Integrity
-Project Trident digitally signs all packages and install images with OpenSSL keys. Package signatures are automatically verified by the "pkg" utility on Project Trident, but the ISO signatures need to be verified manually using the "openssl" utility (which is available on all major operating systems).
+Project Trident digitally signs all packages and install images with OpenSSL keys. Package signatures are automatically verified by the "xbps" package manager from Void Linux, but the ISO signatures need to be verified manually using the "openssl" utility (which is available on all major operating systems).
NOTE: These instructions assume you have access to some command-line where you can type out a simple command. Consult the documentation for your current operating system to determine how to access this command-line.
@@ -53,16 +32,3 @@ NOTE: These instructions assume you have access to some command-line where you c
4. From a terminal, run the "openssl" utility.
* Run: `openssl dgst -sha512 -verify -signature `
* This will print out "Verified OK" or "Verification Failure" depending on the state of the file.
-
-## General Release Notes
-### Application/Package Availability
-Every single release includes a manifest of all the packages and versions that are available in the repository.
-This plaintext file can easily be [downloaded from the package server](http://pkg.project-trident.org/iso/release/manifests/pkg.list)
-
-#### If the package does not appear on the list
-1. See if a port exists for FreeBSD using [freshports.org](https://www.freshports.org)
- * *No Port*: You can follow the [FreeBSD Porters Handbook](https://www.freebsd.org/doc/en/books/porters-handbook/) to create a new port, and then submit it either to [FreeBSD](https://bugs.freebsd.org/bugzilla/) or to [TrueOS](https://github.com/trueos/trueos-ports). Once accepted by either project, the port will become available by Project Trident a short time later.
-2. See if the port is failing to build by looking at the [port build logs](https://builds.ixsystems.com/poseidon/jail.html?mastername=trident-master-current).
- * Note that all the package build are iterative - so if the latest build has no record of it you may need to look at previous builds to find the job that tried to build the package.
- * Bug ticket and fixes for ports can both be submitted to the [TrueOS Ports repository](https://github.com/trueos/trueos-ports)
- * If a port build option needs to be changed, you can submit changes to the [Project Trident package settings on the trident-build repository](https://github.com/project-trident/trident-build/blob/master/trident-master.json).
diff --git a/hugo-site/content/information/features.md b/hugo-site/content/information/features.md
index 0c658a2..e3664f6 100755
--- a/hugo-site/content/information/features.md
+++ b/hugo-site/content/information/features.md
@@ -15,22 +15,90 @@ Project Trident treats user privacy as a primary goal. We takes many steps to en
* Project Trident systems do **not** "phone home" and submit user or system information back to the project.
* Project Trident does not sell advertising space. You are free to use the system without any advertisements!
+
-* For enhanced privacy, we have a pre-defined firewall profile for routing all network traffic through the "tor" anonymizing service. While this profile is not enabled by default due to the speed limitations of the tor network, it can be easily enabled after installation.
+## Feature Details
-* The "Falkon" web browser that is pre-installed has ad-blocking functionality both built-in and pre-enabled. Private browsing and additional browsing protection options are also available within the application preferences as well.
+Project Trident provides many features:
+- **Easy installation:** Insert the installation media and reboot the system to start the installer.
+ Fill in the prompts in the installation menus.
-## Reliability
-Project Trident utilizes a number of mechanisms to safeguard the data of each system.
+- **Automatically configured hardware:** Video, sound, network, and other devices automatically configure during installation.
-* **ZFS**: We use the enterprise-quality Z File System for safely storing all user data on single or multiple disk drives.
+- **Customizable desktop interface:** Project Trident installs the Lumina desktop by default.
+ Additional desktop environments can also be installed to support user preferences.
-* **Boot Environments**: All system updates are performed within a separate snapshot of the OS itself, called a boot environment. This provides a safety net for any updates since you can roll back to the previous environment in just a few seconds should the need arise for it.
-
-
-## Security
-Utilizing leading security enhancements from OpenBSD, Project Trident also builds on TrueOS to provide a desktop focused operating system which keeps security implication and mitigation procedures as a top priority for the everyday user.
-Some of the security enhancements that we implement:
+- **Lots of software available:** The entire package repository of Void Linux is available, with updates happening daily.
- * All 3rd-party packages are built, signed, and sealed by Project Trident before being placed into a public repository. This allows the user to download and install trusted builds of applications from an official source, rather than having to fetch files from unknown sources.
+- **Easy and safe to update:** Project Trident includes utilities to automatically perform system snapshots prior to running any updates. This makes it trivial to perform full-system updates and optionally roll-back right from the bootloader.
+
+- **No fragmentation:** Project Trident hard drives never need defragmenting and are formatted with OpenZFS, a self-healing filesystem.
+
+- **Laptop support:** Provides power saving and automatic switching between wired and wifi network connections.
+ The rolling release model of Project Trident provides an environment to quickly add support for new hardware.
+
+- **Easy system administration:** Project Trident provides many graphical tools for performing system administration.
+
+- **Vibrant community:** Project Trident has a friendly and helpful community.
+
+### Security
+
+The Project Trident system is secure by default.
+This section is an overview of the built-in security features.
+There are also tips about increasing the security of the installed system beyond the configured defaults.
+
+The security features built into Project Trident include:
+
+- **All user home directories are encrypted out of box.** The individual user directories are only "unlocked" and decrypted when that user logs in to the system. Logging out or rebooting the system automatically locks home directories.
+
+- **Naturally immune to viruses and other malware written for other Operating Systems:** Most viruses are written to exploit the Windows operating system.
+ These are incompatible with the binaries and paths found on a Project Trident system.
+ Additional antivirus software is also available in the Appcafe.
+ This is useful when sending or forwarding email attachments to users running other operating systems.
+
+- **Potential for serious damage is limited:** Privilege separation between users and the administrator account (root) are built-in.
+ Files and directories can only be modified by root or users and groups with permission.
+ Any executed programs or scripts are only granted the permissions of that user.
+ A malicious program can only infect the files and directories owned by the user.
+ Core operating system files are protected.
+ Only users that are *wheel* group members can gain administrative access.
+ These users are still not allowed to list directory contents or access files outside of the set "user" and "group" permissions.
+
+- **Built-in firewall:** The default firewall ruleset allows Internet access and any available network shares.
+ The firewall does not allow any inbound connections to the computer unless authorized by the user.
+
+- **Few default services:** All boot services can be viewed in the Service Manager.
+ Service Manager also allows starting, stopping, and adding or removing any system service from boot.
+
+- **SSH is disabled by default:** SSH can only be enabled by the administrator (root).
+ This prevents bots and outside individuals from accessing a Project Trident system.
+ If SSH access is required, start the service with the Service Manager or by typing `sudo ln -s /etc/sv/sshd /var/service` in the command line.
+ Root access is required.
+ A firewall rule opening up TCP port *22* for SSH access is also required. Alternatively, the firewall can be temporarily disabled by running `sudo sv stop nftables` (remember to start it again later, a reboot will also bring the firewall back up).
+
+- **SSH root logins are disabled:** If SSH is enabled, login as a regular user and use `su` or `sudo` for administrative actions.
+ For your security, do not change this setting. Disabling root logins prevents unwanted users from having complete access to the system.
+
+- **sudo is installed:** `sudo` allows users in the *wheel* group permission to run an administrative command after typing the user password, not the *root* password.
+ The first user created during installation is added to the *wheel* group.
+ Use the User Configuration in Desktop Settings to add other users to the *wheel* group.
+ To change the default `sudo` configuration, use `visudo` as *root*.
+ This command verifies there are no syntax errors, which could inadvertently prevent root access.
+
+### ZFS
+
+ZFS is an enterprise grade file-system with many features.
+Support for high storage capacities, high reliability, the ability to quickly take snapshots, boot environments, continuous integrity checking and automatic repair, RAIDZ designed to overcome hardware RAID limitations, and native NFSv4 ACLs are all ZFS features available in Project Trident.
+
+The [ZFS Wikipedia entry](https://en.wikipedia.org/wiki/ZFS) provides an excellent starting point to learn about its features.
+[FreeBSD Mastery: ZFS](https://www.michaelwlucas.com/os/fmzfs) by Michael W Lucas and Allan Jude is also a helpful ZFS and FreeBSD resource.
+
+These resources are also useful:
+
+- [ZFS Evil Tuning Guide](https://www.solaris-cookbook.eu/solaris/solaris-10-zfs-evil-tuning-guide/)
+- [FreeBSD ZFS Tuning Guide](https://wiki.FreeBSD.org/ZFSTuningGuide)
+- [ZFS Best Practices Guide](https://documents.irf.se/get_document.php?group=Computer&docid=311)
+- [ZFS Administration Guide](https://docs.oracle.com/cd/E19253-01/819-5461/index.html)
+- [Becoming a ZFS Ninja (video)](https://blogs.oracle.com/video/becoming-a-zfs-ninja)
+- [Blog post explaining ZFS storage stack simplification](https://blogs.oracle.com/bonwick/rampant-layering-violation)
diff --git a/hugo-site/content/information/heritage.md b/hugo-site/content/information/heritage.md
index b540f07..7446a67 100644
--- a/hugo-site/content/information/heritage.md
+++ b/hugo-site/content/information/heritage.md
@@ -1,100 +1,18 @@
+++
-title = "BSD Heritage"
-MenuTitle = "BSD Heritage"
-description = "Relationship and differences from other BSD operating systems"
+title = "Heritage"
+MenuTitle = "History"
+Description = "General history of Project Trident"
chapter = false
weight = 2
-pre = " "
+pre = " "
+++
-Project Trident is a desktop-focused disribution of [TrueOS](http://trueos.org), which in turn is a variation of the [FreeBSD](http://freebsd.org) operating system which was officially started [in the early 1990's](https://www.freebsd.org/doc/handbook/history.html) but is itself a direct decendant of the [original AT&T UNIX](http://www.unix.org/what_is_unix/history_timeline.html).
+Project Trident was started as a desktop distribution of [TrueOS](https://www.trueos.org), which was a rolling-release variant of [FreeBSD](https://www.freebsd.org).
+The goal of the Project was to provide a simple, secure, and highly usable FreeBSD experience.
+Project Trident is completely independent and [financially backed through the generous contributions of the Open Source community](/sponsors).
-Rather than re-iterate the history of the FreeBSD and TrueOS projects, this page focuses on the similarities and differences between Project Trident and TrueOS/FreeBSD.
+[Project Trident](https://project-trident.org) began in 2018 when TrueOS was reorganized into a scaled down server installation of FreeBSD.
+The discontinued desktop portion of TrueOS was adopted by Ken Moore and J.T. Pennington, two desktop-focused TrueOS developers, and rebuilt into Project Trident.
-## General Overview
-{{< mermaid >}}
-graph BT
-A[FreeBSD Ports] --> C[TrueOS Ports]
-C -->|Regular Builds| E{Project Trident}
-B[FreeBSD Source] -->|CURRENT Branch| D[TrueOS Source]
-D -->|Stable Releases| E
-C -.-> A
-D -.-> B
-style A stroke:red
-style B stroke:red
-style C stroke:black
-style D stroke:black
-style E stroke:blue
-{{< /mermaid >}}
-
-## Similarities
-The base operating system and kernel are identical between the various projects, as they are all built directly from the same source code, although at different times or from different branches of the source repositories.
-This includes the kernel, hardware drivers, file systems, and more.
-
-All of the applications which are available in the form of packages are built from the exact same "ports tree", which is a source repository of build instructions for over 35000 applications, libraries, and more.
-These "ports" generally result in binaries which are compiled to run specifically on different FreeBSD-based operating system architectures.
-
-### Architectures
-FreeBSD itself supports multiple types of computer architectures (i386, amd64, various flavors of ARM, etc..), but TrueOS and Project Trident are specifically focused on the amd64 architecture (often called x86-64, or "64-bit"), but also include the support capabilities to directly run i386 binaries ("32-bit").
-
-### Ports
-Due to the addition of OpenRC to TrueOS for service management, the TrueOS project maintains a version of the FreeBSD ports tree which includes many additional files.
-These extra files ensure that OpenRC versions of service files are available alongside the traditional *rc.d* service files from FreeBSD.
-They also provide a testing area for other TrueOS changes before submission back to FreeBSD, including new ports, new versions of ports, and more.
-TrueOS also uses GitHub for managing it's ports repository[1], whereas FreeBSD still uses a privately-hosted SVN repository[2].
-
-*[1] [TrueOS ports repository](https://github.com/trueos/trueos-ports)*
-*[2] [FreeBSD ports repository](https://svn.freebsd.org/)*
-
-## Differences From TrueOS
-*Note: Differences listed here also generally apply to other TrueOS-based distributions*
-
-Being a desktop-focused distribution, Project Trident provides many different graphical solutions for common tasks on TrueOS based systems:
-
-* Graphical front-end to the "pc-sysinstall" utility from TrueOS for managing the installation.
-* Graphical system setup
- * While this is typically a manual task on TrueOS/FreeBSD, Project Trident provides a suite of scripts and utilities which handle all of the setup and maintenance of the graphical systems.
- These utilities run during the bootup routine and dynamically provide these features:
- * Automatic "best-driver" setup for your hardware based upon which graphical drivers are installed and whether they match the type of GPU contained by your hardware.
- * Automatic failover to one of two different graphical drivers (**vesa** or **scfb**) if the main graphics driver fails to work for some reason.
- * Dynamic loading of the video driver and any associated kernel modules on bootup.
- This allows the system hard drive to move between systems as needed with little or no loss of functionality.
- This requires that the video drivers for both systems are installed already, or one of the failover drivers can be used.
-* Graphical utilities for common tasks
- * The PCDM login manager.
- * The [Lumina Desktop Environment](https://lumina-desktop.org) is pre-installed and pre-configured for out-of-box usage.
- * A [graphical system-update utility](https://github.com/project-trident/trident-utilities) has been written just for Project Trident. This provides easy access to configuring and performing updates in addition to the ability to roll-back a system update as desired.
- * Removable media detection and on-demand usage is provided via integrations between Project Trident and the Lumina Desktop.
-* Stable OS, Rolling Ports
- * Project Trident uses the "stable" branches of TrueOS for the OS-components themselves. This ensures there are no radical changes or binary compatibility issues for a 6-month period of time.
- * Project Trident also builds and provides a package repository of every "port" contained in the TrueOS ports repository. This package repository is also updated every week, ensuring a steady stream of new or updated applications very soon after they appear in FreeBSD/TrueOS.
- * Project Trident uses a [customized build configuration](https://github.com/project-trident/trident-build/blob/master/trident-stable.json/) for both OS and ports.
- Everything in Project Trident is built specifically to be used for a graphical operating system.
-
-## Differences From FreeBSD
-
-Many of these differences from FreeBSD actually come from the TrueOS project, so this list will change over time as the TrueOS and FreeBSD projects continue to evolve.
-
-### OpenRC
-
-TrueOS provides the OpenRC system for managing services on the OS in place of the "legacy" RC system currently used on FreeBSD. This difference is most notable in a few key ways:
-
-* Faster bootup - OpenRC starts up services much faster and with better dependency handling than FreeBSD.
-* Better status reporting. The `rc-status` utility provides an instant look at all system services and their current status.
-* Service files are located in `[/usr/local]/etc/init.d` rather than `[/usr/local]/etc/rc.d`.
-* Some services have different names: **dhcpcd** instead of *dhclient*, **network** instead of *netif*.
-* Many OpenRC services are "multiplexed" for individual device/profile management.
- * Example: The **network.wlan0** service controls the first wifi device, and should be started/stopped instead of the **network** service when re-configuring the Wi-Fi settings.
-* The *[service-name]_enable="YES"* entries on FreeBSD are no longer needed to enable services on bootup. Instead, OpenRC provides a method for grouping services together (called "runlevels"), and the `rc-update` utility is used to add/remove bootup registrations for services within these groups.
- * Example: `rc-update add dbus default` adds the **dbus** service to the **default** runlevel and enables it to automatically start on bootup.
- * Example 2: `rc-update delete dbus default` removes the **dbus** service from the **default** runlevel and prevents it from starting during bootup.
-* The "service" utility is used identically to FreeBSD for interacting with services.
- * Example: `service dbus stop` stops the **dbus** service when it is running.
- * Example 2: `service network.wlan0 restart` restarts the networking associated with the first wireless device.
-
-### Base Packages
-
-TrueOS uses the package system for installing the OS itself in addition to the pre-compiled "ports". This functionality is called "base packages" and allows a single package repository to contain both the OS and all the available applications in a single, unified collection of files. This functionality provides these features:
-
-* The OS and packages are always in sync. A single system update can be used for the entire end-to-end update of the system, even when OS changes like a new kernel are provided during a major release cycle.
-* System updates are **fast** and clean. All updates are performed within a new Boot Environment, ensuring the live system is never touched while in use. Reboot to finish the update procedure and boot into the newly-updated system.
+In 2019, Project Trident announced it would be leaving TrueOS/FreeBSD and rebasing the project on [Void Linux](http://voidlinux.org) to better serve their users and provide essential functionality for a desktop system.
+This transition was completed in February of 2020 when the first official release using Void Linux was published.
diff --git a/hugo-site/content/information/opensource.md b/hugo-site/content/information/opensource.md
index 1f57ad7..f379501 100755
--- a/hugo-site/content/information/opensource.md
+++ b/hugo-site/content/information/opensource.md
@@ -17,8 +17,7 @@ Project only has a few repositories that govern the overall course of the projec
| Project | Source Repository | Bug Tracker | Description |
|:---------:|:----------------------------:|:----------------:|:----------------:|
-|trident-build|[project-trident/trident-build](https://github.com/project-trident/trident-build)|[GitHub issues](https://github.com/project-trident/trident-build/issues)|Build scripts and port/pkg settings|
-|trident-installer|[project-trident/trident-installer](https://github.com/project-trident/trident-installer)|[GitHub issues](https://github.com/project-trident/trident-installer/issues)|Graphical Installer for the ISO|
+|trident-installer|[project-trident/trident-installer](https://github.com/project-trident/trident-installer)|[GitHub issues](https://github.com/project-trident/trident-installer/issues)|ISO creation|
|trident-core|[project-trident/trident-core](https://github.com/project-trident/trident-core)|[GitHub issues](https://github.com/project-trident/trident-core/issues)|Core configuration files and settings for post-install use|
|trident-artwork|[project-trident/trident-artwork](https://github.com/project-trident/trident-artwork)|[GitHub issues](https://github.com/project-trident/trident-artwork/issues)|Artwork, wallpapers, banners, and other graphics for Project Trident|
|trident-icons|[project-trident/trident-icons](https://github.com/project-trident/trident-icons)|[GitHub issues](https://github.com/project-trident/trident-icons/issues)|XDG icon theme(s) for Project Trident|
@@ -30,20 +29,17 @@ There are a number of tools and utilities that Project Trident relies on for fun
| Project | Source Repository | Bug Tracker | Description | Website |
|:---------:|:----------------------------:|:----------------:|:----------------:|:-----------:|
|Lumina Desktop|[lumina-desktop](https://github.com/lumina-desktop)|[GitHub issues](https://github.com/lumina-desktop/lumina/issues)|Graphical user interface: Everything post-login|[lumina-desktop.org](https://www.lumina-desktop.org)|
-|TrueOS Base|[trueos/trueos](https://github.com/trueos/trueos)|[GitHub issues](https://github.com/trueos/trueos/issues)|Base OS: kernel, userland utilities, install utility, and more|[trueos.org](https://www.trueos.org)|
-|TrueOS Ports|[trueos/trueos-ports](https://github.com/trueos/trueos-ports)|[GitHub issues](https://github.com/trueos/trueos-ports/issues)|Registration and build instructions for all packages and utilities|[trueos.org](https://www.trueos.org)|
-|SysAdm (service)|[trueos/sysadm](https://github.com/trueos/sysadm)|[GitHub issues](https://github.com/trueos/sysadm/issues)|TrueOS service which provides a static API for system interactions|[sysadm.us](https://sysadm.us)|
-|SysAdm (client)|[trueos/sysadm](https://github.com/trueos/sysadm-ui-qt)|[GitHub issues](https://github.com/trueos/sysadm-ui-qt/issues)|Graphical "Control Panel" utility|[sysadm.us](https://sysadm.us)|
+|Void Linux Packages| [void-packages](https://github.com/void-linux/void-packages)|[GitHub issues](https://github.com/void-linux/void-packages/issues)|All packages: including Linux kernel and userland|[voidlinux.org](https://www.voidlinux.org)|
### Inherited Repositories from TrueOS
A number of the graphical utilities from the old TrueOS "desktop" release were also migrated over to Project Trident. Some of these tools may be active and available as a package and some of them may just be archives that are preserved for historical reference.
|Status | Project | Source Repository | Description |
|:--------:|:---------:|:----------------------------:|:----------------:|
-| **Active** | PCDM | [project-trident/pcdm](https://github.com/project-trident/pcdm) | Graphical login manager for TrueOS |
-| **Active** | pc-mixer | [project-trident/pc-mixer](https://github.com/project-trident/pc-mixer) | Graphical mixer utility for the system tray |
| **Active** | qsudo | [project-trident/qsudo](https://github.com/project-trident/qsudo) | Graphical interface to "sudo" (launch app as root) |
-| **Active** | pc-networkmanager | [project-trident/pc-networkmanager](https://github.com/project-trident/pc-networkmanager) | Graphical network configuration utility |
+| *Archive* | PCDM | [project-trident/pcdm](https://github.com/project-trident/pcdm) | Graphical login manager for TrueOS |
+| *Archive* | pc-mixer | [project-trident/pc-mixer](https://github.com/project-trident/pc-mixer) | Graphical mixer utility for the system tray |
+| *Archive* | pc-networkmanager | [project-trident/pc-networkmanager](https://github.com/project-trident/pc-networkmanager) | Graphical network configuration utility |
| *Archive* | pc-firewall | [project-trident/pc-firewall](https://github.com/project-trident/pc-firewall) | Graphical firewall utility: *Replaced by SysAdm* |
| *Archive* | pc-webkitviewer | [project-trident/pc-webkitviewer](https://github.com/project-trident/pc-webkitviewer) | Small browser "wrapper" to make a local html file or URL look like a native app |
| *Stagnant* | pc-diskmanager | [project-trident/pc-diskmanager](https://github.com/project-trident/pc-diskmanager) | Graphical tool for viewing/changing zpool and disk information |
diff --git a/hugo-site/content/docs/style-guide.md b/hugo-site/content/information/style-guide.md
similarity index 100%
rename from hugo-site/content/docs/style-guide.md
rename to hugo-site/content/information/style-guide.md
diff --git a/hugo-site/content/post/void-20.02-available.md b/hugo-site/content/post/void-20.02-available.md
new file mode 100644
index 0000000..dff49a9
--- /dev/null
+++ b/hugo-site/content/post/void-20.02-available.md
@@ -0,0 +1,34 @@
++++
+title = "Void Linux 20.02 Image Available"
+menutitle = "[20.02] Void Download Available"
+description = "The 20.02 install image is now available"
+date = "2020-02-14"
+draft = false
+pre = " "
++++
+
+Project Trident is pleased to announce the first official release image based on Void Linux, available on the [Project Trident download page](/download).
+
+Please note the Project Trident installer supports four different installation "levels":
+
+* **Void** : Only the base-system from Void Linux and ZFS-related bootloader packages are installed.
+* **Server** : A CLI-based system with additional services and utilities installed from Project Trident (firewall, cron, autofs, wireguard, additional shells, etc.)
+* **Lite Desktop** : Everything needed for a graphical desktop install using Lumina. No extra fluff.
+* **Full Desktop** : The "Lite" install with quite a few additional end-user utilities (office suite, Telegram, multimedia apps, etc).
+
+**Note:** These installation levels provide pre-defined lists of packages to install for user convenience. The installed system can be easily be changed afterwards using the built-in package system.
+
+## I installed the ALPHA, should I reinstall for the Release?
+Yes. There have been many changes to boot setup and dataset organization since the ALPHA image. These changes are difficult to make without a full reinstall.
+
+## I installed the BETA, do I have to reinstall for the Release?
+No. There are a couple simple steps to migrate your BETA system to the RELEASE. These steps are listed in the [Migration Notes](https://github.com/project-trident/trident-docs/wiki/Converting-an-install-to-Project-Trident) on the Documentation wiki.
+
+## Important notes
+
+1. Due to how ZFS is packaged on Linux, a dynamic kernel module is automatically compiled for your specific system during the package installation. This may take a little while to complete, depending on your system hardware capabilities.
+2. From our initial testing, the average time to perform the installation is about 30 minutes. This will vary depending on download speeds and compilation time of the DKMS modules.
+3. The default shell for Void Linux is "dash" and is the "/bin/sh" of the system.
+ * It might be helpful to run `chsh` after logging in to change the default login shell, as dash is very limited.
+ * In shell scripts, make sure to use "#!/bin/bash" instead of "#!/bin/sh", otherwise you may experience odd script failures due to using "dash" instead of the traditional "Bourne shell".
+4. The user password must be a minimum of 8 characters due to the ZFS encryption key length requirement. Modifying a user password to be less than 8 characters later on will break the user account!
diff --git a/hugo-site/layouts/partials/menu-footer.html b/hugo-site/layouts/partials/menu-footer.html
index 5ebf8e7..0f468cd 100644
--- a/hugo-site/layouts/partials/menu-footer.html
+++ b/hugo-site/layouts/partials/menu-footer.html
@@ -1,12 +1,12 @@
-Media Platforms
+Communities
- {{if .Site.Params.github}} {{end}}
- {{if .Site.Params.telegram}} {{end}}
- {{if .Site.Params.wiki}} {{end}}
- {{if .Site.Params.twitch}} {{end}}
- {{if .Site.Params.twitter}} {{end}}
- {{if .Site.Params.youtube}} {{end}}
-
+ {{if .Site.Params.github}} - Source Repos
{{end}}
+ {{if .Site.Params.telegram}}- Telegram
{{end}}
+ {{if .Site.Params.wiki}}- Documentation
{{end}}
+ {{if .Site.Params.twitch}}- Twitch
{{end}}
+ {{if .Site.Params.twitter}}- Twitter
{{end}}
+ {{if .Site.Params.youtube}}- Youtube
{{end}}
+ - RSS Feed
@@ -14,6 +14,3 @@ Become a Sponsor!
Donate Today!
-
-
-Distribution powered by KeyCDN
diff --git a/hugo-site/static/css/theme-trident.css b/hugo-site/static/css/theme-trident.css
index 5b46a08..80a1dec 100644
--- a/hugo-site/static/css/theme-trident.css
+++ b/hugo-site/static/css/theme-trident.css
@@ -85,8 +85,8 @@ a:hover {
background-color: var(--MAIN-LINK-HOVER-color);
}
#sidebar {
- background-color: var(--MENU-SECTIONS-BG-color);
- color: var(--MENU-SECTIONS-FG-color);
+ background-color: var(--MENU-SECTIONS-BG-color);
+ color: var(--MENU-SECTIONS-FG-color);
}
#sidebar #header-wrapper {
background: var(--MENU-HEADER-BG-color);
@@ -94,9 +94,13 @@ a:hover {
border-color: var(--MENU-HEADER-BORDER-color);
}
#sidebar .searchbox {
- border-color: var(--MENU-SEARCH-BOX-color);
+ border-color: var(--MENU-SEARCH-BOX-color);
background: var(--MENU-SEARCH-BG-color);
}
+#sidebar ul.topics > li > a {
+ font-size: 1.3rem;
+}
+
#sidebar ul.topics > li.parent, #sidebar ul.topics > li.active {
background: var(--MENU-SECTIONS-ACTIVE-BG-color);
}
@@ -123,20 +127,17 @@ a:hover {
/*--------------social----------------*/
.social_icons {
- overflow: hidden;
- padding: 0;
+ /*overflow: hidden;*/
+ /*padding: 0;*/
list-style: none;
- white-space: nowrap;
- position: relative;
- z-index: 10;
+ /*white-space: nowrap;*/
+ /*position: relative;*/
+ /*z-index: 10;*/
}
.social_icons > li {
- text-align: center;
- float: left;
cursor: pointer;
- font-size: 2em;
- overflow: hidden;
- margin-right: 10px;
+ font-size: 1.3rem;
+ margin-left: 1em;
}
.align-row{
diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5
deleted file mode 100644
index ca10385..0000000
--- a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.md5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (/usr/home/kenmoore/Projects/trident-website/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso) = 2d5b1d17b64d108d64ea5523d98ea73e
diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256
deleted file mode 100644
index 287f754..0000000
--- a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sha256
+++ /dev/null
@@ -1 +0,0 @@
-SHA256 (/usr/home/kenmoore/Projects/trident-website/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso) = cfe2f7b6dbbd818dd4264413c390d726b770a4fb4b8aef20dc194e130d079941
diff --git a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512 b/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512
deleted file mode 100644
index a4646df..0000000
Binary files a/hugo-site/static/iso-manifests/Trident-BETA-netinstall-x86_64.iso.sig.sha512 and /dev/null differ
diff --git a/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.md5 b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.md5
new file mode 100644
index 0000000..cd4c102
--- /dev/null
+++ b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.md5
@@ -0,0 +1 @@
+76daffa9142c14b401f0f1898b723dbf Trident-netinstall-x86_64.iso
diff --git a/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sha256 b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sha256
new file mode 100644
index 0000000..c06dd4a
--- /dev/null
+++ b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sha256
@@ -0,0 +1 @@
+d32d68cdaa3f66f2ae6dca4292acacb7b6ebc28cf5893d653c645134640cd303 Trident-netinstall-x86_64.iso
diff --git a/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sig.sha512 b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sig.sha512
new file mode 100644
index 0000000..c479fa6
Binary files /dev/null and b/hugo-site/static/iso-manifests/Trident-netinstall-x86_64.iso.sig.sha512 differ
diff --git a/hugo-site/static/iso-manifests/manifest.json b/hugo-site/static/iso-manifests/manifest.json
index 9c99c67..d54e129 100644
--- a/hugo-site/static/iso-manifests/manifest.json
+++ b/hugo-site/static/iso-manifests/manifest.json
@@ -1,13 +1,13 @@
{
-"iso_file" : "Trident-BETA-netinstall-x86_64.iso",
-"iso_size" : "515M",
-"signature_file" : "Trident-BETA-netinstall-x86_64.iso.sig.sha512",
-"md5_file" : "Trident-BETA-netinstall-x86_64.iso.md5",
-"md5" : "2d5b1d17b64d108d64ea5523d98ea73e",
-"sha256_file" : "Trident-BETA-netinstall-x86_64.iso.sha256",
-"sha256" : "cfe2f7b6dbbd818dd4264413c390d726b770a4fb4b8aef20dc194e130d079941",
-"build_date" : "Jan 06, 2020",
-"build_date_time_t" : "1578320534",
-"version" : "Void-BETA"
+"iso_file" : "Trident-netinstall-x86_64.iso",
+"iso_size" : "523M",
+"signature_file" : "Trident-netinstall-x86_64.iso.sig.sha512",
+"md5_file" : "Trident-netinstall-x86_64.iso.md5",
+"md5" : "76daffa9142c14b401f0f1898b723dbf",
+"sha256_file" : "Trident-netinstall-x86_64.iso.sha256",
+"sha256" : "d32d68cdaa3f66f2ae6dca4292acacb7b6ebc28cf5893d653c645134640cd303",
+"build_date" : "Feb 14, 2020",
+"build_date_time_t" : "1581695890",
+"version" : "20.02"
}
diff --git a/hugo-site/static/iso-manifests/pubkey.pem b/hugo-site/static/iso-manifests/pubkey.pem
new file mode 100755
index 0000000..e8611c1
--- /dev/null
+++ b/hugo-site/static/iso-manifests/pubkey.pem
@@ -0,0 +1,25 @@
+-----BEGIN PUBLIC KEY-----
+MIIEIjANBgkqhkiG9w0BAQEFAAOCBA8AMIIECgKCBAEAoBL9PbaDIU8Qd2rNR0ZN
+2mbnOQSl7SICkzgmBNZOkbP/bVvcNcKDssEqyyHtFbiGyDjC0m3H+0batfxT3fds
+GmhuvdYGgrXI1ymg7nRkzo3E/wNe9Z2Evv3qjEydIBvQVIZj548wRv34ZmzF0Nr3
+5EwWcIiGeFsTkt71pfbgUIz5hXqaClvR+gNKeIGRtaG1vjVo2+mLTDXg/ZghnmG2
+xuMN+lb9wUFsDq22dWbgP5gg8Mp48JzJTpA5dtnSDpBHCQsgUSt9xV1119YR4J9E
+2uK0vkxH4VcGFz9+WgyHziEbKaz82cQYHhMm8NpDshPwQqc99iPwPIjvmYAqG/gH
+QAI9E/GUr5fuKPkpVx9hwliXA6gmEjN3Cq9fKAW6FBSteZ3BLFtSjCnj+mn7qESR
+Vi+HQbPPgCzFgD0Jv8a1NhJAVQdqtGYoeY8KmoHVYI5L4erYVtBVVIoedJvFC+13
+A6nD090qYD6eROzIMJ9Bb+oviVNZMdBTtYUZB1Tj0O/ZgHsnd+NlzmUsF1SCnqhb
+fCmN7JaXM0X5J9e9fT9itQnXl24vxqRMBvcCSCGuq9RLCnYkzAgI/jTzEe8M+xuo
++I3GGlEI73v1Iq1a4b9SjhodRgZxdltlxkxzKoqKlRYY9kmJ9OfHKvXSYfSkfYQK
+yPquXCF/xiUdOU3rQdu44KplmKfHvrZA55kP4sehxfs/cDYIYsqXu9XIBOiMQ0cn
+14luT3+vJfwXnHD/r76RK6tMJgGp+b59lnAIsDpMIZyqIjFNsOUBtzb5i2vHH3cB
+IejITAxkWiIGpAGJPb3r8LH/qyJAqR41Nqhq3gG0YjLPOMfzoeG0LbRREpGxTid8
+Oe81a8Ex2XA4z/ss0CwwNYkIrV7NJ4eY2wWy21Gu/aD1FnL6vgqnt4i0MeoLf5/M
+jyLwXDryGzJgGcAGPBrNBagowozEN+1SYsWVkKKbBibzuL4X25IYicDwmCLbuC6T
+c8qyl5BQTYdycJW+eo1v1ZzZS93tTWnM8OjiTWAeADXmVoQU07nirtanOd9W+uM8
+ZRD51a8wgjFNplyQonZCXAkLvCYuyIsMRf/rXROMCCTQcvxVufdKYPLOqTYroEfh
+w5D7UB0lpu+lNPByA9+LayqdVvi3FAgr1tISrJ/NuL5oDqtRwi7XstU5PaXHK14N
+T4SLw27ekJamhuV+d32SBoBUme4d+84m5k9CpZxRH8NKARLNgrSJTWi4KODQgJY3
+66gck1lrcXNLELNL0OoYOa9sjedXruB+Aw4b5onWq3tC32a39m57MRJZbXQVimck
+rN99zMBxtgpV7MOQRnwrQ2v994mk3oZ4Cq1uJp0jlZeYEA6AyEzCm1XT6TvmBPjt
+hQIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test.sh b/test.sh
index f4e77d3..770de35 100755
--- a/test.sh
+++ b/test.sh
@@ -1,22 +1,5 @@
#!/bin/sh
-#Make sure all the required packages are installed first
-for _pkg in `cat pkg_list`
-do
- echo "Checking for Package: ${_pkg}"
- pkg info -qe "${_pkg}"
- if [ $? -eq 1 ] ; then
- _pkg_needed="${_pkg_needed} ${_pkg}"
- fi
-done
-if [ -n "${_pkg_needed}" ] ; then
-echo "Installing Required Packages: ${_pkg_needed}"
- sudo pkg install -y ${_pkg_needed}
- if [ $? -ne 0 ] ; then
- echo "[ERROR] Unable to install packages: ${_pkg_needed}"
- exit 1
- fi
-fi
#Now start up the internal test server on port 1313
origdir=${PWD}
cd hugo-site