Skip to content

Commit

Permalink
merge conflicts that got away
Browse files Browse the repository at this point in the history
  • Loading branch information
ousleyp committed Feb 5, 2019
1 parent 1b8713c commit e6098f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions modules/cnv_creating_vm_web_console.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ interface and logical network later in the *Networking* tab.
*URL*:: Provide the address of a disk image accessible from
{product-title}. RAW and QCOW2 formats are supported.
You can compress either format with *gzip* or *xz*.
`Container`:: Provide a container containing a bootable operating system in a
*Container*:: Provide a container containing a bootable operating system in a
registry accessible from {product-title}. A *containerDisk*
volume is ephemeral, and the volume is discarded when the virtual machine
is stopped, restarted, or deleted.
* Example: `<kubevirt/fedora-cloud-container-disk-demo>`
`Template`:: Create a new virtual machine from a VM template that you imported
*Template*:: Create a new virtual machine from a VM template that you imported
by using the *Import VM* APB. No other templates are supported.

. Next, select the operating system, flavor, and workload profile
Expand Down
2 changes: 1 addition & 1 deletion modules/cnv_vm_storage_volume_types.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ disk.
References an image, such as a virtual machine disk, that is stored in
the container image registry. The image is pulled from the registry and
embedded in a volume when the virtual machine is created. A
`containerDisk` volume is ephemeral. It is discarded when
*containerDisk* volume is ephemeral. It is discarded when
the virtual machine is stopped, restarted, or deleted.
+
Container disks are not limited to a single virtual machine and are
Expand Down

0 comments on commit e6098f5

Please sign in to comment.