From 8d6c8a6998b22189bbd73ae5830cbc19b78c6266 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 5 Jul 2018 11:49:48 -0700 Subject: [PATCH] language cleanup --- .../v2.x/en/concepts/volumes-and-storage/_index.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md b/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md index 3be6cfa6209..a44e9f588e9 100644 --- a/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md +++ b/content/rancher/v2.x/en/concepts/volumes-and-storage/_index.md @@ -20,12 +20,9 @@ Storage Classes allow you to create PVCs dynamically without having to create PV ### Storage and Cloud Providers -<<<<<<< HEAD -Kubernetes (and therefore, Rancher) supports a wide variety of storage volume plugins, both on premise and in the cloud. -======= -Each storage class contains the fields `provisioner`, `parameters`, and `reclaimPolicy`, which are used when a PersistentVolume belonging to the class needs to be dynamically provisioned. +Each storage class contains the fields `provisioner`, `parameters`, and `reclaimPolicy`, which are used when a persistent volume that belongs to the class needs to be dynamically provisioned. -The `provisioner` determine which volume plugin will be used to provision the persistent volumes, Rancher allows the user to define storage classes for the following provisioners: +The `provisioner` determines which volume plugin is used to provision the persistent volumes. You can define storage classes for the following provisioners: - Amazon EBS Disk - AzureFile @@ -41,12 +38,11 @@ The `provisioner` determine which volume plugin will be used to provision the pe - StorageOS - Vmware vSphere Volume -In addition to customizing each provisioner options for the storage class, Rancher allows the user to specify the `reclaimPolicy` of the volume, there are two options available: +In addition to customizing each provisioner's options for the storage class, you can also define the volume `reclaimPolicy`. There are two options available: - Delete volumes and underlying device when released by workloads. - Retain the volume for manual cleanup. -Rancher also allow the user to specify custom `MountOptions` for the persistent volume created. +Finally, you can define custom `MountOptions` for the persistent volume created. -`parameters` are specific to each cloud storage provisioners, for full information about the storage classes provisioners parameters please refer to the official [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#parameters) ->>>>>>> Storage Classes with cloud provisioner +`parameters` are specific to each cloud storage provisioner. For full information about the storage classes provisioner parameters, refer to the official [Kubernetes documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/#parameters). \ No newline at end of file