Maria Bermudez 1bca1115a7 Fix merge conflicts

2019-05-31 09:38:54 -07:00

..

docker_attach.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_build.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_builder_build.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_builder_prune.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_builder.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_checkpoint_create.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_checkpoint_ls.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_checkpoint_rm.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_checkpoint.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_commit.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_config_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_config_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_config_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_config_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_config.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_attach.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_commit.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_cp.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_container_diff.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_exec.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_export.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_kill.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_logs.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_pause.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_port.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_prune.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_rename.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_restart.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_run.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_container_start.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_container_stats.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_stop.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_top.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_unpause.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container_update.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_container_wait.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_container.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_context_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_export.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_import.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_inspect.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_ls.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_rm.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_update.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context_use.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_context.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_cp.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_deploy.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_diff.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_engine_activate.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_engine_check.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_engine_update.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_engine.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_events.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_exec.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_export.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_history.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_image_build.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_image_history.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_import.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_image_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_load.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_prune.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_pull.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_image_push.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_save.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image_tag.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_image.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_images.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_import.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_info.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_kill.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_load.yaml

Revert "Revert "Merge branch 'master' of github.com:docker/docs-private into test-branch-2""

2018-08-29 19:01:03 -07:00

docker_login.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_logout.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_logs.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_manifest_annotate.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_manifest_create.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_manifest_inspect.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_manifest_push.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_manifest.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_connect.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_disconnect.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_inspect.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_ls.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network_prune.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_network_rm.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_network.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_node_demote.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_node_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_node_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_node_promote.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_node_ps.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_node_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_node_update.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_node.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_pause.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_create.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_disable.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_enable.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_install.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_push.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_set.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin_upgrade.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_plugin.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_port.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_ps.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_pull.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_push.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_rename.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_restart.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_rmi.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_run.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_save.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_search.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_secret_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_secret_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_secret_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_secret_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_secret.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_create.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_service_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_logs.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_ps.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_rollback.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_scale.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_service_update.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_service.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_stack_deploy.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stack_ls.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stack_ps.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stack_rm.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stack_services.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stack.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_start.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_stats.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_stop.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_ca.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_init.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_swarm_join-token.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_join.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_swarm_leave.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_unlock-key.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_unlock.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm_update.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_swarm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_system_df.yaml

Fix merge conflicts

2019-05-31 09:38:54 -07:00

docker_system_events.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_system_info.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_system_prune.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_system.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_tag.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_top.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_inspect.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_trust_key_generate.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_key_load.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_key.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_revoke.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_sign.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_signer_add.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_signer_remove.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust_signer.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_trust.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_unpause.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_update.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00

docker_version.yaml

Update commandline yaml docs

2018-11-30 02:22:44 +00:00

docker_volume_create.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_volume_inspect.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_volume_ls.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_volume_prune.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_volume_rm.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_volume.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker_wait.yaml

Update engine CLI docs, stubs, and TOC

2018-03-22 16:52:53 -07:00

docker.yaml

Publish amberjack content to beta.docs.docker.com (#1089)

2019-05-31 09:38:50 -07:00