From 4fa1ca1fe13296ad8f8e39ff091656f0ef2c5762 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Tue, 22 Jan 2019 16:18:00 -0800 Subject: [PATCH] bare-metal-install-beta: Demoves target-labels above headers. bare-metal-install: Adds Autoproxy link. bootable-usb-beta-all: Removes cross-references to live install image. Signed-off-by: Michael Vincerra --- .../bare-metal-install-beta.rst | 63 ++++++------------- .../bare-metal-install/bare-metal-install.rst | 2 +- .../bootable-usb/bootable-usb-beta-all.rst | 26 ++++---- 3 files changed, 33 insertions(+), 58 deletions(-) diff --git a/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst b/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst index 9f3a3f4b..bbaba1c6 100644 --- a/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst +++ b/source/clear-linux/get-started/bare-metal-install-beta/bare-metal-install-beta.rst @@ -36,8 +36,6 @@ Preliminary steps * :ref:`bootable-usb-mac-all` * :ref:`bootable-usb-windows-all` -.. _install-from-live-image: - Install from live image *********************** @@ -82,26 +80,22 @@ Launch the installer Figure 2: Clear Linux OS Installer -.. _minimum-installation-requirements: - Minimum installation requirements ********************************* To fulfill minimum installation requirements, complete the -:guilabel:`Required options`. :guilabel:`Advanced options` are optional. +`Required options`_. `Advanced options`_ are optional. .. note:: * The :kbd:`Install` button is only highlighted **after** you complete the - :ref:`required-options-installation`, and after you enter required - values in submenus of :ref:`required-options-installation` and - :ref:`advanced-options-installation`. + `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 :ref:`test-network-settings` before you - :ref:`configure-network-interfaces`. Assure that a ``Success`` message is received before installation. + * You may wish to `Test Network Settings`_ before you + `Configure Network Interfaces`_. Assure that a ``Success`` message is received before installation. Main Menu ********* @@ -133,8 +127,6 @@ Navigation * Select :kbd:`Cancel` or :kbd:`Esc` to cancel your choice. -.. _required-options-installation: - Required options **************** @@ -186,7 +178,6 @@ Choose Language Figure 5: Select System Language - Configure the Keyboard ====================== @@ -249,12 +240,10 @@ Configure Media #. Select :kbd:`Enter` to :kbd:`Confirm`. -#. Choose one partitioning option and continue below: +#. Choose one partitioning method and continue below: - * :ref:`auto-partition` - * :ref:`add-partition` - -.. _auto-partition: + * `Auto Partition`_ + * `Add Partition`_ Auto Partition ============== @@ -276,14 +265,14 @@ Auto partition will configure the media to meet the minimum requirements. Figure 8: Auto Partition -#. You may skip to the :ref:`telemetry-tui` section below. +#. 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 -below to encrypt :ref:`encrypt-root`. Encryption is optional. +in `root partition`_ below. Encryption is optional. Encryption Passphrase --------------------- @@ -300,8 +289,6 @@ post-installation using the ``cryptsetup`` tool. :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: - Add Partition ============= @@ -378,8 +365,6 @@ swap partition Figure 10: swap partition -.. _encrypt-root: - root partition -------------- @@ -447,8 +432,6 @@ root partition #. Select :guilabel:`Enter` to complete adding partitions. -.. _telemetry-tui: - Telemetry ========= @@ -474,19 +457,15 @@ Skip to finish installation =========================== After selecting values for all :guilabel:`Required options`, you may skip -directly to :ref:`finish-cl-installation`. +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-installation: - Advanced Options **************** -.. _configure-network-interfaces: - Configure Network Interfaces ============================ @@ -547,7 +526,7 @@ interface settings are automatically applied. #. Navigate to and select :guilabel:`Main Menu`. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Proxy ===== @@ -575,9 +554,7 @@ instruction. #. To revert to previous settings, navigate to :guilabel:`Cancel` and select :guilabel:`Cancel`. -Optional: :ref:`Skip to finish installation `. - -.. _test-network-settings: +Optional: Skip to `Finish installation`_. Test Network Settings ===================== @@ -598,7 +575,7 @@ A progress bar appears as shown in Figure 18. Any changes made to network settings are automatically tested during configuration. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Bundle Selection ================ @@ -619,7 +596,7 @@ Bundle Selection You are returned to the :guilabel:`Advanced options` menu. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. User Manager ============ @@ -715,7 +692,7 @@ Modify / Delete User You are returned to the User Manager menu. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Kernel Command Line =================== @@ -745,7 +722,7 @@ new kernel. #. Select :kbd:`Confirm`. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Kernel Selection ================ @@ -765,7 +742,7 @@ Kernel Selection #. Select :kbd:`Confirm`. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Swupd Mirror ============ @@ -784,7 +761,7 @@ If you have your own custom mirror of |CL|, you can add its URL. Figure 26: Swupd Mirror -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Assign Hostname =============== @@ -810,7 +787,7 @@ Assign Hostname #. Select :kbd:`Confirm`. -Optional: :ref:`Skip to finish installation `. +Optional: Skip to `Finish installation`_. Automatic OS Updates ==================== @@ -830,8 +807,6 @@ follow the onscreen instructions. You are returned to the :guilabel:`Main Menu`. -.. _finish-cl-installation: - Finish installation ******************* diff --git a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst index 5c377195..79d06bbc 100644 --- a/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst +++ b/source/clear-linux/get-started/bare-metal-install/bare-metal-install.rst @@ -80,5 +80,5 @@ Follow these steps to install |CL| on the target system: :start-after: minimum-installation-requirements: :end-before: incl-bare-metal-beta-end: - +.. _Autoproxy: https://clearlinux.org/features/autoproxy .. _downloads page: https://clearlinux.org/downloads \ No newline at end of file diff --git a/source/clear-linux/get-started/bootable-usb/bootable-usb-beta-all.rst b/source/clear-linux/get-started/bootable-usb/bootable-usb-beta-all.rst index 6f26d650..5c5d3014 100644 --- a/source/clear-linux/get-started/bootable-usb/bootable-usb-beta-all.rst +++ b/source/clear-linux/get-started/bootable-usb/bootable-usb-beta-all.rst @@ -3,19 +3,19 @@ Create a bootable USB on your OS ################################ -Follow these instructions to create a bootable |CL-ATTR| USB drive based on +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:`install-from-live-image` +Return to :ref:`get-started` -Requirements: +Requirements: ************* -* Use a **16GB** or larger USB drive. +* Use a **16GB** or larger USB drive. .. _bootable-usb-linux-all: @@ -43,8 +43,8 @@ Burn the |CL| image onto a USB drive #. 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 + 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. @@ -132,7 +132,7 @@ Burn the |CL| image onto a USB drive diskutil umountDisk /dev/disk2 -#. Burn the image onto the drive using the :command:`dd` command. The +#. 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 @@ -140,9 +140,9 @@ Burn the |CL| image onto a USB drive 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 + Adding an ‘r’ in front of the disk identifier should help speed up the imaging process. - + You can press :kbd:`-T` to check imaging progress. #. Eject the USB drive. @@ -178,7 +178,7 @@ Burn the |CL| image onto a USB drive Figure 1: Rufus utility - Click the SELECT button -#. Find and select the previously extracted |CL| image file. +#. 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 @@ -186,18 +186,18 @@ Burn the |CL| image onto a USB drive :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:`install-from-live-image` +Return to :ref:`get-started` .. _Rufus: https://rufus.ie/