Merge branch 'master' into release-1.12

content/en/docs/reference/glossary/container-env-variables.md

@@ -4,15 +4,14 @@ id: container-env-variables
 date: 2018-04-12
 full_link: /docs/concepts/containers/container-environment-variables.md
 short_description: >
-  Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
+  Container environment variables are name=value pairs that provide useful information into containers running in a Pod.
 
 aka: 
 tags:
 - fundamental
 ---
- Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
+ Container environment variables are name=value pairs that provide useful information into containers running in a Pod.
 
-<!--more--> 
-
-Container environment variables provide information that is required by the running containerized applications along with information about important resources to the [Containers] {{< glossary_tooltip text="Containers" term_id="container" >}}. For example, file system, information about the container itself and other cluster resources such as service endpoints, etc.
+<!--more-->
 
+Container environment variables provide information that is required by the running containerized applications along with information about important resources to the {{< glossary_tooltip text="Containers" term_id="container" >}}. For example, file system details, information about the container itself, and other cluster resources such as service endpoints.

content/en/docs/reference/glossary/quantity.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 title: Quantity
 id: quantity
@@ -28,3 +29,37 @@ intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
 
 The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
 `Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
+||||||| merged common ancestors
+=======
+---
+title: Quantity
+id: quantity
+date: 2018-08-07
+full_link:
+short_description: >
+  A whole-number representation of small or large numbers using SI suffixes.
+
+aka: 
+tags:
+- core-object
+---
+ A whole-number representation of small or large numbers using SI suffixes.
+
+<!--more-->
+
+Quantities are representations of small or large numbers using a compact,
+whole-number notation with SI suffixes.  Fractional numbers are represented
+using milli units, while large numbers can be represented using kilo,
+mega, or giga units.
+
+For instance, the number `1.5` is represented as `1500m`, while the number `1000`
+can be represented as `1k`, and `1000000` as `1M`. You can also specify
+binary-notation suffixes; the number 2048 can be written as `2Ki`.
+
+The accepted decimal (power-of-10) units are `m` (milli), `k` (kilo,
+intentionally lowercase), `M` (mega), `G` (giga), `T` (terra), `P` (peta),
+`E` (exa).
+
+The accepted binary (power-of-2) units are `Ki` (kibi), `Mi` (mebi), `Gi` (gibi),
+`Ti` (tebi), `Pi` (pebi), `Ei` (exbi).
+>>>>>>> master