Merge pull request kubernetes#6405 from bgrant0607/api

Add s/hostDir/hostPath/
duda · Apr 3, 2015 · 5c49b6c · 5c49b6c
2 parents 3916222 + a1b5325
commit 5c49b6c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/docs/api.md b/docs/api.md
@@ -43,8 +43,11 @@ Some important differences between v1beta1/2 and v1beta3:
 * `/minions` has been moved to `/nodes`, and the resource has kind `Node`
 * The namespace is required (for all namespaced resources) and has moved from a URL parameter to the path: `/api/v1beta3/namespaces/{namespace}/{resource_collection}/{resource_name}`
 * The names of all resource collections are now lower cased - instead of `replicationControllers`, use `replicationcontrollers`.
-* To watch for changes to a resource, open an HTTP or Websocket connection to the collection URL and provide the `?watch=true` URL parameter along with the desired `resourceVersion` parameter to watch from.
+* To watch for changes to a resource, open an HTTP or Websocket connection to the collection query and provide the `?watch=true` query parameter along with the desired `resourceVersion` parameter to watch from.
+* The `labels` query parameter has been renamed to `label-selector`.
 * The container `entrypoint` has been renamed to `command`, and `command` has been renamed to `args`.
 * Container, volume, and node resources are expressed as nested maps (e.g., `resources{cpu:1}`) rather than as individual fields, and resource values support [scaling suffixes](resources.md#resource-quantities) rather than fixed scales (e.g., milli-cores).
-* Restart policy is represented simply as a string (e.g., "Always") rather than as a nested map ("always{}").
+* Restart policy is represented simply as a string (e.g., `"Always"`) rather than as a nested map (`always{}`).
+* Pull policies changed from `PullAlways`, `PullNever`, and `PullIfNotPresent` to `Always`, `Never`, and `IfNotPresent`.
 * The volume `source` is inlined into `volume` rather than nested.
+* Host volumes have been changed from `hostDir` to `hostPath` to better reflect that they can be files or directories.