Merge branch 'master' of https://github.com/mcwienczek/helm

docs/charts_hooks.md

@@ -87,7 +87,7 @@ in the future.) It is considered good practice to add a hook weight, and set it
 to `0` if weight is not important.
 
 
-### Hook resources are not managed with correponding releases
+### Hook resources are not managed with corresponding releases
 
 The resources that a hook creates are not tracked or managed as part of the
 release. Once Tiller verifies that the hook has reached its ready state, it
@@ -180,5 +180,4 @@ It is also possible to define policies that determine when to delete correspondi
     "helm.sh/hook-delete-policy": hook-succeeded
 ```
 
-When using `"helm.sh/hook-delete-policy"` annoation, you can choose its value from `"hook-succeeded"` and `"hook-failed"`. The value `"hook-succeeded"` specifies Tiller should delete the hook after the hook is successfully excuted, while the value `"hook-failed"`specifies Tiller should delete the hook if the hook is failed during execuation.
-
+When using `"helm.sh/hook-delete-policy"` annotation, you can choose its value from `"hook-succeeded"` and `"hook-failed"`. The value `"hook-succeeded"` specifies Tiller should delete the hook after the hook is successfully executed, while the value `"hook-failed"`specifies Tiller should delete the hook if the hook failed during execution.

docs/related.md

@@ -57,6 +57,7 @@ Tools layered on top of Helm or Tiller.
 - [Monocular](https://github.com/helm/monocular) - Web UI for Helm Chart repositories
 - [Helm Chart Publisher](https://github.com/luizbafilho/helm-chart-publisher) - HTTP API for publishing Helm Charts in an easy way
 - [Armada](https://github.com/att-comdev/armada) - Manage prefixed releases throughout various Kubernetes namespaces, and removes completed jobs for complex deployments. Used by the [Openstack-Helm](https://github.com/openstack/openstack-helm) team.
+- [ChartMuseum](https://github.com/chartmuseum/chartmuseum) - Helm Chart Repository with support for Amazon S3 and Google Cloud Storage
 
 ## Helm Included
 

pkg/chartutil/files.go

@@ -183,7 +183,7 @@ func ToYaml(v interface{}) string {
 // This is not a general-purpose YAML parser, and will not parse all valid
 // YAML documents. Additionally, because its intended use is within templates
 // it tolerates errors. It will insert the returned error message string into
-// m["error"] in the returned map.
+// m["Error"] in the returned map.
 func FromYaml(str string) map[string]interface{} {
 	m := map[string]interface{}{}
 
@@ -225,7 +225,7 @@ func ToJson(v interface{}) string {
 // This is not a general-purpose JSON parser, and will not parse all valid
 // YAML documents. Additionally, because its intended use is within templates
 // it tolerates errors. It will insert the returned error message string into
-// m["error"] in the returned map.
+// m["Error"] in the returned map.
 func FromJson(str string) map[string]interface{} {
 	m := map[string]interface{}{}