Create v1.14 docs branch and merge initial content (#574)

Signed-off-by: Pete Lumbis <[email protected]>

content/master/concepts/packages.md

@@ -81,7 +81,7 @@ configuring the Crossplane Pod settings in the
 Provide the name of the Configuration's `.xpkg` file and set 
 {{<hover label="offline" line="7">}}packagePullPolicy: Never{{</hover>}}.
 
-For example, to install a locally stored version of 
+For example, to install a locally downloaded version of 
 Upbound AWS reference platform set the 
 {{<hover label="offline" line="6">}}package{{</hover>}} to the local filename
 and set the Configuration's

content/v1.14/concepts/compositions.md

@@ -1290,8 +1290,13 @@ Composition.
 
 ## Composition validation
 
+<<<<<<< HEAD
 When creating a Composition, Crossplane automatically validates its integrity,
 checking that the Composition is well formed, for example:
+=======
+When creating a Composition Crossplane automatically validates specific
+parameters in the Composition.
+>>>>>>> bf5e306 (Create v1.14 docs branch and merge initial content (#574))
 
 * All resources either use a `name` or don't. Compositions can't use both named
   and unnamed resources.
@@ -1308,6 +1313,7 @@ checking that the Composition is well formed, for example:
 * Composition function `type` is `container`.
 * Composition function names are unique.
 
+<<<<<<< HEAD
 ### Composition schema aware validation
 
 Crossplane also performs schema aware
@@ -1361,17 +1367,57 @@ If not specified, the default mode is `warn`.
 
 For example, to enable `loose` mode checking set the annotation value to
 {{<hover label="mode" line="5">}}loose{{</hover>}}.
+=======
+### Resource schema validation
+<!-- vale write-good.TooWordy = NO -->
+Optionally, Crossplane can also validate the schema of the resources defined
+inside a Composition. This verifies that the resource `apiVersion` and `kinds`
+are valid. 
+<!-- vale write-good.TooWordy = YES -->
+
+Enable "schema validation" with the
+`--enable-composition-webhook-schema-validation` flag on the Crossplane pod.
+The [Crossplane Pods]({{<ref "./pods#edit-the-deployment">}}) page has
+more information on enabling Crossplane flags.
+
+{{<hint "note" >}}
+<!-- vale write-good.TooWordy = NO -->
+Schema validation only checks the `apiVersion` and `kind` are valid. Schema
+validation doesn't validate the fields of a specific resource.
+<!-- vale write-good.TooWordy = YES -->
+{{< /hint >}}
+
+The default validations are still checked with schema validation enabled. 
+#### Validation modes
+
+Schema validation supports two modes:
+* `loose` (default) - Sends an warning for each schema error and installs the 
+  Composition if the default validations pass. 
+* `strict` - Send an error for every schema validation error and rejects the
+  Composition. 
+
+Change the validation mode for a Composition with the
+{{<hover label="mode" line="5">}}crossplane.io/composition-validation-mode{{</hover>}} 
+annotation. 
+
+For example, to enable `strict` mode checking:
+>>>>>>> bf5e306 (Create v1.14 docs branch and merge initial content (#574))
 
 ```yaml {copy-lines="none",label="mode"}
 apiVersion: apiextensions.crossplane.io/v1
 kind: Composition
 metadata:
   annotations:
+<<<<<<< HEAD
     crossplane.io/composition-schema-aware-validation-mode: loose
+=======
+    crossplane.io/composition-validation-mode: strict
+>>>>>>> bf5e306 (Create v1.14 docs branch and merge initial content (#574))
   # Removed for brevity
 spec:
   # Removed for brevity
 ```
+<<<<<<< HEAD
 
 {{<hint "important" >}}
 Validation modes also apply to Compositions defined by Configuration packages.
@@ -1385,3 +1431,5 @@ Crossplane sets a Configuration as unhealthy if there are validation errors.
 View the Configuration details with `kubectl describe configuration` to see the
 specific errors.
 {{< /hint >}}
+=======
+>>>>>>> bf5e306 (Create v1.14 docs branch and merge initial content (#574))