three merge conflicts

fixed error

fix for TOC change

fix xref

fix xref

fix xref

added to path

another try

xref fix

fixed syntax

removing unneeded NOTE

Author: Audrey Spaulding

modules/virt-creating-vm-from-template.adoc

@@ -6,30 +6,33 @@
 [id="virt-creating-vm-from-template_{context}"]
 = Creating a VM from a template
 
-You can create a virtual machine (VM) from a template with an available boot source by using the {product-title} web console.
+You can create a virtual machine (VM) from a template with an available boot source by using the {product-title} web console. You can customize template or VM parameters, such as data sources, Cloud-init, or SSH keys, before you start the VM.
 
-Optional: You can customize template or VM parameters, such as data sources, cloud-init, or SSH keys, before you start the VM.
+You can choose between two views in the web console to create the VM:
+
+* A virtualization-focused view, which provides a concise list of virtualization-related options at the top of the view
+* A general view, which provides access to the various web console options, including *Virtualization*
 
 .Procedure
 
-. Navigate to *Virtualization* -> *Catalog* in the web console.
-. Click *Boot source available* to filter templates with boot sources.
+. From the {product-title} web console, choose your view:
+** For a virtualization-focused view, select *Administrator* -> *Virtualization* -> *Catalog*.
 +
-The catalog displays the default templates. Click *All Items* to view all available templates for your filters.
-
+** For a general view, navigate to *Virtualization* -> *Catalog*.
+. Click the *Template catalog* tab.
+. Click the *Boot source available* checkbox to filter templates with boot sources. The catalog displays the default templates.
+. Click *All templates* to view the available templates for your filters.
+** To focus on particular templates, enter the keyword in the `Filter by keyword` field.
+** Choose a template project from the *All projects* dropdown menu, or view all projects.
 . Click a template tile to view its details.
-. Optional: If you are using a Windows template, you can mount a Windows driver disk by selecting the *Mount Windows drivers disk* checkbox.
-. If you do not need to customize the template or VM parameters, click *Quick create VirtualMachine* to create a VM from the template.
-+
-If you need to customize the template or VM parameters, do the following:
-
-.. Click *Customize VirtualMachine*.
-.. Expand *Storage* or *Optional parameters* to edit data source settings.
-.. Click *Customize VirtualMachine parameters*.
+** Optional: If you are using a Windows template, you can mount a Windows driver disk by selecting the *Mount Windows drivers disk* checkbox.
+** If you do not need to customize the template or VM parameters, click *Quick create VirtualMachine* to create a VM from the template.
 +
-The *Customize and create VirtualMachine* pane displays the *Overview*, *YAML*, *Scheduling*, *Environment*, *Network interfaces*, *Disks*, *Scripts*, and *Metadata* tabs.
+** If you need to customize the template or VM parameters, do the following:
 
-.. Edit the parameters that must be set before the VM boots, such as cloud-init or a static SSH key.
+.. Click *Customize VirtualMachine*. The *Customize and create VirtualMachine* page displays the *Overview*, *YAML*, *Scheduling*, *Environment*, *Network interfaces*, *Disks*, *Scripts*, and *Metadata* tabs.
+.. Click the *Scripts* tab to edit the parameters that must be set before the VM boots, such as `Cloud-init`, `SSH key`, or `Sysprep` (Windows VM only).
+.. Optional: Click the *Start this virtualmachine after creation (Always)* checkbox.
 .. Click *Create VirtualMachine*.
 +
 The *VirtualMachine details* page displays the provisioning status.

modules/virt-customizing-vm-template-web.adoc

@@ -1,10 +1,10 @@
 // Module included in the following assemblies:
 //
-// * virt/virtual_machines/creating_vm/virt-creating-vms-from-templates.adoc
+// * virt/creating_vm/virt-creating-vms-from-templates.adoc
 
 :_mod-docs-content-type: PROCEDURE
 [id="virt-customizing-vm-template-web_{context}"]
