From 5fc6d3493d16adf060332e1e14aa6e53d74b3a5b Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 14:24:39 -0800
Subject: [PATCH 1/5] Adding documentation about type registries.

---
 docs/types/registry.md | 82 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 docs/types/registry.md

diff --git a/docs/types/registry.md b/docs/types/registry.md
new file mode 100644
index 000000000..ca5859ff7
--- /dev/null
+++ b/docs/types/registry.md
@@ -0,0 +1,82 @@
+# Type Registry
+
+The Deployment Manager client allows you to deploy
+[template types](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#templates)
+directly from a Github repository. In order for a repository to integrate with
+Deployment Manager, it must store Deployment Manager templates in a manner that
+conforms to the required **Type Registry** structure detailed below.
+
+## File structure
+The repository must use the following file structure to store Deployment
+Manager template types:
+
+```
+<repository root>/
+  types/
+    <type-1>/
+      <version-1>/
+        <type-files>
+      <version-2>/
+        ...
+    <type-2>/
+      ...
+```
+
+## Versions
+Each type may contain any number of versions. Versions may be as simple as
+`v1`, `latest`, or `head`, or may be more complex to contain major and minor
+version numbers. Version format is user-defined.
+
+## Type files
+Each type version must contain a top-level Deployment Manager template, named
+either `<type-name>.py` or `<type-name>.jinja`, depending on the templating
+language used for the type.
+
+A
+[template schema](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#template-schemas)
+must also be present, named `<template>.schema`. Other files
+may exist as part of the type and imported through the schema, including
+sub-templates, data files, or other metadata used by the template.
+
+## Test Configuration
+Each type version should include an example YAML configuration called
+`example.yaml` to be used for deploying an instance of the type. This is useful
+for development purposes.
+
+## Sample Registry
+An example of a valid type registry repository looks like:
+
+```
+/
+  types/
+    redis/
+      v1/
+        example.yaml
+        redis.jinja
+        redis.jinja.schema
+    replicatedservice/
+      v1/
+        example.yaml
+        replicatedservice.py
+        replicatedservice.py.schema
+```
+
+For a working example of a type registry, please see the
+[kubernetes/deployment-manager registry](https://github.com/kubernetes/deployment-manager/tree/master/types).
+
+## Using Types
+The Deployment Manager client can deploy types directly from a registry with
+the following command:
+
+```
+$ dm deploy <type-name>:<version>
+```
+
+This will default to the type registry in the kubernetes/deployment-manager
+Github repository. You can change this to another repository that contains a
+registry with the `--registry` flag:
+
+```
+$ dm --registry my-repo/registry deploy <type-name>:<version>
+```
+

From b9f135aa8fba2d74870aa005ed1d52d6abf96842 Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 14:30:49 -0800
Subject: [PATCH 2/5] Some minor cleanups on the registry doc.

---
 docs/types/registry.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/docs/types/registry.md b/docs/types/registry.md
index ca5859ff7..1be251cef 100644
--- a/docs/types/registry.md
+++ b/docs/types/registry.md
@@ -2,16 +2,19 @@
 
 The Deployment Manager client allows you to deploy
 [template types](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#templates)
-directly from a Github repository. In order for a repository to integrate with
-Deployment Manager, it must store Deployment Manager templates in a manner that
-conforms to the required **Type Registry** structure detailed below.
+directly from a Github repository. You can use types from existing registries
+or integrate with your own repository.
+
+In order for a Github repository to integrate with Deployment Manager, it must
+store Deployment Manager templates in a manner that conforms to the required
+**Type Registry** structure detailed in this document.
 
 ## File structure
 The repository must use the following file structure to store Deployment
 Manager template types:
 
 ```
-<repository root>/
+<repository-root>/
   types/
     <type-1>/
       <version-1>/
@@ -34,9 +37,9 @@ language used for the type.
 
 A
 [template schema](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#template-schemas)
-must also be present, named `<template>.schema`. Other files
-may exist as part of the type and imported through the schema, including
-sub-templates, data files, or other metadata used by the template.
+must also be present, named `<template>.schema` (e.g., `my-template.py.schema`).
+Other files may exist as part of the type and imported through the schema,
+including sub-templates, data files, or other metadata used by the template.
 
 ## Test Configuration
 Each type version should include an example YAML configuration called
@@ -55,7 +58,7 @@ An example of a valid type registry repository looks like:
         redis.jinja
         redis.jinja.schema
     replicatedservice/
-      v1/
+      v3/
         example.yaml
         replicatedservice.py
         replicatedservice.py.schema
@@ -80,3 +83,8 @@ registry with the `--registry` flag:
 $ dm --registry my-repo/registry deploy <type-name>:<version>
 ```
 
+For types that require properties:
+
+```
+$ dm --properties prop1=value1,prop2=value2 deploy <type-name>:<version>
+

From 0add022e4b95c68ea8c95f8364c0b695a740bc6c Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 15:00:45 -0800
Subject: [PATCH 3/5] Adding semantic versioning to registry doc.

---
 docs/types/registry.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/types/registry.md b/docs/types/registry.md
index 1be251cef..9e25797d3 100644
--- a/docs/types/registry.md
+++ b/docs/types/registry.md
@@ -26,9 +26,8 @@ Manager template types:
 ```
 
 ## Versions
-Each type may contain any number of versions. Versions may be as simple as
-`v1`, `latest`, or `head`, or may be more complex to contain major and minor
-version numbers. Version format is user-defined.
+Types are versioned based on [Semantic Versioning](http://semver.org/), for
+example, *v1.1.0*. A type may have any number of versions.
 
 ## Type files
 Each type version must contain a top-level Deployment Manager template, named

From d200a3ce110c3b816941fac98c5f15a6013d97d5 Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 15:02:30 -0800
Subject: [PATCH 4/5] Minor tweaks of type section.

---
 docs/types/registry.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/types/registry.md b/docs/types/registry.md
index 9e25797d3..401efef68 100644
--- a/docs/types/registry.md
+++ b/docs/types/registry.md
@@ -29,10 +29,11 @@ Manager template types:
 Types are versioned based on [Semantic Versioning](http://semver.org/), for
 example, *v1.1.0*. A type may have any number of versions.
 
-## Type files
-Each type version must contain a top-level Deployment Manager template, named
-either `<type-name>.py` or `<type-name>.jinja`, depending on the templating
-language used for the type.
+## Types
+Each type version must contain a top-level Deployment Manager template
+[Deployment Manager template](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#templates)
+named either `<type-name>.py` or `<type-name>.jinja`, depending on the
+templating language used for the type.
 
 A
 [template schema](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#template-schemas)

From e4b54b51027338a045b8b74eeb90561bb177fce4 Mon Sep 17 00:00:00 2001
From: Brendan Melville <bmelville@google.com>
Date: Thu, 12 Nov 2015 15:08:30 -0800
Subject: [PATCH 5/5] Registry -> repository.

---
 docs/types/registry.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/registry.md b/docs/types/registry.md
index 401efef68..f1484c95a 100644
--- a/docs/types/registry.md
+++ b/docs/types/registry.md
@@ -2,7 +2,7 @@
 
 The Deployment Manager client allows you to deploy
 [template types](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#templates)
-directly from a Github repository. You can use types from existing registries
+directly from a Github repository. You can use types from existing repositories
 or integrate with your own repository.
 
 In order for a Github repository to integrate with Deployment Manager, it must