From 9b65f735b5deff0ce2f4ff5dc147bc9afc6daf45 Mon Sep 17 00:00:00 2001 From: Kristal Dale Date: Wed, 26 Sep 2018 14:36:16 -0700 Subject: [PATCH] VMware player instructions: replace steps list with local contents, remove CL images section and add link to images page in Download section. VMware ESXI install: remove duplicate sentence from intro. VMware ESXI preconf: move link to available images under download section for consistency. Signed-off-by: Kristal Dale --- .../vmw-player-preconf.rst | 18 ++++----------- .../virtual-machine-install/vmw-player.rst | 22 ++++--------------- .../vmware-esxi-install-cl.rst | 3 --- .../vmware-esxi-preconfigured-cl-image.rst | 3 ++- source/clear-linux/reference/image-types.rst | 14 ++++++------ 5 files changed, 17 insertions(+), 43 deletions(-) diff --git a/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst b/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst index 5ce4bc4d..8421f358 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmw-player-preconf.rst @@ -13,14 +13,8 @@ VMware Workstation 14 Player. In this tutorial, we perform the following steps: -#. Install the VMware Workstation Player hypervisor -#. Download the latest |CL| pre-configured image -#. VMware image Verify the integrity of the |CL| image -#. Uncompress the |CL| image -#. Create and configure a new VM -#. Attach the pre-configured VMware |CL| image -#. Enable EFI boot support -#. Power on the VM +.. contents:: :local: + :depth: 1 .. note:: @@ -61,12 +55,6 @@ Install the VMware Workstation Player hypervisor For additional help, see the `VMware Workstation Player guide`_. -|CL| image types -**************** - -.. include:: ../../reference/image-types.rst - :Start-after: image-types-content: - Download the latest |CL| VMware image ************************************* @@ -78,6 +66,8 @@ this command: curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-vmware.vmdk.xz +Visit :ref:`image-types` for additional information about all available |CL| images. + .. include:: ../../guides/maintenance/download-verify-uncompress-windows.rst :Start-after: verify-windows: diff --git a/source/clear-linux/get-started/virtual-machine-install/vmw-player.rst b/source/clear-linux/get-started/virtual-machine-install/vmw-player.rst index e9ff7a0e..6272e499 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmw-player.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmw-player.rst @@ -15,17 +15,8 @@ size, number of partitions, installed bundles, etc. In this tutorial, we perform the following steps: -#. Install the VMware Workstation Player hypervisor -#. Download the latest |CL| installer ISO -#. Verify the integrity of the |CL| image -#. Uncompress the |CL| image -#. Create and configure a new VM -#. Attach the |CL| installer ISO to the VM -#. Install |CL| into the new VM -#. Detach the |CL| installer ISO from the VM -#. Power off the VM -#. Enable EFI boot support -#. Power on the VM +.. contents:: :local: + :depth: 1 If you prefer to use a pre-configured |CL| VMware image instead, see our :ref:`vmw-player-preconf` guide. @@ -71,19 +62,14 @@ Install the VMware Workstation Player hypervisor For additional help, see the `VMware Workstation Player guide`_. -|CL| image types -**************** - -.. include:: ../../reference/image-types.rst - :Start-after: image-types-content: - - Download the latest |CL| installer ISO ************************************** Get the latest |CL| installer ISO image from the `image`_ repository. Look for :file:`clear-[version number]-installer.iso.xz`. +Visit :ref:`image-types` for additional information about all available |CL| images. + .. include:: ../../guides/maintenance/download-verify-uncompress-windows.rst :Start-after: verify-windows: diff --git a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-install-cl.rst b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-install-cl.rst index ec9bd142..e056191f 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-install-cl.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-install-cl.rst @@ -10,9 +10,6 @@ run |CL-ATTR| virtual machines in the cloud. This section shows you how to create a new :abbr:`VM (Virtual Machine)` and manually install |CL| into it with VMware ESXi 6.5. -If you would prefer to use a preconfigured |CL| VMware disk image -instead, see :ref:`vmware-esxi-preconfigured-cl-image`. - Manually installing |CL| into a new VM provides you some additional configuration flexibility during installation. For example: alternate disk sizes, number of partitions, pre-installed bundles, etc. diff --git a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst index d076d7d8..709e5503 100644 --- a/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst +++ b/source/clear-linux/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst @@ -21,7 +21,6 @@ VMware ESXi :abbr:`VM (Virtual Machine)` instead, see See :ref:`vmw-player-preconf` or see :ref:`vmw-player`. - Visit :ref:`image-types` to learn more about all available images. Install steps: @@ -39,6 +38,8 @@ this command: curl -O https://download.clearlinux.org/image/clear-$(curl https://download.clearlinux.org/latest)-vmware.vmdk.xz +Visit :ref:`image-types` for additional information about all available |CL| images. + .. include:: ../../guides/maintenance/download-verify-uncompress-linux.rst :Start-after: verify-linux: :end-before: To uncompress a GZ diff --git a/source/clear-linux/reference/image-types.rst b/source/clear-linux/reference/image-types.rst index 50f81dfc..e3d94205 100644 --- a/source/clear-linux/reference/image-types.rst +++ b/source/clear-linux/reference/image-types.rst @@ -1,11 +1,11 @@ .. _image-types: -Clear Linux\* image types +|CL-ATTR| image types ######################### .. _image-types-content: -|CLOSIA| offers many types of `images`_ for different platforms and environments. +|CL-ATTR| offers many types of `images`_ for different platforms and environments. .. _incl-image-filename: @@ -28,7 +28,7 @@ The naming convention of a |CL| image filename is: Table 1 lists the currently available images that are platform independent. Table 2 lists the currently available images that are platform specific. -.. list-table:: Table 1: Types of platform-independent Clear Linux images +.. list-table:: Table 1: Types of platform-independent |CL| images :widths: 15, 85 :header-rows: 1 @@ -36,15 +36,15 @@ Table 2 lists the currently available images that are platform specific. - Description * - installer.img - - Preferred image of Clear Linux with interactive installer. + - Preferred image of |CL| with interactive installer. * - installer.iso - - ISO of Clear Linux with interactive installer. Only for special cases where ISO image format is required (not for use with a USB key) + - ISO of |CL| with interactive installer. Only for special cases where ISO image format is required (not for use with a USB key) * - live.img - - image for live booting into memory, without requiring installaton. + - Image for live booting into memory, without requiring installaton. -.. list-table:: Table 2: Types of platform-specific Clear Linux images +.. list-table:: Table 2: Types of platform-specific |CL| images :widths: 15, 85 :header-rows: 1