merge

README.rst

@@ -1,83 +1,74 @@
-Documentation Build Instructions
+Documentation build instructions
 ################################
 
-The `website documentation`_ for Clear Linux\* OS for Intel Architecture
-should be written in :abbr:`ReStructuredText (ReST)` AKA ``.rst``, which
-makes it easy to build parsable, command-line readable, indexed, and
-search-friendly documentation and APIs with `Sphinx`_.
+.. todo add comment re not using standards here.
 
-.. _requirements:
+`Clear Linux\* OS documentation`_ is written using `reStructuredText`_ and
+built using `Sphinx`_. Follow the instructions in this README to build the
+documentation locally for development and testing.
+
+Please make yourself familiar with our `contribution guidelines`_ before
+submitting a contribution.
 
 Requirements
-============
+************
 
-To build documentation with Sphinx, ensure your system has these
-prerequisites:
+Make sure you have Python and Sphinx installed. We use Python 3 and
+Sphinx 1.7.5
 
-* `GNU make`_
-* `Python`_
-* `PIP`_
-* `Sphinx`_
+The Sphinx documentation provides `instructions for installing Sphinx`_ on various
+platforms.
 
-The instructions for installing these varies according to OS. On a basic out-
-of-the-box Ubuntu-like OS (which usually has Python installed by default),
-check your python version you might need something like:
-
-.. code-block:: console
-
-   $ sudo apt-get install python-pip
-   $ sudo pip install -U sphinx sphinx-autobuild
-
-
-
-.. code-block:: console
-
-   $ python -c 'print __import__("sphinx").__version__'
-     1.3.1
-
-Cloning the documentation repository
-====================================
-
-We have confirmed Sphinx installed.  The next step is to clone Gitlab
-repository to our local machine.
+Clone the documentation repository
+**********************************
 
+Once Sphinx is installed, clone the documentation repository to your
+local machine.
 
 .. code-block:: console
 
    $ git clone https://github.com/clearlinux/clear-linux-documentation
 
-Run make
-========
+Run the build
+*************
 
-Finally are we ready to run :command:`make`. Be sure to :command:`cd` to the
-:file:`source/` directory where your ``.rst`` files are, before
-running :command:`make html`, or the doc format of your choice.
+We build our documentation using Sphinx. In the source directory of your
+local clear-linux-documentation repository, build the documentation by running
+**make html**:
 
 .. code-block:: console
 
    $ make html
    >
    sphinx-build -b html -d _build/doctrees   . _build/html
-   Running Sphinx v1.3.1
+   Running Sphinx v1.7.5
    making output directory...
    .
    .
    .
    build succeeded, 0 warnings.
 
+   The HTML pages are in _build/html.
+
    Build finished. The HTML pages are in _build/html.
 
-Open one of the .html pages in a web browser to view the rendered
+Open one of the HTML pages in a web browser to view the rendered
 documentation.
 
-For tips on how to contribute documentation formatted in the .rst style
-needed to integrate beautifully on the clearlinux.org website, please see
- `Theming Sphinx`_.
+When testing changes in the documentation, make sure to remove the previous
+build before building again by running **make clean**:
 
+.. code-block:: console
 
