openshift
diff --git a/‎api/README.md
+10-6 b/‎api/README.md
+10-6
diff --git a/‎api/definitions/v1.buildconfig/description.adoc
-3 b/‎api/definitions/v1.buildconfig/description.adoc
-3
diff --git a/‎api/definitions/v1.cindervolumesource/description.adoc
-1 b/‎api/definitions/v1.cindervolumesource/description.adoc
-1
diff --git a/‎api/definitions/v1.deploymentconfig/description.adoc
-3 b/‎api/definitions/v1.deploymentconfig/description.adoc
-3
diff --git a/‎api/definitions/v1.deploymentlog/description.adoc
-1 b/‎api/definitions/v1.deploymentlog/description.adoc
-1
diff --git a/‎api/definitions/v1.downwardapivolumefile/description.adoc
-1 b/‎api/definitions/v1.downwardapivolumefile/description.adoc
-1
diff --git a/‎api/definitions/v1.downwardapivolumesource/description.adoc
-1 b/‎api/definitions/v1.downwardapivolumesource/description.adoc
-1
diff --git a/‎api/definitions/v1.fsgroupstrategyoptions/description.adoc
-1 b/‎api/definitions/v1.fsgroupstrategyoptions/description.adoc
-1
diff --git a/‎api/definitions/v1.idrange/description.adoc
-1 b/‎api/definitions/v1.idrange/description.adoc
-1
diff --git a/‎api/definitions/v1.imagesource/description.adoc
-8 b/‎api/definitions/v1.imagesource/description.adoc
-8
diff --git a/‎api/definitions/v1.imagesourcepath/description.adoc
-3 b/‎api/definitions/v1.imagesourcepath/description.adoc
-3
diff --git a/‎api/definitions/v1.imagestreamimport/description.adoc
-4 b/‎api/definitions/v1.imagestreamimport/description.adoc
-4
diff --git a/‎api/definitions/v1.localresourceaccessreview/description.adoc
-1 b/‎api/definitions/v1.localresourceaccessreview/description.adoc
-1
diff --git a/‎api/definitions/v1.localsubjectaccessreview/description.adoc
-1 b/‎api/definitions/v1.localsubjectaccessreview/description.adoc
-1
diff --git a/‎api/definitions/v1.netnamespace/description.adoc
-1 b/‎api/definitions/v1.netnamespace/description.adoc
-1
diff --git a/‎api/definitions/v1.netnamespacelist/description.adoc
-1 b/‎api/definitions/v1.netnamespacelist/description.adoc
-1
diff --git a/‎api/definitions/v1.node/description.adoc
-1 b/‎api/definitions/v1.node/description.adoc
-1
diff --git a/‎api/definitions/v1.persistentvolume/description.adoc
-3 b/‎api/definitions/v1.persistentvolume/description.adoc
-3
diff --git a/‎api/definitions/v1.persistentvolumeclaim/description.adoc
-1 b/‎api/definitions/v1.persistentvolumeclaim/description.adoc
-1
diff --git a/‎api/definitions/v1.pod/description.adoc
-3 b/‎api/definitions/v1.pod/description.adoc
-3
diff --git a/‎api/definitions/v1.project/description.adoc
-1 b/‎api/definitions/v1.project/description.adoc
-1
diff --git a/‎api/definitions/v1.route/description.adoc
-1 b/‎api/definitions/v1.route/description.adoc
-1
diff --git a/‎api/definitions/v1.secretbuildsource/description.adoc
-1 b/‎api/definitions/v1.secretbuildsource/description.adoc
-1
diff --git a/‎api/definitions/v1.secretspec/description.adoc
-1 b/‎api/definitions/v1.secretspec/description.adoc
-1
diff --git a/‎api/definitions/v1.service/description.adoc
-7 b/‎api/definitions/v1.service/description.adoc
-7
diff --git a/‎api/definitions/v1.supplementalgroupsstrategyoptions/description.adoc
-1 b/‎api/definitions/v1.supplementalgroupsstrategyoptions/description.adoc
-1
diff --git a/‎api/definitions/v1.user/description.adoc
-1 b/‎api/definitions/v1.user/description.adoc
-1
diff --git a/‎api/definitions/v1beta1.scale/description.adoc
-7 b/‎api/definitions/v1beta1.scale/description.adoc
-7
diff --git a/‎api/paths/list_or_watch_objects_of_kind_persistentvolumeclaim/description.adoc
-1 b/‎api/paths/list_or_watch_objects_of_kind_persistentvolumeclaim/description.adoc
-1
@@ -1,18 +1,22 @@
 OpenShift API Documentation
 ---------------------------
 
-This directory contains a Swagger API definition for the OpenShift and Kubernetes APIs.  The `swagger-spec` directory is generated automatically, and the other directories contain content that is used to generate the official documentation.
+This directory contains a Swagger 1.0 and OpenAPI (Swagger 2.0) API definition for the OpenShift and Kubernetes APIs.
+The `swagger-spec` and `protobuf-spec` directories are generated automatically.
+
+* [Swagger 1.0 - OpenShift](./swagger-spec/oapi-v1.json)
+* [Swagger 1.0 - Kubernetes](./swagger-spec/api-v1.json)
+* [OpenAPI / Swagger 2.0 - OpenShift and Kubernetes](./swagger-spec/openshift-openapi-spec.json)
+* [Protobuf .proto files for all APIs](./protobuf-spec/)
 
 When you add a new object or field to the REST API, you should do the following:
 
-* Ensure all of your fields have the description tag
-* Run `hack/update-swagger-spec.sh`
-* If you've added a new object, add a simple description to `api/definitions/v1.objectname/description.adoc` (object name is all lower case for your Kind)
-  * For an example, see `api/definitions/v1.persistentvolumeclaim/description.adoc`
+* Ensure all of your fields and objects have the description tag
+* Run `hack/update-generated-swagger-spec.sh`
 
 To generate the docs, you need gradle 2.2+ installed, then run
 
-    $ hack/update-swagger-docs.sh
+    $ hack/update-generated-swagger-docs.sh
 
 That will create docs into _output/local/docs/swagger/api/v1 and oapi/v1 for the Kube and OpenShift docs.