-= Customizing a VM template by using the web console
+= Removing a deprecated designation from a customized VM template by using the web console
 
 You can customize an existing virtual machine (VM) template by modifying the VM or template parameters, such as data sources, cloud-init, or SSH keys, before you start the VM. If you customize a template by copying it and including all of its labels and annotations, the customized template is marked as deprecated when a new version of the Scheduling, Scale, and Performance (SSP) Operator is deployed.
 

modules/virt-storage-wizard-fields-web.adoc

@@ -1,6 +1,7 @@
 // Module included in the following assemblies:
 //
-// * virt/virtual_machines/creating_vm/virt-creating-vms-from-templates.adoc
+// * virt/creating_vm/virt-creating-vms-from-templates.adoc
+// * virt/managing_vms/virt-edit-vms.adoc
 
 [id="virt-storage-wizard-fields-web_{context}"]
 = Storage fields

modules/virt-vm-storage-volume-types.adoc

@@ -1,6 +1,7 @@
 // Module included in the following assemblies:
 //
-// * virt/virtual_machines/creating_vm/virt-creating-vms-from-templates.adoc
+// * virt/creating_vm/virt-creating-vms-from-templates.adoc
+// * virt/managing_vms/virt-edit-vms.adoc
 
 [id="virt-vm-storage-volume-types_{context}"]
 = Storage volume types

virt/creating_vm/virt-creating-vms-from-templates.adoc

@@ -11,31 +11,27 @@ You can create virtual machines (VMs) from Red Hat templates by using the {produ
 [id="virt-about-templates"]
 == About VM templates
 
-Boot sources::
+You can use VM templates to help you easily create VMs.
+
+Expedite creation with boot sources::
 You can expedite VM creation by using templates that have an available boot source. Templates with a boot source are labeled *Available boot source* if they do not have a custom label.
 +
 Templates without a boot source are labeled *Boot source required*. See xref:../../virt/storage/virt-automatic-bootsource-updates.adoc#virt-automatic-bootsource-updates[Managing automatic boot source updates] for details.
 
-Customization::
+Customize before starting the VM::
 You can customize the disk source and VM parameters before you start the VM.
 
-See xref:../../virt/creating_vm/virt-creating-vms-from-templates.adoc#virt-vm-storage-volume-types_virt-creating-vms-from-templates[storage volume types] and xref:../../virt/creating_vm/virt-creating-vms-from-templates.adoc#virt-storage-wizard-fields-web_virt-creating-vms-from-templates[storage fields] for details about disk source settings.
-
-
++
 [NOTE]
 ====
-If you copy a VM template with all its labels and annotations, your version of the template is marked as deprecated when a new version of the Scheduling, Scale, and Performance (SSP) Operator is deployed. You can remove this designation. See xref:../../virt/creating_vm/virt-creating-vms-from-templates.adoc#virt-customizing-vm-template-web_virt-creating-vms-from-templates[Customizing a VM template by using the web console].
+If you copy a VM template with all its labels and annotations, your version of the template is marked as deprecated when a new version of the Scheduling, Scale, and Performance (SSP) Operator is deployed. You can remove this designation. See xref:../../virt/creating_vm/virt-creating-vms-from-templates.adoc#virt-customizing-vm-template-web_virt-creating-vms-from-templates[Removing a deprecated designation from a customized VM template by using the web console].
 ====
 
 {sno-caps}::
 Due to differences in storage behavior, some templates are incompatible with {sno}. To ensure compatibility, do not set the `evictionStrategy` field for templates or VMs that use data volumes or storage profiles.
 
 include::modules/virt-creating-vm-from-template.adoc[leveloffset=+1]
 
-include::modules/virt-vm-storage-volume-types.adoc[leveloffset=+2]
-
-include::modules/virt-storage-wizard-fields-web.adoc[leveloffset=+2]
-
 include::modules/virt-customizing-vm-template-web.adoc[leveloffset=+2]
 
 include::modules/virt-creating-template.adoc[leveloffset=+2]