-.. _website documentation:  https://clearlinux.org/documentation
+   $ make clean
+   >
+   rm -rf _build/*
+
+This will completely remove the previous build output.
+
+.. _Clear Linux\* OS documentation:  https://clearlinux.org/documentation
 .. _Sphinx: http://sphinx-doc.org/
-.. _GNU make: https://www.gnu.org/software/make/
-.. _Python: https://www.python.org/
-.. _PIP: https://pypi.python.org/pypi/pip/
-.. _Theming Sphinx: https://github.com/otcshare/tcs-hub/blob/master/theming-sphinx.rst
+.. _reStructuredText: http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html
+.. _contribution guidelines: https://clearlinux.org/documentation/clear-linux/reference/collaboration
+.. _instructions for installing Sphinx: https://www.sphinx-doc.org/en/master/usage/installation.html
+

source/Makefile

@@ -166,10 +166,8 @@ changes:
 	@echo "The overview file is in $(BUILDDIR)/changes."
 
 linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
+	-$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	python3 scripts/_python/linkcheck/parse-link-check.py $(BUILDDIR)/linkcheck
 
 doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest

source/clear-linux/concepts/mixer-about.rst

@@ -1,14 +1,82 @@
 .. _mixer-about:
 
 Mixer
-#######
+#####
 
-Mixing refers to composing a custom, versioned image of |CLOSIA| for a specific use case. While upstream |CL| provides options to install bundles for various capabilities, some developers and OSVs may wish to either augment the operating system with functionality from their own packages or modify the structure of current bundles. Mixing offers a method to add capabilities while retaining the ability to stay up to date with an upstream version of |CL|.
+|CL-ATTR| is a powerful, modular, and customizable OS. Upstream |CL| offers
+many images to support different environments and use-cases.  There are
+hundreds of bundles that will meet most, if not all, of your OS and software
+needs.
 
-Mixing is a multi-step process that starts with installing the mixer bundle using swupd. You will also need a working knowledge of :abbr:`RPMs (RPM Package Manager files)` and how |CL| bundles work. For a detailed guide on how to create a |CL| mix, visit :ref:`mixer`.
+However, if you need additional customization or content, |CL| provides the
+mixer tool. Depending on your needs, the mixer tool allows you to:
 
-Related Concepts
-================
+1. :ref:`create-mix` to create a distinct derivative of the |CL| that
+   contains your custom software.
+2. :ref:`create-mixin` to add custom bundles but also keep updating the OS
+   from upstream.
 
-* :ref:`swupd-about`
+.. _create-mix:
+
+Create a mix
+============
+
+When creating a mix, you can
+
+* Use any existing upstream bundles with no modification.
+* Redefine what goes into existing bundles.
+* Create completely new, custom bundles with your own custom packages.
+
+With mixer you are not required to incorporate every upstream release into
+your mix. You decide which upstream versions to update your derivative to, as
+illustrated in Figure 1.
+
+.. figure:: figures/mixer-about-1.png
+   :scale: 75%
+   :alt: Creating a custom mix.
+
+   Figure 1: With a custom mix, you add your custom bundle and decide which
+   upstream versions to update your mix to, on your own release cycle.
+
+Creating your own mix forks away from the |CL| upstream and requires that you
+act as your own OSV. There is a greater level of responsibility, requiring
+more infrastructure and processes to adopt. However, with this approach, you
+have a higher degree of control and customization of your custom |CL|.
+
+
+.. _create-mixin:
+
+Create a mixin
+==============
+
+The second option is to use the :command:`mixin` tool, a light wrapper for
+mixer, to create custom bundles and sideload them into your upstream version
+of |CL|. A mixin is useful when you need to add custom or 3rd
+party content but want to keep on the upstream update cycle, as shown in
+Figure 2. You can also create new bundles using upstream packages.
+
+.. figure:: figures/mixer-about-2.png
+   :scale: 75%
+   :alt: Creating a custom mix.
+
+   Figure 2: With a mixin you can add custom bundles, but stay on upstream.
+
+Mixin is primarily intended for end users. It is easier to adopt as it does
+not require breaking from upstream or acting as an OSV. With mixin
+
+* You are responsible for maintaining and testing your custom bundle(s).
+* You retain access to all upstream bundles and updates.
+* You can easily revert your system back to the upstream version.
+
+Related topics
+==============
+
+|CL| provides flexibility in how you customize your OS. Learn more about
+mixer and related topics to decide which customization approach is best for
+you.
+
+* :ref:`mixer`
+* :ref:`mixin`
 * :ref:`bundles-about`
+* :ref:`swupd-about`
+* :ref:`deploy-at-scale`

source/clear-linux/concepts/security.rst

@@ -97,7 +97,7 @@ standards. Below are some examples:
   have been removed such as the `finger` and `tcpwrappers`.
 
 * `SFTP` has been disabled by default due to security 
-  considerations. See the `openssh-server reference page`_ for more details. 
+  considerations. 
 
 
 Verified trust
@@ -182,7 +182,6 @@ good security hygiene. Below are some examples:
 
 .. _`documentation about Software Updates`: https://clearlinux.org/documentation/clear-linux/concepts/swupd-about
 .. _`cve-check-tool`: https://github.com/clearlinux/cve-check-tool
-.. _`openssh-server reference page`: https://clearlinux.org/documentation/clear-linux/reference/bundles/openssh-server
 .. _`blog post about swupd security`: https://clearlinux.org/blogs/security-software-update-clear-linux-os-intel-architecture
 .. _`rolling release model`: https://en.wikipedia.org/wiki/Rolling_release
 .. _`clrtrust`: https://github.com/clearlinux/clrtrust

source/clear-linux/concepts/swupd-about.rst

@@ -3,35 +3,35 @@
 Software update
 ###############
 
-|CLOSIA| does software updates differently than traditional Linux-based 
-operating systems. Where traditional distributions rely on packages for 
-software deployment, |CL| uses the concept of a "bundle" for 
-deployment. Traditional Linux packages provide a particular utility or 
-library; |CL| bundles provide all necessary packages to enable a 
+|CL-ATTR| does software updates differently than traditional Linux-based
+operating systems. Where traditional distributions rely on packages for
+software deployment, |CL| uses the concept of a "bundle" for
+deployment. Traditional Linux packages provide a particular utility or
+library; |CL| bundles provide all necessary packages to enable a
 specific function.
 
-With |CL|, updating equates to an entirely new OS version with a 
-specific set of bundles, as compared to a package-based distribution in 
-which packages may be updated individually. |CL| updates are 
+With |CL|, updating equates to an entirely new OS version with a
+specific set of bundles, as compared to a package-based distribution in
+which packages may be updated individually. |CL| updates are
 efficient, updating only changed files instead of entire packages.
 
-System administrators can customize or add bundles to the OS, while still 
-taking advantage of a controlled update stream. This enables system 
+System administrators can customize or add bundles to the OS, while still
+taking advantage of a controlled update stream. This enables system
 administrators to focus on the pieces that make their deployment unique.
 
 
 Bundles
 =======
 
-While we use packages to manage compiling source code into installable 
-binaries, we do not deploy software through packages. Instead, we use bundles 
-to deploy software, where each bundle encapsulates a particular functionality 
--- functionality that is enabled by composing all the required upstream 
-open-source projects and packages into one logical unit: a bundle. This 
+While we use packages to manage compiling source code into installable
+binaries, we do not deploy software through packages. Instead, we use bundles
+to deploy software, where each bundle encapsulates a particular functionality
+-- functionality that is enabled by composing all the required upstream
+open-source projects and packages into one logical unit: a bundle. This
 simplifies installing features on |CL|.
 
-For additional resources regarding available bundles, useful bundle commands, 
-and compatible |CL| kernels, visit our :ref:`bundles-about` 
+For additional resources regarding available bundles, useful bundle commands,
+and compatible |CL| kernels, visit our :ref:`bundles-about`
 page.
 
 
@@ -65,8 +65,8 @@ describe the versions of all the software on the OS. Each build is
 composed of a specific set of bundles made from a particular version of
 packages. This matters on a daily basis to system administrators, who
 need to determine which of their systems do not have the latest security
-fixes, or which combinations of software have been tested. Every release 
-of the same number is guaranteed to contain the same versions of software, 
+fixes, or which combinations of software have been tested. Every release
+of the same number is guaranteed to contain the same versions of software,
 so there's no ambiguity between two systems running the same version of |CL|.
 
 
@@ -76,20 +76,20 @@ Updating
 Another notable difference between package-based distributions and |CL|
 is how updates are managed. On a package-based OS, system administrators update
 each individual package or piece of software to a newer (or older!) version. With
-|CL|, an update translates to an entirely new OS version, containing one 
-or many updates.  It is not possible to update a piece of the system while 
+|CL|, an update translates to an entirely new OS version, containing one
+or many updates.  It is not possible to update a piece of the system while
 remaining on the same version of |CL|.
 
 How is this useful? Although it seems, at first, like a huge restriction
 or limitation, this method has many non-obvious benefits. Imagine a
 cloud environment composed of numerous machines.  Here, a homogeneous set of
 software makes sense -- from the system administrator's level down to the
-user level. Homogeneous systems allow users to focus on their contributions 
-and/or code, rather than configuring environments or worrying about 
-synchronizing versions and updates.  At the system admin level, it ensures 
+user level. Homogeneous systems allow users to focus on their contributions
+and/or code, rather than configuring environments or worrying about
+synchronizing versions and updates.  At the system admin level, it ensures
 security is tighter and makes it far easier to monitor and update patches.
 
-|CL| promotes regular updating of the OS and will automatically check 
+|CL| promotes regular updating of the OS and will automatically check
 for updates and apply them by default.
 
 To learn how to run an update of your system, visit our :ref:`swupd-guide` page.
@@ -98,9 +98,9 @@ To learn how to run an update of your system, visit our :ref:`swupd-guide` page.
 Update speed
 ============
 
-Software updates with |CL| are also efficient. Bundles simply describe 
-a set of files, and the update technology updates *only* files that actually 
-changed by using binary-delta technology for efficiency [1]_. Operating systems 
+Software updates with |CL| are also efficient. Bundles simply describe
+a set of files, and the update technology updates *only* files that actually
+changed by using binary-delta technology for efficiency [1]_. Operating systems
 that use packages as the unit of deployment require full package updates (thus
 hogging resources), even when one small file in that package has changed.
 
@@ -128,5 +128,5 @@ a controlled update stream.
 To learn more about mixing, visit our :ref:`mixer-about` page.
 
 
-.. [1] The software update technology for |CLOSIA| was first presented at the 
+.. [1] The software update technology for |CL-ATTR| was first presented at the
    Linux Plumbers conference in 2012.

source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst

@@ -0,0 +1,837 @@
+.. _bare-metal-install-beta:
+
+Install |CL-ATTR| from the live desktop beta image
+##################################################
+
+The live desktop beta image allows you to boot |CL-ATTR| into a GNOME
+desktop without modifying the host system. Using the live image, you can
+explore the possibilities of developing with |CL|. You can also launch the
+new installer and install |CL| on your target system.
+
+.. contents:: :local:
+   :depth: 1
+
+System requirements
+*******************
+
+Assure that your target system supports the installation:
+
+* :ref:`system-requirements`
+* :ref:`compatibility-check`
+
+Preliminary steps
+*****************
+
+#. `Navigate to the image directory`_.
+
+#. Download the file :file:`clear-<release number>-live-desktop-beta.img.xz`
+
+   .. note::
+
+      <release-number> is the latest |CL| auto-numbered release.
+
+#. Follow your OS instructions to create a bootable USB drive.
+
+   * :ref:`bootable-usb-linux-all`
+   * :ref:`bootable-usb-mac-all`
+   * :ref:`bootable-usb-windows-all`
+
+Install from live image
+***********************
+
+After you've downloaded and burned the live desktop image on a
+USB drive, follow these steps.
+
+#. Insert the USB drive into an available USB slot.
+
+#. Power on the system.
+
+#. Open the system BIOS setup menu by pressing the :kbd:`F2` key.
+
+   .. note::
+
+      Your BIOS setup menu entry point may vary.
+
+#. In the setup menu, enable the UEFI boot and set the USB drive as the
+   first option in the device boot order.
+
+#. Save these settings and exit.
+
+#. Reboot the target system.
+
+Launch the installer
+====================
+
+#. After the |CL| live desktop image boots, select the :guilabel:`Activities`   menu in the upper left.
+
+#. Select the icon, :guilabel:`Install Clear Linux OS`, shown in Figure 1.
+
+   .. figure:: figures/bare-metal-install-beta-1.png
+      :scale: 50 %
+      :alt: Install Clear Linux OS icon
+
+      Figure 1: Install Clear Linux OS icon
+
+#. Upon selecting the icon, the installer is launched, as shown in Figure 2.
+
+   .. figure:: figures/bare-metal-install-beta-2.png
+      :scale: 50 %
+      :alt: Clear Linux OS Installer
+
+      Figure 2: Clear Linux OS Installer
+
+.. _incl-bare-metal-beta-start:
+
+Minimum installation requirements
+*********************************
+
+To fulfill minimum installation requirements, complete the
+`Required options`_. `Advanced options`_ are optional.
+
+.. note::
+
+   * The :kbd:`Install` button is only highlighted **after** you complete the
+     `Required options`_, and after you enter required values in submenus.
+
+   * You must choose whether or not to participate in :ref:`telemetrics`
+     before you can finish installation.
+
+   * You may wish to `Test Network Settings`_ before you
+     `Configure Network Interfaces`_. Assure that a ``Success`` message is received before installation.
+
+Main Menu
+*********
+The |CL| Installer Main Menu appears as shown in Figure 3.
+
+.. figure:: figures/bare-metal-install-beta-3.png
+   :scale: 100%
+   :alt: Clear Linux OS Installer Main Menu
+
+   Figure 3: Clear Linux OS Installer Main Menu
+
+The |CL| Installer Main Menu has two tabs: :guilabel:`[R] Required options`
+and :guilabel:`[A] Advanced options`. Navigate between tabs using the arrow
+keys or these shortcut keys:
+
+* :kbd:`Shift+A` for :guilabel:`[A] Advanced options`
+* :kbd:`Shift+R` for :guilabel:`[R] Required options`
+
+To meet the minimum requirements, enter your choices in the
+:guilabel:`Required options`. After confirmation, your selections appear
+beside the :guilabel:`>>` chevron, below the menu options.
+
+Navigation
+**********
+
+* Select :kbd:`Tab` or :kbd:`Up/Down` arrows to highlight your choice.
+
+* Select :kbd:`Enter` or :kbd:`Spacebar` to confirm your choice.
+
+* Select :kbd:`Cancel` or :kbd:`Esc` to cancel your choice.
+
+Required options
+****************
+
+Choose Timezone
+===============
+
+#. From the Main Menu, select :guilabel:`Choose Timezone`.
+
+#. Select :kbd:`Enter` to continue.
+
+#. In :guilabel:`Select System Timezone`, navigate to
+   the desired timezone.
+
+#. Use :kbd:`Tab` to navigate to :guilabel:`Confirm`.
+
+#. Select :kbd:`Enter` to :kbd:`Confirm`.
+
+   .. note::
+
+      Select :guilabel:`Cancel` to restore the previously defined value and
+      return to the Main Menu.
+
+   .. figure:: figures/bare-metal-install-beta-4.png
+      :scale: 100%
+      :alt: Select System Timezone
+
+      Figure 4: Select System Timezone
+
+Choose Language
+===============
+
+#. From the Main Menu, select :guilabel:`Choose Language`.
+
+#. Select :kbd:`Enter`.
+
+#. In :guilabel:`Select System Language`, navigate to your desired language.
+
+#. Select :kbd:`Tab` to highlight :kbd:`Confirm`.
+
+#. Select :kbd:`Enter` to :kbd:`Confirm`.
+
+   .. note::
+
+      Select :guilabel:`Cancel` to restore the previously defined value and return to the Main Menu.
+
+   .. figure:: figures/bare-metal-install-beta-5.png
+      :scale: 100%
+      :alt: Select System Language
+
+      Figure 5: Select System Language
+
+Configure the Keyboard
+======================
+
+#. From the Main Menu, select :guilabel:`Configure the Keyboard`.
+
+#. Select :kbd:`Enter`.
+
+#. In :guilabel:`Select Keyboard`, navigate to the desired option.
+
+#. In :guilabel:`Test keyboard`, type text to assure that the keys map to
+   your keyboard.
+
+#. Select :kbd:`Tab` to highlight :guilabel:`Confirm`.
+
+#. Select :kbd:`Enter` to :kbd:`Confirm`.
+
+   .. note::
+
+      Select :guilabel:`Cancel` to restore the previously defined value and return to the Main Menu.
+
+   .. figure:: figures/bare-metal-install-beta-6.png
+      :scale: 100%
+      :alt: Select Keyboard menu
+
+      Figure 6: Select Keyboard menu
+
+Configure Media
+===============
+
+#. From the Main Menu, select :guilabel:`Configure Media`.
+
+   .. note::
+
+      Available media appear by default.
+
+#. Navigate to the desired media until highlighted.
+
+   .. figure:: figures/bare-metal-install-beta-7.png
+      :scale: 100%
+      :alt: Configure Media menu
+
+      Figure 7: Configure Media menu
+
+      .. note::
+
+         Use additional options as necessary during partitioning:
+
+         * Select :guilabel:`Revert` to cancel changes and revert to the
+           original configuration.
+         * Select :guilabel:`Rescan` to show media connected to the host
+           machine.
+
+#. Select :kbd:`Enter` or :kbd:`Spacebar` to select it.
+
+   Two options for partitioning appear.
+
+#. Select :guilabel:`Auto Partition` to accept the default configuration, or
+   :guilabel:`Add Partition` to add partitions manually. See instructions
+   below.
+
+#. Select :kbd:`Enter` to :kbd:`Confirm`.
+
+#. Choose one partitioning method and continue below:
+
+   * `Auto Partition`_
+   * `Add Partition`_
+
+Auto Partition
+==============
+
+Auto partition will configure the media to meet the minimum requirements.
+
+#. Select :guilabel:`Auto Partition` as shown in Figure 8.
+
+#. Select :kbd:`Enter` or :kbd:`Spacebar` to highlight
+   :guilabel:`Auto partition`.
+
+#. Select :kbd:`Enter` to :kbd:`Confirm`.
+
+   This action returns you to the Main Menu.
+
+   .. figure:: figures/bare-metal-install-beta-8.png
+      :scale: 100%
+      :alt: Auto Partition
+
+      Figure 8: Auto Partition
+
+#. You may skip to the `Telemetry`_ section below.
+
+Disk encryption
+===============
+
+For greater security, disk encryption is supported using LUKS for all
+partitions **except boot** on |CL|. To encrypt a partition, see the example
+in `root partition`_ below. Encryption is optional.
+
+Encryption Passphrase
+---------------------
+
+|CL| uses a single passphrase for all encrypted partitions. Therefore, if
+you turn on encryption for one partition, the same passphrase is used for
+all partitions. Additional or different keys may be configured
+post-installation using the ``cryptsetup`` tool.
+
+.. note::
+
+   During installation, if you encrypt the `root` partition first and the
+   `swap` partition second, after you select encrypt for `swap`, the
+   :guilabel:`Encryption Passphrase` dialogue will show the same Passphrase that was assigned to `root`. Select :guilabel:`Confirm` and
+   press :kbd:`Enter` to use the same Passphrase.
+
+Add Partition
+=============
+
+Minimum requirements
+--------------------
+
+To add partitions manually, assign partitions per the minimum
+requirements shown in Table 1:
+
+.. list-table:: **Table 1. Disk Partition Setup**
+   :widths: 33, 33, 33
+   :header-rows: 1
+
+   * - FileSystem
+     - Mount Point
+     - Minimum size
+   * - ``VFAT``
+     - /boot
+     - 150M
+   * - ``swap``
+     -
+     - 256MB
+   * - ``root``
+     - /
+     - *Size depends upon use case/desired bundles.*
+
+
+#. In the Configure Media menu, select :guilabel:`Add Partition`.
+
+   .. note:: To change an existing partition, navigate to the partition,
+      and select :guilabel:`Enter`.
+
+boot partition
+--------------
+
+#. In the :guilabel:`File System` menu, select :kbd:`Up/Down` arrows to
+   select the file system type.  See Figure 9.
+
+#. In :guilabel:`Mount Point`, enter the ``/boot`` partition.
+
+#. In :guilabel:`Size`, enter an appropriate size (e.g., 150M) per Table 1.
+
+#. Navigate to :guilabel:`Confirm` until highlighted.
+
+#. Select :guilabel:`Enter` to confirm.
+
+   .. figure:: figures/bare-metal-install-beta-9.png
+      :scale: 100%
+      :alt: boot partition
+
+      Figure 9: boot partition
+
+swap partition
+--------------
+
+#. In the :guilabel:`File System` menu, select :kbd:`Up/Down` arrows to
+   select the file system type. See Figure 10.
+
+#. In :guilabel:`Mount Point`, the field remains blank.
+
+   .. note::
+
+      The Mount Point field is disabled.
+
+#. In :guilabel:`Size`, enter an appropriate size (e.g., 256MB) per Table 1.
+
+#. Navigate to :guilabel:`Add`.
+
+#. Select :guilabel:`Enter` to continue.
+
+   .. figure:: figures/bare-metal-install-beta-10.png
+      :scale: 100%
+      :alt: swap partition
+
+      Figure 10: swap partition
+
+root partition
+--------------
+
+#. In the :guilabel:`File System` menu, select :kbd:`Up/Down` arrows to
+   select the file system type. See Figure 11.
+
+   #. Optional: Select :guilabel:`[X] Encrypt` to encrypt the partition.
+
+      .. figure:: figures/bare-metal-install-beta-11.png
+         :scale: 100%
+         :alt: Encrypt partition
+
+         Figure 11: Encrypt partition
+
+
+   #. The :guilabel:`Encryption Passphrase` dialogue appears.
+
+      .. note::
+
+         Minimum length is 8 characters. Maximum length is 94 characters.
+
+      .. figure:: figures/bare-metal-install-beta-12.png
+         :scale: 100%
+         :alt: Encryption Passphrase
+
+         Figure 12: Encryption Passphrase
+
+   #. Enter the same passphrase in the first and second field.
+
+   #. Navigate to :guilabel:`Confirm` and press :kbd:`Enter`.
+
+      .. note::
+
+         :guilabel:`Confirm` is only highlighted if passphrases match.
+
+#. Optional: In :guilabel:`[Optional] Label:`, enter your desired
+   label for the partition.
+
+#. In :guilabel:`Mount Point`, enter ``/``. See Figure 11.
+
+#. In :guilabel:`Size`, enter an appropriate size per Table 1.
+
+   .. note::
+
+      The remaining available space shows by default.
+
+#. Navigate to :guilabel:`Add` until highlighted.
+
+#. Select :guilabel:`Enter` to continue.
+
+   You are returned to the :guilabel:`Configure media` menu.
+
+#. Select :guilabel:`Confirm` to complete the media selection. See Figure 13.
+
+#. You are returned to the :guilabel:`Configure media` menu. Your partitions
+   should be similar to those shown in Figure 13.
+
+   .. figure:: figures/bare-metal-install-beta-13.png
+      :scale: 100%
+      :alt: Partitions
+
+      Figure 13: Partitions
+
+#. Navigate to :guilabel:`Confirm` until highlighted.
+
+#. Select :guilabel:`Enter` to complete adding partitions.
+
+Telemetry
+=========
+
+To fulfill the :guilabel:`Required options`, choose whether or not to
+participate in `telemetry`_.  :ref:`telemetrics` is a |CL| feature that
+reports failures and crashes to the |CL| development team for improvements.
+For more detailed information, visit our :ref:`telemetry-about` page.
+
+#. In the Main Menu, navigate to :guilabel:`Telemetry` and select
+   :kbd:`Enter`.
+
+#. Select :kbd:`Tab` to highlight your choice.
+
+#. Select :kbd:`Enter` to confirm.
+
+   .. figure:: figures/bare-metal-install-beta-14.png
+      :scale: 100%
+      :alt: Enable Telemetry
+
+      Figure 14: Enable Telemetry
+
+Skip to finish installation
+===========================
+
+After selecting values for all :guilabel:`Required options`, you may skip
+to `Finish installation`_.
+
+Otherwise, continue below. In the Main Menu, select
+:guilabel:`Advanced options` to configure network interfaces or proxy
+settings, add bundles, add/manage users, add kernel arguments, and more.
+
+Advanced Options
+****************
+
+Configure Network Interfaces
+============================
+
+By default, |CL| is configured to automatically detect the host network
+interface using DHCP. However, if you want to use a static IP address or if
+you do not have a DHCP server on your network, follow these instructions to
+manually configure the network interface. Otherwise, default network
+interface settings are automatically applied.
+
+.. note::
+
+   If DHCP is available, no user selection may be required.
+
+#. Navigate to :guilabel:`Configure Network Interfaces` and
+   select :kbd:`Enter`.
+
+#. Navigate to the network :guilabel:`interface` you wish to change.
+
+#. When the desired :guilabel:`interface` is highlighted, select
+   :guilabel:`Enter` to edit.
+
+   .. note:: Multiple network interfaces may appear.
+
+   .. figure:: figures/bare-metal-install-beta-15.png
+      :scale: 100%
+      :alt: Configure Network Interfaces
+
+      Figure 15: Configure Network Interfaces
+
+#. Notice :guilabel:`Automatic / dhcp` is selected by default (at bottom).
+
+   Optional: Navigate to the checkbox :guilabel:`Automatic / dhcp` and select
+   :kbd:`Spacebar` to deselect.
+
+   .. figure:: figures/bare-metal-install-beta-16.png
+      :scale: 100%
+      :alt: Network interface configuration
+
+      Figure 16: Network interface configuration
+
+#. Navigate to the appropriate fields and assign the desired
+   network configuration.
+
+#. To save settings, navigate to :guilabel:`Confirm` and select
+   :kbd:`Enter`.
+
+   .. note::
+
+      To revert to previous settings, navigate to the :guilabel:`Cancel`
+      and select :kbd:`Enter`.
+
+#. Upon confirming network configuration, the :guilabel:`Testing Networking`
+   dialogue appears. Assure the result shows success. If a failure occurs,
+   your changes will not be saved.
+
+#. Upon confirmation, you are returned to :guilabel:`Network interface`
+   settings.
+
+#. Navigate to and select :guilabel:`Main Menu`.
+
+Optional: Skip to `Finish installation`_.
+
+Proxy
+=====
+
+|CL| automatically attempts to detect proxy settings, as described in
+`Autoproxy`_. If you need to manually assign proxy settings, follow this
+instruction.
+
+#. From the Advanced options menu, navigate to :guilabel:`Proxy`, and
+   select :kbd:`Enter`.
+
+#. Navigate to the field :guilabel:`HTTPS Proxy`.
+
+   .. figure:: figures/bare-metal-install-beta-17.png
+      :scale: 100%
+      :alt: Configure the network proxy
+
+      Figure 17: Configure the network proxy
+
+#. Enter the desired proxy address and port using conventional syntax,
+   such as: \http://address:port.
+
+#. Navigate to :guilabel:`Confirm` and select :kbd:`Enter`.
+
+#. To revert to previous settings, navigate to :guilabel:`Cancel`
+   and select :guilabel:`Cancel`.
+
+Optional: Skip to `Finish installation`_.
+
+Test Network Settings
+=====================
+
+To manually assure network connectivity before installing |CL|,
+select :guilabel:`Test Network Settings` and select :guilabel:`Enter`.
+
+A progress bar appears as shown in Figure 18.
+
+.. figure:: figures/bare-metal-install-beta-18.png
+   :scale: 100%
+   :alt: Testing Networking dialogue
+
+   Figure 18: Testing Networking dialogue
+
+.. note::
+
+   Any changes made to network settings are automatically tested
+   during configuration.
+
+Optional: Skip to `Finish installation`_.
+
+Bundle Selection
+================
+
+#. On the Advanced menu, select :guilabel:`Bundle Selection`
+
+#. Navigate to the desired bundle using :kbd:`Tab` or :kbd:`Up/Down` arrows.
+
+#. Select :kbd:`Spacebar` to select the checkbox for each desired bundle.
+
+   .. figure:: figures/bare-metal-install-beta-19.png
+      :scale: 100%
+      :alt: Bundle Selection
+
+      Figure 19: Bundle Selection
+
+#. Select :kbd:`Confirm` or :kbd:`Cancel`.
+
+   You are returned to the :guilabel:`Advanced options` menu.
+
+Optional: Skip to `Finish installation`_.
+
+User Manager
+============
+
+Add New User
+------------
+
+#. In Advanced Options, select :guilabel:`User Manager`.
+
+#. Select :guilabel:`Add New User` as shown in Figure 20.
+
+   .. figure:: figures/bare-metal-install-beta-20.png
+      :scale: 100%
+      :alt: Add New User, User Name
+
+      Figure 20: Add New User
+
+#. Optional: Enter a :guilabel:`User Name`.
+
+   .. note:
+
+      The User Name must be alphanumeric and can include spaces, commas, or hyphens. Maximum length is 64 characters.
+
+   .. figure:: figures/bare-metal-install-beta-21.png
+      :scale: 100%
+      :alt: User Name
+
+      Figure 21: User Name
+
+#. Enter a :guilabel:`Login`.
+
+   .. note::
+
+      The User Login must be alphanumeric and can include hyphens and underscores. Maximum length is 31 characters.
+
+#. Enter a :guilabel:`Password`.
+
+   .. note:
+
+      Minimum length is 8 characters. Maximum length is 255 characters.
+
+#. In :guilabel:`Retype`, enter the same password.
+
+#. Optional: Navigate to the :guilabel:`Administrative` checkbox and select
+   :kbd:`Spacebar` to assign administrative rights to the user.
+
+   .. note::
+
+      Selecting this option enables sudo privileges for the user.
+
+   .. figure:: figures/bare-metal-install-beta-22.png
+      :scale: 100%
+      :alt: Administrative rights
+
+      Figure 22: Administrative rights
+
+#. Select :kbd:`Confirm`.
+
+   .. note::
+
+      If desired, select :guilabel:`Reset` to reset the form.
+
+#. In :guilabel:`User Manager`, navigate to :guilabel:`Confirm`.
+
+#. With :guilabel:`Confirm` highlighted, select :kbd:`Enter`.
+
+Modify / Delete User
+--------------------
+
+#. In User Manager, select :guilabel:`Tab` to highlight the user, as shown
+   in Figure 23.
+
+#. Select :kbd:`Enter` to modify the user.
+
+   .. figure:: figures/bare-metal-install-beta-23.png
+      :scale: 100%
+      :alt: Modify User
+
+      Figure 23: Modify User
+
+#. Modify user details as desired.
+
+   Optional: To delete the user, navigate to the :guilabel:`Delete`
+   button and select :kbd:`Enter`
+
+#. Navigate to :kbd:`Confirm` until highlighted.
+
+   .. note::
+
+      Optional: Select :guilabel:`Reset` to rest the form.
+
+#. Select :guilabel:`Confirm` to save the changes you made.
+
+You are returned to the User Manager menu.
+
+Optional: Skip to `Finish installation`_.
+
+Kernel Command Line
+===================
+
+For advanced users, |CL| provides the ability to add or remove kernel
+arguments. If you want to append a new argument, enter the argument here.
+This argument will be used every time you install or update a
+new kernel.
+
+#. In Advanced Options, select :guilabel:`Tab` to highlight
+   :guilabel:`Kernel Command Line`.
+
+#. Select :kbd:`Enter`.
+
+#. To add or remove arguments, choose one of the following options.
+
+   .. figure:: figures/bare-metal-install-beta-24.png
+      :scale: 100%
+      :alt: kernel command line
+
+      Figure 24: kernel command line
+
+#. To add arguments, enter the argument in :guilabel:`Add Extra Arguments`.
+
+#. To remove an existing argument, enter the argument in
+   :guilabel:`Remove Arguments`.
+
+#. Select :kbd:`Confirm`.
+
+Optional: Skip to `Finish installation`_.
+
+Kernel Selection
+================
+
+#. Select a kernel option. By default, the latest kernel release is
+   selected. Native kernel is shown in Figure 25.
+
+#. To select a differnt kernel, navigate to it using :guilabel:`Tab`.
+
+   .. figure:: figures/bare-metal-install-beta-25.png
+      :scale: 100%
+      :alt: Kernel selection
+
+      Figure 25: Kernel selection
+
+#. Select :kbd:`Spacebar` to select the desired option.
+
+#. Select :kbd:`Confirm`.
+
+Optional: Skip to `Finish installation`_.
+
+Swupd Mirror
+============
+
+If you have your own custom mirror of |CL|, you can add its URL.
+
+#. In Advanced Options, select :guilabel:`Swupd Mirror`.
+
+#. To add a local swupd mirror, enter a valid URL in :guilabel:`Mirror URL:`
+
+#. Select :kbd:`Confirm`.
+
+   .. figure:: figures/bare-metal-install-beta-26.png
+      :scale: 100%
+      :alt: Swupd Mirror
+
+      Figure 26: Swupd Mirror
+
+Optional: Skip to `Finish installation`_.
+
+Assign Hostname
+===============
+
+#. In Advanced Options, select :guilabel:`Assign Hostname`.
+
+#. In :guilabel:`Hostname`, enter the hostname only (excluding the domain).
+
+   .. note::
+
+      Hostname does not allow empty spaces. Hostname must start with an
+      alphanumeric character but may also contain hyphens. Maximum length of
+      63 characters.
+
+   .. figure:: figures/bare-metal-install-beta-27.png
+      :scale: 100%
+      :alt: Assign Hostname
+
+      Figure 27: Assign Hostname
+
+
+#. Navigate to :kbd:`Confirm` until highlighted.
+
+#. Select :kbd:`Confirm`.
+
+Optional: Skip to `Finish installation`_.
+
+Automatic OS Updates
+====================
+
+In the rare case that you need to disable automatic software updates,
+follow the onscreen instructions.
+
+#. In Advanced Options, select :guilabel:`Automatic OS Updates`.
+
+#. Select the desired option.
+
+   .. figure:: figures/bare-metal-install-beta-28.png
+      :scale: 100%
+      :alt: Automatic OS Updates
+
+      Figure 28: Automatic OS Updates
+
+You are returned to the :guilabel:`Main Menu`.
+
+Finish installation
+*******************
+
+#. When you are satisfied with your installation configuration, navigate to
+   :guilabel:`Install` and select :kbd:`Enter`.
+
+   .. note::
+
+      When installation is finished, a ``reboot`` button appears.
+
+#. Select ``reboot``.
+
+#. When the system reboots, remove any installation media present.
+
+**Congratulations!**
+
+You have successfully installed |CL| on bare metal using the new installer.
+
+Next steps
+**********
+
+:ref:`enable-user-space`
+
+.. _Navigate to the image directory: https://download.clearlinux.org/image/
+.. _Autoproxy: https://clearlinux.org/features/autoproxy
+.. _telemetry: https://clearlinux.org/features/telemetry

source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst

@@ -1,36 +1,46 @@
 .. _bare-metal-install:
 
-Install |CL-ATTR| on bare metal (automatic)
-###########################################
+Install |CL-ATTR| on bare metal
+###############################
 
 These instructions guide you through the installation of |CL-ATTR|
 on bare metal using a bootable USB drive.
 
-Before you begin, check that your system meets the requirements to install |CL|: 
+.. contents::
+   :local:
+   :depth: 1
 
-* :ref:`system-requirements` 
+System requirements
+*******************
+
+Assure that your target system supports the installation:
+
+* :ref:`system-requirements`
 * :ref:`compatibility-check`
 
-
 Download the latest |CL| installer image
 ****************************************
 
-Get the latest |CL| installer image from the `image`_ directory.
-Look for the :file:`clear-[version number]-installer.img.xz` file. You can also use this command:
+Get the latest |CL| installer image from the `downloads page`_. See Figure 1.
+Look for the :file:`clear-[version number]-installer.img.xz` file.
+
+.. figure:: figures/bare-metal-install-1.png
+   :scale: 50%
+   :alt: Visit Downloads
+
+   Figure 1: Visit Downloads
+
+Optionally, you can use this command:
 
 .. code-block:: bash
-   
+
    curl -O https://download.clearlinux.org/image/$(curl https://download.clearlinux.org/image/latest-images | grep "installer")
 
-Once you have downloaded the image, verify and decompress the file.
+#. Follow your OS instructions to create a bootable USB drive.
 
-.. include:: ../../guides/maintenance/download-verify-decompress-linux.rst
-   :Start-after: incl-decompress-image:
-   :end-before: incl-decompress-image-end:
+   * :ref:`bootable-usb-beta-all`
 
-.. include:: ../bootable-usb/bootable-usb-linux.rst
-   :Start-after: copy-usb-linux:
-   :end-before: usb-next
+#. After downloading the image, verify and decompress the file per your OS.
 
 .. _install-on-target:
 
@@ -57,269 +67,21 @@ Follow these steps to install |CL| on the target system:
 
 #. Reboot the target system.
 
-#. The |CL| boot menu will start as shown in figure 1.
-   Select :guilabel:`Clear Linux OS for Intel Architecture` and press the
-   :kbd:`Enter` key or wait five seconds to automatically select it.
-
-   .. figure:: figures/bare-metal-install-1.png
-      :scale: 50 %
-      :alt: Boot menu
-
-      Figure 1: :guilabel:`Boot menu`
-
-#. This will take you into the |CL| installer menu as shown in figure 2 and explains how to
-   navigate through the |CL| installer setup menus.
+#. This action launches the |CL| installer boot menu, shown in figure 2.
 
    .. figure:: figures/bare-metal-install-2.png
-      :scale: 50 %
-      :alt: Installer menu
+      :scale: 100%
+      :alt: Clear Linux OS Installer boot menu
 
-      Figure 2: :guilabel:`Installer menu`
+      Figure 2: Clear Linux OS Installer boot menu
 
-   Press the :kbd:`Enter` key.
+#. With :guilabel:`Clear Linux OS` highlighted, select :kbd:`Enter`.
 
-#. The :guilabel:`Keyboard selection` menu shown in figure 3 allows you to set
-   up the keyboard layout that you will be using to navigate within the |CL|
-   installer setup menus.
+Your system will display the |CL| Installer.
 
-   .. figure:: figures/bare-metal-install-3.png
-      :scale: 50 %
-      :alt: Keyboard Selection
+.. include:: ../bare-metal-install-beta/bare-metal-install-beta.rst
+   :start-after: incl-bare-metal-beta-start:
 
-      Figure 3: :guilabel:`Keyboard Selection`
 
-   For this guide we will select :menuselection:`Keyboard Selection -->
-   < * us >` for the keyboard mapping, which should already be highlighted.
-   Press the :kbd:`Enter` key to continue to the next menu.
-
-Network requirements
-====================
-
-The :guilabel:`Network Requirements` menu, the first step of the |CL|
-installer setup process, will attempt to connect to the |CL| update server
-where the installer image is located. Once the connection to the |CL| update
-server is established, you will see a screen similar to the one shown in
-figure 4.
-
-.. figure:: figures/bare-metal-install-4.png
-   :scale: 50 %
-   :alt: Network Requirements
-
-   Figure 4: :guilabel:`Network Requirements`
-
-If you need to configure any :guilabel:`Proxy Settings` to gain access to the
-update server, enter the appropriate address and port of your proxy server in
-the :guilabel:`HTTPS proxy:` field.  Select the :guilabel:`< Set proxy
-configuration >` button and press :kbd:`Enter`. You will then see the
-connection to the update server established.
-
-Optionally, set up a :guilabel:`static IP configuration` to your |CL|
-installer image.  Enter the required information in the :guilabel:`Interface`,
-:guilabel:`IP address`, :guilabel:`Subnet mask`, :guilabel:`Gateway` and
-:guilabel:`DNS` fields and then select the :guilabel:`< Set static IP
-configuration >` button and press the :kbd:`Enter` key.
-
-The information displayed in the lower right quadrant of the screen shows the
-current IP configuration for the |CL| update server where the installer image
-is located.
-
-.. note::
-
-   If you are having difficulty establishing a connection to the update server
-   and you see the message :guilabel:`none detected, install will fail`, you
-   can press the :kbd:`Tab` key to highlight the :guilabel:`< Refresh >`
-   button and press :kbd:`Enter` to attempt to reconnect to the |CL| update
-   server. If this fails to establish a connection after multiple attempts,
-   reboot your system and return to this step.
-
-Once the connection to the |CL| udpate server is established, use the
-:kbd:`Tab` key to advance to the :guilabel:`< Next >` button and press
-:kbd:`Enter` to advance to the next |CL| installer setup menu.
-
-Choose |CL| installer action
-============================
-
-The :guilabel:`Choose Action` menu is where you can choose to install, repair,
-open a shell, or exit the |CL| installer.  This menu is shown in figure 5.
-
-.. figure:: figures/bare-metal-install-5.png
-   :scale: 50 %
-   :alt: Choose Action
-
-   Figure 5: :guilabel:`Choose Action`
-
-#. Select the :menuselection:`Choose action --> Install` menu item to continue
-   the installation process.
-
-   The :menuselection:`Choose action --> Repair` menu option will run the
-   :command:`swupd --fix` command to correct any issues found with the system
-   software that has already been installed on your system and correct any
-   issues found by overwriting the incorrect file content, adding missing
-   files, fixing permissions and any additional changes required to return the
-   file to it's original content and permissions.
-
-   The :menuselection:`Choose action --> Shell` menu item opens a terminal
-   session on your system as the root user and you will be able to manage your
-   system from this console.  When you are finished, type :command:`exit` to
-   return to the :guilabel:`Choose Action` menu.
-
-   The :menuselection:`Choose action --> Exit` menu option terminates the |CL|
-   installation process and the system will shut down.
-
-#. You will be prompted to join the :guilabel:`Stability Enhancement Program`
-   as shown in figure 6. Press the :kbd:`Spacebar` or :kbd:`Enter` key until
-   the cursor appears in the :guilabel:`[ ] Yes.` button. Press tab to highlight :guilabel:`< Next >`, and select Enter to advance.
-
-   .. figure:: figures/bare-metal-install-6.png
-      :scale: 50 %
-      :alt: Stability Enhancement Program
-
-      Figure 6: :guilabel:`Stability Enhancement Program`
-
-   If you choose not to enable this functionality during this step, you can
-   install the ``telemetrics`` software bundle at a later time. As stated in
-   the menu, this feature only collects anonymous information about your
-   system to help improve system stability and no personally identifiable
-   information is collected. Please visit our website to
-   `learn more about telemetry.`_
-
-Choose |CL| installation type
-*****************************
-
-Figure 7 shows the next step of the |CL| installer:
-:guilabel:`Choose installation Type`. Chose whether to install |CL|
-**automatically** or **manually**.  To end the installer process and shut down
-the system, select the :guilabel:`< Exit >` button.
-
-.. figure:: figures/bare-metal-install-7.png
-   :scale: 50 %
-   :alt: Choose installation type
-
-   Figure 7: :guilabel:`Choose installation Type`
-
-If you select :guilabel:`< Automatic >` as the installation type, the |CL|
-Installer will add the minimum amount of functionality required for a fully
-functional |CL| system. You will not be able to modify the disk layout, add
-a user or any other tasks that the manual installation process will allow.
-
-With the :guilabel:`< Manual(Advanced) >` option, you can do the following
-additional tasks during |CL| Installer setup:
-
-* Modify the disk layout using the cgdisk utility.
-* Add additional command-line parameters to the kernel.
-* Create a hostname for your system.
-* Create an administrative user.
-* Add additional software bundles to enhance the functionality of your initial
-  |CL| installation.
-* Optionally, set up a static IP address for your system.
-
-If you want to perform any of these additional tasks, select the
-:guilabel:`< Manual(Advanced) >` menu item and follow the steps in our
-:ref:`bare-metal-manual-install` to complete the |CL| manual installation
-process. Otherwise, you can follow the |CL| automatic installation steps.
-
-|CL| automatic installation
-***************************
-
-#. To install the minimum components for your |CL| implementation, select the
-   :guilabel:`< Automatic >` menu item shown in figure 7 and press the
-   :kbd:`Enter` key.
-
-   The :guilabel:`Choose target device for installation` screen shown in figure 8 appears.  
-
-#. Move the cursor to the desired target and press the :kbd:`Enter`
-   key.
-
-   .. figure:: figures/bare-metal-install-8.png
-      :scale: 50 %
-      :alt: Choose target device for installation
-
-   Figure 8: :guilabel:`Choose target device for installation`
-
-   In this example, we selected the single primary partition from our hard drive.
-
-   With all the |CL| installer setup information gathered for the automatic
-   installation option, the |CL| Installer prompts you to begin the actual
-   installation as shown in figure 9.
-
-   .. figure:: figures/bare-metal-install-9.png
-      :scale: 50 %
-      :alt: Begin installation
-
-   Figure 9: :guilabel:`Begin installation`
-
-#. When you are satisfied with the information you have entered, select the
-   :guilabel:`< Yes >` button and press :kbd:`Enter` to begin installing |CL|.
-
-   |CL| Installation begins and each step shows its status as it progresses
-   through the automated installation process.
-
-   Once all steps have completed, you will see the :guilabel:`Successful
-   installation` status message and the :guilabel:`< Ok >` button is highlighted as shown in figure 10. 
-
-#. Press the :kbd:`Enter` key to continue.
-
-   .. figure:: figures/bare-metal-install-10.png
-      :scale: 50 %
-      :alt: Installation complete
-
-      Figure 10: :guilabel:`Installation complete`
-
-   Figure 11 shows the final installer screen, showing that the
-   installation completed successfully and the system will reboot. 
-
-#. Press the :kbd:`Enter` key and remove the USB media while the system 
-   restarts. 
-
-   .. figure:: figures/bare-metal-install-11.png
-      :scale: 50 %
-      :alt: Successful installation
-
-      Figure 11: :guilabel:`Successful Installation`
-
-Set up your root account
-========================
-
-Once the |CL| installation is complete and the system boots, a full screen
-console requests your login as shown in figure 12:
-
-.. figure:: figures/bare-metal-install-12.png
-   :scale: 50 %
-   :alt: Login screen
-
-   Figure 12: :guilabel:`Login screen`
-
-#. At the initial login prompt, enter: ``root``
-
-#. Once prompted, enter a new password.
-
-#. Re-enter the password to verify it.
-
-You have now set your root password and are logged in with root privileges.
-
-**Congratulations!**
-
-You have successfully installed |CL| on a bare metal system using the
-automatic installation method and set the password for the ``root`` user.
-
-Next steps
-**********
-
-The automatic installation of |CL| is designed to install with minimal
-software overhead. Some housekeeping and package installations could be 
-needed before you can take full advantage of the |CL| operating system. 
-
-See the :ref:`enable-user-space` guide for additional information and
-instructions.
-
-
-.. _`information about stateless`:
-   https://clearlinux.org/features/stateless
-
-.. _`learn more about telemetry.`:
-   https://clearlinux.org/features/telemetry
-
-.. _`NUC6i5SYH product page`:
-   http://www.intel.com/content/www/us/en/nuc/nuc-kit-nuc6i5syh.html
-
-.. _image: https://download.clearlinux.org/image
+.. _Autoproxy: https://clearlinux.org/features/autoproxy
+.. _downloads page: https://clearlinux.org/downloads

source/clear-linux/get-started/bare-metal-manual-install/bare-metal-manual-install.rst

@@ -1,288 +0,0 @@
-.. _bare-metal-manual-install:
-
-Install |CL-ATTR| on bare metal (manual)
-#############################################
-
-This section contains the steps for a |CL-ATTR| manual installation. It
-picks up where the :ref:`bare-metal-install` left off.
-
-To perform additional tasks during the |CL| Installer setup, select the 
-:guilabel:`< Manual(Advanced) >` menu option (figure 1).  
-
-* :ref:`Modify the disk layout using the cgdisk utility<cgdisk-manual-install>`
-* Add additional command-line parameters to the kernel
-* Create a hostname for your system
-* Create an administrative user
-* Add additional software bundles to enhance the functionality of your
-  initial |CL| installation
-* Optionally set up a static IP address for your system
-
-Begin the manual installation process
-*************************************
-
-#. Move the cursor to the :guilabel:`< Manual(Advanced) >` menu item
-   and press the :kbd:`Enter` key.
-
-   .. figure:: figures/bare-metal-manual-install-1.png
-      :scale: 50 %
-      :alt: Choose installation Type
-
-   Figure 1: :guilabel:`Choose installation Type`
-
-#. The screen :guilabel:`Choose partitioning method` will
-   appear (figure 2).
-
-   .. figure:: figures/bare-metal-manual-install-2.png
-      :scale: 50 %
-      :alt: Choose partitioning method
-
-      Figure 2: :guilabel:`Choose partitioning method`
-
-   If your hard drive has already been partitioned for a Linux system, you 
-   can select the :guilabel:`< Use default partition and mount scheme on 
-   target device >` menu item and press :kbd:`Enter` to move to the next
-   step of the installer setup process.
-
-   .. _cgdisk-manual-setup:
-
-   Otherwise, to set up your hard drive partitions manually before moving to
-   the next step, select the :guilabel:`< Manually configure mounts and
-   partitions >` menu item and follow the instructions for :ref:`using CGDISK
-   to set up your Clear Linux hard drive<cgdisk-manual-install>`.
-
-.. _choose-target-device:
-
-Choose target device for installation
-=====================================
-
-The :guilabel:`Choose target device for installation` menu, shown in figure 
-3, displays the current device and partition information. In
-this example, ``/dev/sda`` is the only drive on the system with three
-partitions defined and assigned. The menu cursor highlights the partition
-to install |CL| onto.
-
-#. Select the :guilabel:`< Partition /dev/sda >` button and press the
-   :kbd:`Enter` key.
-
-   .. note::
-
-      To return to the previous menu, press the :kbd:`Tab` key
-      to highlight the :guilabel:`< Previous >` button and press :kbd:`Enter`
-      to return to the previous menu.
-
-   .. figure:: figures/bare-metal-manual-install-3.png
-      :scale: 50 %
-      :alt: Choose target device for installation
-
-      Figure 3: :guilabel:`Choose target device for installation`
-
-#. Next, you will be presented with a warning screen (figure 4) with
-   :guilabel:`< No >` highlighted by default. If this is the device onto
-   which you wish to install |CL|, press :kbd:`Tab` to highlight
-   the :guilabel:`< Yes >` button. 
-
-#. Press :kbd:`Enter` to proceed.
-
-   .. figure:: figures/bare-metal-manual-install-4.png
-      :scale: 50 %
-      :alt: Device installation warning
-
-      Figure 4: :guilabel:`Device installation warning`
-
-.. _incl-additional-manual-installer-settings:
-
-Additional manual installer settings
-====================================
-
-The next steps of the manual installer setup process allows you to:
-
-* Set up any additional command-line parameters to the kernel.
-* Create a hostname for your system.
-* Set up an administrative user.
-* Install additional software bundles.
-* Optionally create a static IP address for your system.
-
-#. The :guilabel:`Append to kernel cmdline` menu shown in figure 5 allows you
-   to add more options to the kernel command-line to further customize
-   your installation.  Normally this is not required; however, if there are
-   specific options that need to be set in the Linux kernel, you can enter
-   them here. For a complete list of command-line parameters for the Linux
-   kernel you can visit the official documentation of the `latest kernel's
-   command-line parameters`_.
-
-   Add any additional command-line parameters in the :guilabel:`Append to
-   cmdline:` field and then press the :kbd:`Tab` key to move to the
-   :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/bare-metal-manual-install-5.png
-      :scale: 50 %
-      :alt: Append to kernel cmdline
-
-      Figure 5: :guilabel:`Append to kernel cmdline`
-
-#. The :guilabel:`Configuring Hostname` menu shown in figure 6 suggests
-   a hostname string prefaced with "clr". You can make your hostname anything
-   meaningful and unique. Once complete, press the :kbd:`Tab` key to move to
-   the :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/bare-metal-manual-install-6.png
-      :scale: 50 %
-      :alt: Configure Hostname
-
-   Figure 6: :guilabel:`Configure Hostname`
-
-   To learn more about hostname naming conventions and restrictions, you can
-   check this `wiki page about hostnames`_.
-
-#. The :guilabel:`User configuration` menu shown in figure 7 allows you to
-   create a userid with administrative privileges. If you do not want to 
-   create a user at this time, select 
-   :guilabel:`< No user creation (login as root) >` to skip this step and
-   proceed to the :guilabel:`Bundle selector` menu.
-
-   .. figure:: figures/bare-metal-manual-install-7.png
-      :scale: 50 %
-      :alt: User configuration
-
-   Figure 7: :guilabel:`User configuration`
-
-   #. To create a userid, select the :guilabel:`< Create an administrative 
-      user >` field and press :kbd:`Enter` to go to the the next screen.
-   #. You will be presented with the second :guilabel:`User configuration` 
-      menu shown in figure 8. You are only required to fill in the
-      :guilabel:`Username`, :guilabel:`Password`, and :guilabel:`Confirm 
-      password` fields.
-   #. To give a user administrative privileges, press :kbd:`Tab` until
-      cursor appears in the field :guilabel:`Add user to the sudoers?` and
-      select. This adds the user to the ``wheel`` group and allows entry of 
-      the :command:`sudo` command.
-
-      After entering all data, press :kbd:`Tab` until :guilabel:`< Next >`
-      is highlighted. Then press :kbd:`Enter`.
-
-      .. figure:: figures/bare-metal-manual-install-8.png
-         :scale: 50 %
-         :alt: User configuration - create user
-
-      Figure 8: :guilabel:`User configuration - create user`
-
-#. In the menu :guilabel:`Bundle selector` (figure 9), you can add
-   software bundles to your initial |CL| installation. Press the :kbd:`Tab`
-   key to highlight additional bundles, and then press :kbd:`Spacebar` or 
-   :kbd:`Enter` to select each bundle. This menu will also list the
-   additional :guilabel:`--- required ---` software bundles that will be
-   installed during the |CL| installation.
-
-   .. figure:: figures/bare-metal-manual-install-9.png
-      :scale: 50 %
-      :alt: Bundle selector
-
-      Figure 9: :guilabel:`Bundle selector`
-
-For a complete description of the content of these additional bundles, go to
-the :ref:`software bundle list <bundles>` and select the name for a
-specific bundle to show the contents within the bundle.
-
-.. _incl-additional-manual-installer-settings-end:
-
-Target system network configuration
-===================================
-
-Before the actual |CL| installation begins, we must set up the
-:guilabel:`Network configuration` shown in figure 10. Select
-:guilabel:`< Use DHCP >` to have an IP address automatically assigned when
-the system boots up.
-
-.. figure:: figures/bare-metal-manual-install-10.png
-   :scale: 50 %
-   :alt: Network configuration
-
-   Figure 10: :guilabel:`Network configuration`
-
-You can optionally set up a static IP address for your system.  Select the
-:guilabel:`< Use static IP configuration >` menu item and fill in the
-required fields.
-
-Begin installation
-******************
-
-The |CL| installer is now ready to use the information you provided on the
-previous sections to begin the actual installation. Figure 11 shows the
-installer's prompt to begin the installation.
-
-.. figure:: figures/bare-metal-manual-install-11.png
-   :scale: 50 %
-   :alt: Begin installation
-
-   Figure 11: :guilabel:`Begin installation`
-
-When you are satisfied with the information entered, select the
-:guilabel:`< Yes >` button and press :kbd:`Enter` to begin installing |CL|.
-
-The |CL| Installation begins and each step shows its status as it progresses
-through the manual installation process as shown in figure 12.
-
-.. figure:: figures/bare-metal-manual-install-12.png
-   :scale: 50 %
-   :alt: Installation status
-
-   Figure 12: :guilabel:`Installation status`
-
-Once all steps have completed, you will see the ``Successful installation``
-status message and the :guilabel:`< Ok >` button is highlighted as shown in
-figure 13. Press the :kbd:`Enter` key to continue.
-
-.. figure:: figures/bare-metal-manual-install-13.png
-   :scale: 50 %
-   :alt: Installation complete
-
-   Figure 13: :guilabel:`Installation complete`
-
-Congratulations! The installation completed successfully and the system will
-reboot. Figure 14 shows the installer's final prompt. Press the :kbd:`Enter`
-key and remove the USB media while the system restarts.
-
-.. figure:: figures/bare-metal-manual-install-14.png
-   :scale: 50 %
-   :alt: Successful Installation
-
-   Figure 14: :guilabel:`Successful Installation`
-
-Once the system boots, the Gnome Desktop sign-in screen shown in figure 15
-appears:
-
-.. figure:: figures/bare-metal-manual-install-15.png
-   :scale: 50 %
-   :alt: Gnome sign-in screen
-
-   Figure 15: :guilabel:`Gnome sign-in screen`
-
-Click on the :guilabel:`username` you created, enter the password, and you
-will be logged into the system. The Gnome 3 desktop appears as shown in
-figure 16:
-
-.. figure:: figures/bare-metal-manual-install-16.png
-   :scale: 50 %
-   :alt: Gnome Desktop Manager
-
-   Figure 16: :guilabel:`Gnome Desktop Manager`
-
-**Congratulations!**
-
-You have successfully installed |CL| on a bare metal system using the
-manual installation method.
-
-Visit our :ref:`tutorials <tutorials>` section for examples on using your
-|CL| system.
-
-.. _`information about stateless`:
-   https://clearLinux.org/features/stateless
-
-.. _`wiki page about Hostnames`:
-   https://en.wikipedia.org/wiki/Hostname
-
-.. _`learn more about telemetry.`:
-   https://clearLinux.org/features/telemetry
-
-.. _`latest kernel's command-line parameters`:
-   https://www.kernel.org/doc/html/latest/admin-guide/kernel-parameters.html

source/clear-linux/get-started/bootable-usb/bootable-usb-beta-all.rst

@@ -0,0 +1,203 @@
+.. _bootable-usb-beta-all:
+
+Create a bootable USB on your OS
+################################
+
+Follow these instructions to create a bootable |CL-ATTR| USB drive based on
+your OS.
+
+* :ref:`bootable-usb-linux-all`
+* :ref:`bootable-usb-mac-all`
+* :ref:`bootable-usb-windows-all`
+
+Return to :ref:`get-started`
+
+Requirements:
+*************
+
+* Use a **16GB** or larger USB drive.
+
+.. _bootable-usb-linux-all:
+
+Create a bootable USB drive on Linux
+************************************
+
+.. include:: ../../guides/maintenance/download-verify-decompress-linux.rst
+   :Start-after: verify-linux:
+
+
+Burn the |CL| image onto a USB drive
+====================================
+
+.. caution::
+
+   |CAUTION-BACKUP-USB|
+
+#. Open a terminal emulator and get root privilege.
+
+   .. code-block:: bash
+
+      sudo -s
+
+#. Go to the directory with the decompressed image.
+#. Plug in the USB drive.
+#. Identify the USB drive using the :command:`lsblk` command. This shows all
+   drives attached to the system, including the primary hard disk. In the
+   example output below, there are 4 drives
+   (`/dev/sda`, `/dev/sdb`, `/dev/sdc`, and `/dev/sdd`) attached, where
+   `/dev/sda` is primary drive in this case. The remaining are 3 USB drives.
+   The output also shows the mounted partitions (under the `MOUNTPOINT`
+   column) for each drive.
+
+   .. code-block:: bash
+
+      lsblk
+
+   Example output:
+
+   .. code-block:: console
+
+      NAME   MAJ:MIN RM   SIZE RO TYPE MOUNTPOINT
+      sdd      8:48   1    15G  0 disk
+      ├─sdd2   8:50   1     5G  0 part /run/media/user1/960c184f-3bb7-42b7-bcaf-0c1282
+      ├─sdd3   8:51   1     8G  0 part /run/media/user1/704f3382-b26d-4f34-af1b-cb9aab
+      └─sdd1   8:49   1     2G  0 part
+      sdb      8:16   1  14.8G  0 disk
+      └─sdb1   8:17   1  14.8G  0 part /run/media/user1/PATRIOT_USB
+      sdc      8:32   1   7.3G  0 disk
+      └─sdc1   8:33   1   7.3G  0 part /run/media/user1/LINUX MINT
+      sda      8:0    0 335.4G  0 disk
+      ├─sda4   8:4    0    28G  0 part
+      ├─sda2   8:2    0   3.7G  0 part [SWAP]
+      ├─sda7   8:7    0     6G  0 part /home
+      ├─sda5   8:5    0     1G  0 part /boot
+      ├─sda3   8:3    0   954M  0 part /boot/efi
+      ├─sda1   8:1    0    28G  0 part
+      ├─sda8   8:8    0    30G  0 part /
+      └─sda6   8:6    0   7.9G  0 part [SWAP]
+
+#. Before an image can be burned onto a USB drive, it should be un-mounted.
+   Some Linux* distros may automatically mount a USB drive when it is plugged
+   in. To unmount, use the :command:`umount` command followed by the device
+   identifier/partition. For example: From the above :command:`lsblk` output,
+   `/dev/sdd` has 2 mounted partitions.  To unmount them, enter:
+
+   .. code-block:: bash
+
+      umount /dev/sdd2
+      umount /dev/sdd3
+
+#. Burn the image onto the USB drive. The command-line example below burns an
+   uncompressed image onto `/dev/sdd`:
+
+   .. code-block:: bash
+
+      dd if=./clear-[version number]-[image type] of=/dev/sdd bs=4M status=progress
+
+.. _bootable-usb-mac-all:
+
+Create a bootable USB drive on macOS*
+*************************************
+
+.. include:: ../../guides/maintenance/download-verify-decompress-mac.rst
+   :start-after: verify-mac:
+
+
+Burn the |CL| image onto a USB drive
+====================================
+
+.. caution::
+
+   |CAUTION-BACKUP-USB|
+
+#. Launch the Terminal app.
+#. Go to the directory with the decompressed image.
+#. Plug in a USB drive and get its identifier by entering the command
+   :command:`diskutil list`.  See Figure 1.
+
+   .. code-block:: console
+
+      diskutil list
+
+   .. figure:: figures/bootable-usb-mac-1.png
+      :scale: 100 %
+      :alt: Get USB drive identifier
+
+      Figure 1: macOS* - Get USB drive identifier
+
+#. Unmount the USB drive identified in the previous step.  The command-line
+   example below umounts `/dev/disk2`:
+
+   .. code-block:: console
+
+      diskutil umountDisk /dev/disk2
+
+#. Burn the image onto the drive using the :command:`dd` command.  The
+   command-line example below burns an uncompressed image onto `/dev/disk2`:
+
+   .. code-block:: console
+
+      sudo dd if=./clear-[version number]-[image type] of=/dev/rdisk2 bs=4m
+
+
+   Adding an ‘r’ in front of the disk identifier should help speed up the
+   imaging process.
+
+   You can press :kbd:`<CTL>-T` to check imaging progress.
+
+#. Eject the USB drive.
+
+   .. code-block:: console
+
+      diskutil eject /dev/disk2
+
+.. _bootable-usb-windows-all:
+
+Create a bootable USB drive on Windows\*
+****************************************
+
+.. include:: ../../guides/maintenance/download-verify-decompress-windows.rst
+   :Start-after: verify-windows:
+
+Burn the |CL| image onto a USB drive
+====================================
+
+.. caution::
+
+   |CAUTION-BACKUP-USB|
+
+#. Download the `Rufus`_ utility to burn the image onto a USB drive.
+
+#. Plug in the USB drive and open Rufus.
+
+#. Click the :guilabel:`SELECT` button. See Figure 1.
+
+   .. figure:: figures/bootable-usb-windows-1.png
+      :scale: 80 %
+      :alt: Rufus utility - Click the SELECT button
+
+      Figure 1: Rufus utility - Click the SELECT button
+
+#. Find and select the previously extracted |CL| image file.
+   Then, click the  :guilabel:`Open` button. See Figure 2.
+
+   .. figure:: figures/bootable-usb-windows-2.png
+      :scale:  80 %
+      :alt: Rufus utility - Show and select |CL| image file
+
+      Figure 2: Rufus utility - Show and select |CL| image file
+
+#. Click the :guilabel:`START` button. See Figure 3.
+
+   .. figure:: figures/bootable-usb-windows-3.png
+      :scale: 80 %
+      :alt: Rufus utility - Click the START button
+
+      Figure 3: Rufus utility - Click START button
+
+Return to install from live image
+*********************************
+
+Return to :ref:`get-started`
+
+.. _Rufus: https://rufus.ie/

source/clear-linux/get-started/cgdisk-manual-install/cgdisk-manual-install.rst

@@ -1,313 +0,0 @@
-.. _cgdisk-manual-install:
-
-Create partitions for |CL-ATTR| using CGDISK
-############################################
-
-These instructions guide you through the initial setup of your hard drive
-partitions using the :command:`cgdisk` utility . If you do not wish to continue 
-creating your own partitions, :ref:`return to the bare metal manual installation
-<bare-metal-manual-install>`.
-
-Prerequisites
-*************
-
-This guide assumes that you have followed the :ref:`bare-metal-install`
-guide and intend to :ref:`install Clear Linux manually
-<bare-metal-manual-install>` by choosing the :guilabel:`< Manual(Advanced) >`
-menu item on the :guilabel:`Choose Installation Type` |CL| Installer setup
-menu as shown in figure 1:
-
-.. figure:: figures/cgdisk-manual-install-1.png
-   :scale: 50 %
-   :alt: Choose installation Type
-
-   Figure 1: :guilabel:`Choose installation Type`
-
-Partition using CGDISK
-**********************
-
-We use the :command:`cgdisk` application to create a
-:abbr:`GPT (GUID Partition Table)` since |CL| only supports the
-:abbr:`UEFI (Unified Extensible Firmware Interface)` specification. For a
-complete description of the :command:`cgdisk` utility and how to use it,
-visit Rod Smith's website for a `GPT fdisk tutorial`_.
-
-In this guide, we intend to use an unpartitioned hard drive for the |CL|
-installation.
-
-#. To manually partition your hard drive, select 
-   :guilabel:`< Manually configure mounts and partitions >` in the menu
-   :guilabel:`Choose partitioning method`, shown in figure 2. 
-   
-   .. figure:: figures/cgdisk-manual-install-2.png
-      :scale: 50 %
-      :alt: Choose partitioning method
-
-      Figure 2: :guilabel:`Choose partitioning method`
-
-   Next, the current device available to partition is shown. In this
-   example, shown in figure 3, :file:`/dev/sda` is available but
-   does not have any partitions defined.
-
-#. Select the :guilabel:`< Partition /dev/sda >` menu item and press
-   :kbd:`Enter` to begin the process of modifying this disk.
-
-   .. figure:: figures/cgdisk-manual-install-3.png
-      :scale: 50 %
-      :alt: Choose a drive to partition using cgdisk tool
-
-      Figure 3: :guilabel:`Choose a drive to partition using cgdisk tool`
-
-   The :command:`cgdisk` application starts and displays the settings for
-   :file:`/dev/sda` as shown in figure 4.
-
-   .. figure:: figures/cgdisk-manual-install-4.png
-      :scale: 50 %
-      :alt: cgdisk
-
-      Figure 4: :guilabel:`cgdisk`
-
-Linux partition setup
-*********************
-
-In order to properly set up the |CL| partitioning scheme, we create three
-partitions using the :command:`cgdisk` utility in the following order:
-
-#. EFI boot partition
-#. Linux swap partition
-#. Linux root partition
-
-For a complete understanding of these partitions, you can review the
-`Linux partitioning scheme`_ information.
-
-Create the EFI boot partition
-=============================
-
-#. With the free space highlighted in the :command:`cgdisk` utility,
-   you can either select the :guilabel:`[ New ]` button and press :kbd:`Enter`
-   or press the :kbd:`N` key to define a new partition.
-
-   The utility prompts you to enter the first sector. Press the :kbd:`Enter`
-   key to accept the default value shown.
-
-   .. note::
-      In this example, the first sector starts at 2048. For more information
-      about alignment using the cgdisk tool, see
-      `Rod Smith's Partitioning Advice about alignment`_.
-
-#. The program then prompts you for the size of the partition. To create a
-   512MB partition, enter 512M and press :kbd:`Enter` as shown in figure 5:
-
-   .. figure:: figures/cgdisk-manual-install-5.png
-      :scale: 50 %
-      :alt: cgdisk - New
-
-      Figure 5: :guilabel:`cgdisk - New partition`
-
-#. To define the type of partition, the :command:`cgdisk` utility has
-   pre-defined partition types. Press the :kbd:`L` key to show the hex codes
-   you can use. Use these codes to set the correct
-   :abbr:`GUID (Globally unique identifier)` for *GPT partition types* as
-   shown in figure 6:
-
-   .. figure:: figures/cgdisk-manual-install-6.png
-      :scale: 50 %
-      :alt: cgdisk - hex codes for partition types
-
-      Figure 6: :guilabel:`cgdisk - hex codes for partition types`
-
-   We need to use the following three codes for our partitions:
-
-   * ef00 - EFI System
-   * 8200 - Linux swap
-   * 8300 - Linux filesystem
-
-#. To create the EFI boot partition, enter ``ef00`` as the hexcode for this
-   partition and press :kbd:`Enter`.
-
-#. To name the partition, enter ``boot`` and press :kbd:`Enter` to finish
-   setting up the EFI boot partition. The utility shows the first partition as
-   an ``EFI System`` 512MiB partition named ``boot`` as shown in figure 7:
-
-   .. figure:: figures/cgdisk-manual-install-7.png
-      :scale: 50 %
-      :alt: cgdisk - boot partition defined
-
-      Figure 7: :guilabel:`cgdisk - boot partition defined`
-
-Create the Linux swap partition
-===============================
-
-Next, we must create the Linux swap partition. In figure 7, notice the two
-areas defined as free space. We created the first 1007.0 KiB free space area
-when we started the EFI boot partition at sector 2048. For more information
-about it, review `Rod Smith's Partitioning advice about alignment`_.
-
-#. Move your cursor to highlight the larger free space of 334.8 GiB at the
-   bottom of the partition list before you begin to create the Linux swap
-   partition as shown in figure 8:
-
-   .. figure:: figures/cgdisk-manual-install-8.png
-      :scale: 50 %
-      :alt: cgdisk - free space selection
-
-      Figure 8: :guilabel:`cgdisk - free space selection`
-
-#. To create the Linux swap partition, with the largest free space
-   highlighted, select the :guilabel:`[ New ]` button or press the :kbd:`N`
-   key and enter the following values for the Linux swap partition:
-
-   .. code-block:: console
-
-      First sector:  press :kbd:`Enter` to select the default value
-      Size in sectors:  4G
-      Hex code or GUID:  8200
-      Enter new partition name:  swap
-
-   Your :command:`cgdisk` partition list should now look like figure 9.
-
-   .. figure:: figures/cgdisk-manual-install-9.png
-      :scale: 50 %
-      :alt: cgdisk - swap partition defined
-
-      Figure 9: :guilabel:`cgdisk - swap partition defined`
-
-Create the Linux filesystem partition
-=====================================
-
-Lastly, we must create the the Linux filesystem partition to use it as the
-root mount point for you |CL| installation.
-
-#. Highlight the largest free space entry at the bottom of the list and select
-   the :guilabel:`[ New ]` button or press the :kbd:`N` key and enter the
-   following values to create the Linux filesystem partition:
-
-   .. code-block:: console
-
-      First sector:  press :kbd:`Enter` to select the default value
-      Size in sectors:  press :kbd:`Enter` to select the default value, which
-                        is the remainder of available space on the disk
-      Hex code or GUID:  8300
-      Enter new partition name:  root
-
-   With all the partitions now defined, you should see a list similar to what
-   is shown in figure 10:
-
-   .. figure:: figures/cgdisk-manual-install-10.png
-      :scale: 50 %
-      :alt: cgdisk - defined partitions
-
-      Figure 10: :guilabel:`cgdisk - defined partitions`
-
-#. If you are satisfied that the partition scheme is correct, you need to
-   write this GPT to the hard drive. Select the :guilabel:`[ Write ]` button
-   or press the :kbd:`W` key and the :command:`cgdisk` program prompts with:
-
-   .. code-block:: console
-
-      Are you sure you want to write the partition table to disk? (yes or no)
-
-#. Enter ``yes`` and press :kbd:`Enter` to write this data to the hard drive
-   and then select the :guilabel:`[ Quit ]` button or press :kbd:`Q` to exit
-   the :command:`cgdisk` utility.
-
-#. You see the partitions that were created as shown in figure 11. Move your
-   cursor to the :guilabel:`< Next >` button and press :kbd:`Enter`.
-
-   .. figure:: figures/cgdisk-manual-install-11.png
-      :scale: 50 %
-      :alt: defined partitions
-
-      Figure 11: :guilabel:`defined partitions`
-
-Set the mount points
-********************
-
-The :guilabel:`Set mount points` menu sets the mount points that the |CL|
-installer uses for your |CL| installation, shown in figure 12.
-
-.. figure:: figures/cgdisk-manual-install-12.png
-   :scale: 50 %
-   :alt: Set mount points
-
-   Figure 12: :guilabel:`Set mount points`
-
-In this menu you need to set the mount points for the boot and root
-partitions and select to format them.
-
-#. Highlight the EFI System partition type menu entry and press the
-   :kbd:`Enter` key to edit this item. The :guilabel:`Set mount point of
-   sda1` menu is shown.
-
-   #. For :guilabel:`Enter mount point:` type `/boot` and press
-      :kbd:`Enter`.
-   #. Press Tab to enter the :guilabel:`[ ] Format` field. 
-   #. Press Enter/Spacebar to select :guilabel:`[ ] Format`, which allows
-      formatting of the partition. 
-      
-   Figure 13 shows the information entered.  Select :guilabel:`< Next >`
-   and press :kbd:`Enter`.
-
-   .. figure:: figures/cgdisk-manual-install-13.png
-      :scale: 50 %
-      :alt: Set mount point of sda1
-
-      Figure 13: :guilabel:`Set mount point of sda1`
-
-#. Do the same for the Linux filesystem partition by highlighting the
-   :guilabel:`Linux filesystem` menu entry and entering the information shown
-   in figure 14 to set the :guilabel:`Enter mount point:` to :file:`/` and
-   enable formatting:
-
-   .. figure:: figures/cgdisk-manual-install-14.png
-      :scale: 50 %
-      :alt: Set mount point of sda3
-
-      Figure 14: :guilabel:`Set mount point of sda3`
-
-#. Optional: Select :guilabel:`Encrypt Root Partition`, if
-   desired, as shown in figure 15. 
-
-   .. note:: 
-      `Set mount points` now show as completed. 
-   
-   .. figure:: figures/cgdisk-manual-install-15.png
-      :scale: 50 %
-      :alt: Encrypt root partition
-
-      Figure 15: :guilabel:`Encrypt root partition`
-
-#. Type a confirmation passphrase as directed.    
-
-   .. note: 
-
-      It is recommended to record the passphrase for safekeeping. 
-               
-   .. figure:: figures/cgdisk-manual-install-16.png
-      :scale: 50 %
-      :alt: Type confirmation passphrase
-
-      Figure 16: :guilabel: `Type confirmation passphrase`
-
-#. Select the :guilabel:`< Next >` button and press :kbd:`Enter`. 
-   
-   You have completed the process of manually partitioning your target
-   system. 
-
-#. Now, :ref:`return to the bare metal manual installation 
-   <bare-metal-manual-install>` to complete installation of |CL|.
-   
-   Continue at the section :ref:`Additional manual installer settings
-   <incl-additional-manual-installer-settings>`.
-
-.. _`GPT fdisk tutorial`:
-   http://www.rodsbooks.com/gdisk/
-
-.. _`Rod Smith's Partitioning Advice about alignment`:
-   http://www.rodsbooks.com/gdisk/advice.html#alignment
-
-.. _`information about swupd`:
-   https://clearlinux.org/features/software-update
-
-.. _`Linux partitioning scheme`:
-   https://wiki.archlinux.org/index.php/partitioning#Partition_scheme