renamed dockercon folder to add the year

matroia · Jan 24, 2017 · 2849e82 · 2849e82
1 parent 421646b
commit 2849e82
Show file tree

Hide file tree

Showing 255 changed files with 2 additions and 2 deletions.
diff --git a/developer-tools/java-debugging/docker-compose.yml b/developer-tools/java-debugging/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services:
 

diff --git a/dockercon-us/README.md → dockercon-us-2016/README.md b/dockercon-us/README.md → dockercon-us-2016/README.md
diff --git a/dockercon-us/docker-cloud/README.md → dockercon-us-2016/docker-cloud/README.md b/dockercon-us/docker-cloud/README.md → dockercon-us-2016/docker-cloud/README.md
diff --git a/...n-us/docker-cloud/images/build_status.png → ...2016/docker-cloud/images/build_status.png b/...n-us/docker-cloud/images/build_status.png → ...2016/docker-cloud/images/build_status.png
diff --git a/...ercon-us/docker-cloud/images/building.png → ...-us-2016/docker-cloud/images/building.png b/...ercon-us/docker-cloud/images/building.png → ...-us-2016/docker-cloud/images/building.png
diff --git a/...on-us/docker-cloud/images/byon_button.png → ...-2016/docker-cloud/images/byon_button.png b/...on-us/docker-cloud/images/byon_button.png → ...-2016/docker-cloud/images/byon_button.png
diff --git a/...n-us/docker-cloud/images/byon_success.png → ...2016/docker-cloud/images/byon_success.png b/...n-us/docker-cloud/images/byon_success.png → ...2016/docker-cloud/images/byon_success.png
diff --git a/...ker-cloud/images/create-first-service.png → ...ker-cloud/images/create-first-service.png b/...ker-cloud/images/create-first-service.png → ...ker-cloud/images/create-first-service.png
diff --git a/...rcon-us/docker-cloud/images/edit_repo.png → ...us-2016/docker-cloud/images/edit_repo.png b/...rcon-us/docker-cloud/images/edit_repo.png → ...us-2016/docker-cloud/images/edit_repo.png
diff --git a/...d/images/first-service-container-list.png → ...d/images/first-service-container-list.png b/...d/images/first-service-container-list.png → ...d/images/first-service-container-list.png
diff --git a/...-cloud/images/first-service-container.png → ...-cloud/images/first-service-container.png b/...-cloud/images/first-service-container.png → ...-cloud/images/first-service-container.png
diff --git a/...irst-service-create-and-deploy-button.png → ...irst-service-create-and-deploy-button.png b/...irst-service-create-and-deploy-button.png → ...irst-service-create-and-deploy-button.png
diff --git a/...cker-cloud/images/first-service-ports.png → ...cker-cloud/images/first-service-ports.png b/...cker-cloud/images/first-service-ports.png → ...cker-cloud/images/first-service-ports.png
diff --git a/...r-cloud/images/first-service-timeline.png → ...r-cloud/images/first-service-timeline.png b/...r-cloud/images/first-service-timeline.png → ...r-cloud/images/first-service-timeline.png
diff --git a/...er-cloud/images/first-service-webpage.png → ...er-cloud/images/first-service-webpage.png b/...er-cloud/images/first-service-webpage.png → ...er-cloud/images/first-service-webpage.png
diff --git a/...ker-cloud/images/first-service-wizard.png → ...ker-cloud/images/first-service-wizard.png b/...ker-cloud/images/first-service-wizard.png → ...ker-cloud/images/first-service-wizard.png
diff --git a/...con-us/docker-cloud/images/first_node.png → ...s-2016/docker-cloud/images/first_node.png b/...con-us/docker-cloud/images/first_node.png → ...s-2016/docker-cloud/images/first_node.png
diff --git a/...cker-cloud/images/node-byoh-wizard-v2.png → ...cker-cloud/images/node-byoh-wizard-v2.png b/...cker-cloud/images/node-byoh-wizard-v2.png → ...cker-cloud/images/node-byoh-wizard-v2.png
diff --git a/...rcon-us/docker-cloud/images/port_8080.jpg → ...us-2016/docker-cloud/images/port_8080.jpg b/...rcon-us/docker-cloud/images/port_8080.jpg → ...us-2016/docker-cloud/images/port_8080.jpg
diff --git a/...n-us/docker-cloud/images/power_socket.jpg → ...2016/docker-cloud/images/power_socket.jpg b/...n-us/docker-cloud/images/power_socket.jpg → ...2016/docker-cloud/images/power_socket.jpg
diff --git a/...n-us/docker-cloud/images/repositories.png → ...2016/docker-cloud/images/repositories.png b/...n-us/docker-cloud/images/repositories.png → ...2016/docker-cloud/images/repositories.png
diff --git a/dockercon-us/docker-cloud/images/results.png → ...n-us-2016/docker-cloud/images/results.png b/dockercon-us/docker-cloud/images/results.png → ...n-us-2016/docker-cloud/images/results.png
diff --git a/.../docker-cloud/images/service_deployed.png → .../docker-cloud/images/service_deployed.png b/.../docker-cloud/images/service_deployed.png → .../docker-cloud/images/service_deployed.png
diff --git a/...-us/docker-cloud/images/services_icon.png → ...016/docker-cloud/images/services_icon.png b/...-us/docker-cloud/images/services_icon.png → ...016/docker-cloud/images/services_icon.png
diff --git a/...-us/docker-cloud/images/stack_running.png → ...016/docker-cloud/images/stack_running.png b/...-us/docker-cloud/images/stack_running.png → ...016/docker-cloud/images/stack_running.png
diff --git a/...on-us/docker-cloud/images/stacks_icon.png → ...-2016/docker-cloud/images/stacks_icon.png b/...on-us/docker-cloud/images/stacks_icon.png → ...-2016/docker-cloud/images/stacks_icon.png
diff --git a/...ercon-us/docker-cloud/images/timeline.png → ...-us-2016/docker-cloud/images/timeline.png b/...ercon-us/docker-cloud/images/timeline.png → ...-us-2016/docker-cloud/images/timeline.png
diff --git a/dockercon-us/docker-cloud/images/voting.png → ...on-us-2016/docker-cloud/images/voting.png b/dockercon-us/docker-cloud/images/voting.png → ...on-us-2016/docker-cloud/images/voting.png
diff --git a/...cker-cloud/images/welcome_node_create.png → ...cker-cloud/images/welcome_node_create.png b/...cker-cloud/images/welcome_node_create.png → ...cker-cloud/images/welcome_node_create.png
diff --git a/dockercon-us/docker-cloud/images/wrench.jpg → ...on-us-2016/docker-cloud/images/wrench.jpg b/dockercon-us/docker-cloud/images/wrench.jpg → ...on-us-2016/docker-cloud/images/wrench.jpg
diff --git a/dockercon-us/docker-cloud/images/wrench.png → ...on-us-2016/docker-cloud/images/wrench.png b/dockercon-us/docker-cloud/images/wrench.png → ...on-us-2016/docker-cloud/images/wrench.png
diff --git a/dockercon-us/docker-datacenter/README.md → ...ercon-us-2016/docker-datacenter/README.md b/dockercon-us/docker-datacenter/README.md → ...ercon-us-2016/docker-datacenter/README.md
diff --git a/...ter/images/IG_ucp02_t6_ActionDropdown.PNG → ...ter/images/IG_ucp02_t6_ActionDropdown.PNG b/...ter/images/IG_ucp02_t6_ActionDropdown.PNG → ...ter/images/IG_ucp02_t6_ActionDropdown.PNG
diff --git a/...nter/images/IG_ucp02_t6_CreateNetwork.PNG → ...nter/images/IG_ucp02_t6_CreateNetwork.PNG b/...nter/images/IG_ucp02_t6_CreateNetwork.PNG → ...nter/images/IG_ucp02_t6_CreateNetwork.PNG
diff --git a/...mages/IG_ucp02_t6_CreateNetworkButton.PNG → ...mages/IG_ucp02_t6_CreateNetworkButton.PNG b/...mages/IG_ucp02_t6_CreateNetworkButton.PNG → ...mages/IG_ucp02_t6_CreateNetworkButton.PNG
diff --git a/...atacenter/images/IG_ucp02_t6_Networks.PNG → ...atacenter/images/IG_ucp02_t6_Networks.PNG b/...atacenter/images/IG_ucp02_t6_Networks.PNG → ...atacenter/images/IG_ucp02_t6_Networks.PNG
diff --git a/...enter/images/IG_ucp02_t6_NetworksLink.PNG → ...enter/images/IG_ucp02_t6_NetworksLink.PNG b/...enter/images/IG_ucp02_t6_NetworksLink.PNG → ...enter/images/IG_ucp02_t6_NetworksLink.PNG
diff --git a/...tacenter/images/IG_ucp02_t6_SelectApp.PNG → ...tacenter/images/IG_ucp02_t6_SelectApp.PNG b/...tacenter/images/IG_ucp02_t6_SelectApp.PNG → ...tacenter/images/IG_ucp02_t6_SelectApp.PNG
diff --git a/...center/images/IG_ucp02_t6_VoteAppBase.PNG → ...center/images/IG_ucp02_t6_VoteAppBase.PNG b/...center/images/IG_ucp02_t6_VoteAppBase.PNG → ...center/images/IG_ucp02_t6_VoteAppBase.PNG
diff --git a/...center/images/IG_ucp02_t6_VoteResults.PNG → ...center/images/IG_ucp02_t6_VoteResults.PNG b/...center/images/IG_ucp02_t6_VoteResults.PNG → ...center/images/IG_ucp02_t6_VoteResults.PNG
diff --git a/...mages/IG_ucp02_t6_voting_cats_or_dogs.PNG → ...mages/IG_ucp02_t6_voting_cats_or_dogs.PNG b/...mages/IG_ucp02_t6_voting_cats_or_dogs.PNG → ...mages/IG_ucp02_t6_voting_cats_or_dogs.PNG
diff --git a/...ker-datacenter/images/account_details.png → ...ker-datacenter/images/account_details.png b/...ker-datacenter/images/account_details.png → ...ker-datacenter/images/account_details.png
diff --git a/...on-us/docker-datacenter/images/add-pk.png → ...-2016/docker-datacenter/images/add-pk.png b/...on-us/docker-datacenter/images/add-pk.png → ...-2016/docker-datacenter/images/add-pk.png
diff --git a/...us/docker-datacenter/images/add_label.png → ...16/docker-datacenter/images/add_label.png b/...us/docker-datacenter/images/add_label.png → ...16/docker-datacenter/images/add_label.png
diff --git a/...cker-datacenter/images/add_permission.png → ...cker-datacenter/images/add_permission.png b/...cker-datacenter/images/add_permission.png → ...cker-datacenter/images/add_permission.png
diff --git a/...er-datacenter/images/add_user_to_team.png → ...er-datacenter/images/add_user_to_team.png b/...er-datacenter/images/add_user_to_team.png → ...er-datacenter/images/add_user_to_team.png
diff --git a/...er-datacenter/images/app-architecture.jpg → ...er-datacenter/images/app-architecture.jpg b/...er-datacenter/images/app-architecture.jpg → ...er-datacenter/images/app-architecture.jpg
diff --git a/...cker-datacenter/images/architecture-1.png → ...cker-datacenter/images/architecture-1.png b/...cker-datacenter/images/architecture-1.png → ...cker-datacenter/images/architecture-1.png
diff --git a/...cker-datacenter/images/architecture-2.png → ...cker-datacenter/images/architecture-2.png b/...cker-datacenter/images/architecture-2.png → ...cker-datacenter/images/architecture-2.png
diff --git a/...cker-datacenter/images/architecture-3.png → ...cker-datacenter/images/architecture-3.png b/...cker-datacenter/images/architecture-3.png → ...cker-datacenter/images/architecture-3.png
diff --git a/...cker-datacenter/images/architecture-4.png → ...cker-datacenter/images/architecture-4.png b/...cker-datacenter/images/architecture-4.png → ...cker-datacenter/images/architecture-4.png
diff --git a/...cker-datacenter/images/basic_settings.png → ...cker-datacenter/images/basic_settings.png b/...cker-datacenter/images/basic_settings.png → ...cker-datacenter/images/basic_settings.png
diff --git a/...r-datacenter/images/browser_cert_open.png → ...r-datacenter/images/browser_cert_open.png b/...r-datacenter/images/browser_cert_open.png → ...r-datacenter/images/browser_cert_open.png
diff --git a/...er-datacenter/images/browser_cert_san.png → ...er-datacenter/images/browser_cert_san.png b/...er-datacenter/images/browser_cert_san.png → ...er-datacenter/images/browser_cert_san.png
diff --git a/...-datacenter/images/cli-based-access-1.png → ...-datacenter/images/cli-based-access-1.png b/...-datacenter/images/cli-based-access-1.png → ...-datacenter/images/cli-based-access-1.png
diff --git a/...ocker-datacenter/images/cluster-nodes.png → ...ocker-datacenter/images/cluster-nodes.png b/...ocker-datacenter/images/cluster-nodes.png → ...ocker-datacenter/images/cluster-nodes.png
diff --git a/...-datacenter/images/container-detail-2.png → ...-datacenter/images/container-detail-2.png b/...-datacenter/images/container-detail-2.png → ...-datacenter/images/container-detail-2.png
diff --git a/...cker-datacenter/images/container-list.png → ...cker-datacenter/images/container-list.png b/...cker-datacenter/images/container-list.png → ...cker-datacenter/images/container-list.png
diff --git a/...acenter/images/container_console_link.png → ...acenter/images/container_console_link.png b/...acenter/images/container_console_link.png → ...acenter/images/container_console_link.png
diff --git a/...er-datacenter/images/container_detail.png → ...er-datacenter/images/container_detail.png b/...er-datacenter/images/container_detail.png → ...er-datacenter/images/container_detail.png
diff --git a/...cker-datacenter/images/container_edit.png → ...cker-datacenter/images/container_edit.png b/...cker-datacenter/images/container_edit.png → ...cker-datacenter/images/container_edit.png
diff --git a/...tacenter/images/controller-containers.png → ...tacenter/images/controller-containers.png b/...tacenter/images/controller-containers.png → ...tacenter/images/controller-containers.png
diff --git a/...cker-datacenter/images/create_network.png → ...cker-datacenter/images/create_network.png b/...cker-datacenter/images/create_network.png → ...cker-datacenter/images/create_network.png
diff --git a/.../docker-datacenter/images/create_team.png → .../docker-datacenter/images/create_team.png b/.../docker-datacenter/images/create_team.png → .../docker-datacenter/images/create_team.png
diff --git a/.../docker-datacenter/images/create_user.png → .../docker-datacenter/images/create_user.png b/.../docker-datacenter/images/create_user.png → .../docker-datacenter/images/create_user.png
diff --git a/...us/docker-datacenter/images/dashboard.png → ...16/docker-datacenter/images/dashboard.png b/...us/docker-datacenter/images/dashboard.png → ...16/docker-datacenter/images/dashboard.png
diff --git a/...ker-datacenter/images/deploy-app-ui-1.png → ...ker-datacenter/images/deploy-app-ui-1.png b/...ker-datacenter/images/deploy-app-ui-1.png → ...ker-datacenter/images/deploy-app-ui-1.png
diff --git a/...ker-datacenter/images/deploy-app-ui-2.png → ...ker-datacenter/images/deploy-app-ui-2.png b/...ker-datacenter/images/deploy-app-ui-2.png → ...ker-datacenter/images/deploy-app-ui-2.png
diff --git a/...ker-datacenter/images/deploy-app-ui-3.png → ...ker-datacenter/images/deploy-app-ui-3.png b/...ker-datacenter/images/deploy-app-ui-3.png → ...ker-datacenter/images/deploy-app-ui-3.png
diff --git a/...ker-datacenter/images/deploy-app-ui-4.png → ...ker-datacenter/images/deploy-app-ui-4.png b/...ker-datacenter/images/deploy-app-ui-4.png → ...ker-datacenter/images/deploy-app-ui-4.png
diff --git a/...ker-datacenter/images/deploy-app-ui-5.png → ...ker-datacenter/images/deploy-app-ui-5.png b/...ker-datacenter/images/deploy-app-ui-5.png → ...ker-datacenter/images/deploy-app-ui-5.png
diff --git a/...ker-datacenter/images/deploy-app-ui-6.png → ...ker-datacenter/images/deploy-app-ui-6.png b/...ker-datacenter/images/deploy-app-ui-6.png → ...ker-datacenter/images/deploy-app-ui-6.png
diff --git a/...er-datacenter/images/deploy_container.png → ...er-datacenter/images/deploy_container.png b/...er-datacenter/images/deploy_container.png → ...er-datacenter/images/deploy_container.png
diff --git a/...r-datacenter/images/deploy_view_error.png → ...r-datacenter/images/deploy_view_error.png b/...r-datacenter/images/deploy_view_error.png → ...r-datacenter/images/deploy_view_error.png
diff --git a/...-datacenter/images/deployed_container.png → ...-datacenter/images/deployed_container.png b/...-datacenter/images/deployed_container.png → ...-datacenter/images/deployed_container.png
diff --git a/...r-datacenter/images/display_container.png → ...r-datacenter/images/display_container.png b/...r-datacenter/images/display_container.png → ...r-datacenter/images/display_container.png
diff --git a/...-datacenter/images/docker-hub-license.png → ...-datacenter/images/docker-hub-license.png b/...-datacenter/images/docker-hub-license.png → ...-datacenter/images/docker-hub-license.png
diff --git a/...datacenter/images/docker-hub-settings.png → ...datacenter/images/docker-hub-settings.png b/...datacenter/images/docker-hub-settings.png → ...datacenter/images/docker-hub-settings.png
diff --git a/...r-datacenter/images/dtr-integration-1.png → ...r-datacenter/images/dtr-integration-1.png b/...r-datacenter/images/dtr-integration-1.png → ...r-datacenter/images/dtr-integration-1.png
diff --git a/...r-datacenter/images/dtr-integration-2.png → ...r-datacenter/images/dtr-integration-2.png b/...r-datacenter/images/dtr-integration-2.png → ...r-datacenter/images/dtr-integration-2.png
diff --git a/...r-datacenter/images/dtr-integration-3.png → ...r-datacenter/images/dtr-integration-3.png b/...r-datacenter/images/dtr-integration-3.png → ...r-datacenter/images/dtr-integration-3.png
diff --git a/...r-datacenter/images/dtr-integration-4.png → ...r-datacenter/images/dtr-integration-4.png b/...r-datacenter/images/dtr-integration-4.png → ...r-datacenter/images/dtr-integration-4.png
diff --git a/...r-datacenter/images/dtr-integration-5.png → ...r-datacenter/images/dtr-integration-5.png b/...r-datacenter/images/dtr-integration-5.png → ...r-datacenter/images/dtr-integration-5.png
diff --git a/...s/docker-datacenter/images/explain.gliffy → ...6/docker-datacenter/images/explain.gliffy b/...s/docker-datacenter/images/explain.gliffy → ...6/docker-datacenter/images/explain.gliffy
diff --git a/...n-us/docker-datacenter/images/explain.png → ...2016/docker-datacenter/images/explain.png b/...n-us/docker-datacenter/images/explain.png → ...2016/docker-datacenter/images/explain.png
diff --git a/...n-us/docker-datacenter/images/ft_node.jpg → ...2016/docker-datacenter/images/ft_node.jpg b/...n-us/docker-datacenter/images/ft_node.jpg → ...2016/docker-datacenter/images/ft_node.jpg
diff --git a/...n-us/docker-datacenter/images/ft_port.jpg → ...2016/docker-datacenter/images/ft_port.jpg b/...n-us/docker-datacenter/images/ft_port.jpg → ...2016/docker-datacenter/images/ft_port.jpg
diff --git a/.../docker-datacenter/images/get-license.png → .../docker-datacenter/images/get-license.png b/.../docker-datacenter/images/get-license.png → .../docker-datacenter/images/get-license.png
diff --git a/.../docker-datacenter/images/go_networks.png → .../docker-datacenter/images/go_networks.png b/.../docker-datacenter/images/go_networks.png → .../docker-datacenter/images/go_networks.png
diff --git a/...er-datacenter/images/hello_world_pull.png → ...er-datacenter/images/hello_world_pull.png b/...er-datacenter/images/hello_world_pull.png → ...er-datacenter/images/hello_world_pull.png
diff --git a/...ker-datacenter/images/host_ip_address.png → ...ker-datacenter/images/host_ip_address.png b/...ker-datacenter/images/host_ip_address.png → ...ker-datacenter/images/host_ip_address.png
diff --git a/...r-datacenter/images/ip_cloud_provider.png → ...r-datacenter/images/ip_cloud_provider.png b/...r-datacenter/images/ip_cloud_provider.png → ...r-datacenter/images/ip_cloud_provider.png
diff --git a/...r-datacenter/images/john_full_details.png → ...r-datacenter/images/john_full_details.png b/...r-datacenter/images/john_full_details.png → ...r-datacenter/images/john_full_details.png
diff --git a/.../docker-datacenter/images/ldap_access.png → .../docker-datacenter/images/ldap_access.png b/.../docker-datacenter/images/ldap_access.png → .../docker-datacenter/images/ldap_access.png
diff --git a/...ocker-datacenter/images/license-title.png → ...ocker-datacenter/images/license-title.png b/...ocker-datacenter/images/license-title.png → ...ocker-datacenter/images/license-title.png
diff --git a/...ocker-datacenter/images/license-ucp-1.png → ...ocker-datacenter/images/license-ucp-1.png b/...ocker-datacenter/images/license-ucp-1.png → ...ocker-datacenter/images/license-ucp-1.png
diff --git a/...ocker-datacenter/images/license-ucp-2.png → ...ocker-datacenter/images/license-ucp-2.png b/...ocker-datacenter/images/license-ucp-2.png → ...ocker-datacenter/images/license-ucp-2.png
diff --git a/...n-us/docker-datacenter/images/license.jpg → ...2016/docker-datacenter/images/license.jpg b/...n-us/docker-datacenter/images/license.jpg → ...2016/docker-datacenter/images/license.jpg
diff --git a/...n-us/docker-datacenter/images/license.png → ...2016/docker-datacenter/images/license.png b/...n-us/docker-datacenter/images/license.png → ...2016/docker-datacenter/images/license.png
diff --git a/...us/docker-datacenter/images/login-ani.gif → ...16/docker-datacenter/images/login-ani.gif b/...us/docker-datacenter/images/login-ani.gif → ...16/docker-datacenter/images/login-ani.gif
diff --git a/...con-us/docker-datacenter/images/login.png → ...s-2016/docker-datacenter/images/login.png b/...con-us/docker-datacenter/images/login.png → ...s-2016/docker-datacenter/images/login.png
diff --git a/...s/docker-datacenter/images/match_list.png → ...6/docker-datacenter/images/match_list.png b/...s/docker-datacenter/images/match_list.png → ...6/docker-datacenter/images/match_list.png
diff --git a/...ocker-datacenter/images/monitor-ucp-1.png → ...ocker-datacenter/images/monitor-ucp-1.png b/...ocker-datacenter/images/monitor-ucp-1.png → ...ocker-datacenter/images/monitor-ucp-1.png
diff --git a/...ocker-datacenter/images/monitor-ucp-2.png → ...ocker-datacenter/images/monitor-ucp-2.png b/...ocker-datacenter/images/monitor-ucp-2.png → ...ocker-datacenter/images/monitor-ucp-2.png
diff --git a/...r-datacenter/images/multiple-replicas.png → ...r-datacenter/images/multiple-replicas.png b/...r-datacenter/images/multiple-replicas.png → ...r-datacenter/images/multiple-replicas.png
diff --git a/.../docker-datacenter/images/my_new_site.png → .../docker-datacenter/images/my_new_site.png b/.../docker-datacenter/images/my_new_site.png → .../docker-datacenter/images/my_new_site.png
diff --git a/...r-datacenter/images/network_gui_error.png → ...r-datacenter/images/network_gui_error.png b/...r-datacenter/images/network_gui_error.png → ...r-datacenter/images/network_gui_error.png
diff --git a/...con-us/docker-datacenter/images/nginx.jpg → ...s-2016/docker-datacenter/images/nginx.jpg b/...con-us/docker-datacenter/images/nginx.jpg → ...s-2016/docker-datacenter/images/nginx.jpg
diff --git a/...atacenter/images/nginx_deploy_details.png → ...atacenter/images/nginx_deploy_details.png b/...atacenter/images/nginx_deploy_details.png → ...atacenter/images/nginx_deploy_details.png
diff --git a/...ocker-datacenter/images/nginx_welcome.png → ...ocker-datacenter/images/nginx_welcome.png b/...ocker-datacenter/images/nginx_welcome.png → ...ocker-datacenter/images/nginx_welcome.png
diff --git a/...rcon-us/docker-datacenter/images/node.jpg → ...us-2016/docker-datacenter/images/node.jpg b/...rcon-us/docker-datacenter/images/node.jpg → ...us-2016/docker-datacenter/images/node.jpg
diff --git a/...er-datacenter/images/node_information.png → ...er-datacenter/images/node_information.png b/...er-datacenter/images/node_information.png → ...er-datacenter/images/node_information.png
diff --git a/...n-us/docker-datacenter/images/nodes-3.png → ...2016/docker-datacenter/images/nodes-3.png b/...n-us/docker-datacenter/images/nodes-3.png → ...2016/docker-datacenter/images/nodes-3.png
diff --git a/...s/docker-datacenter/images/nodes-page.png → ...6/docker-datacenter/images/nodes-page.png b/...s/docker-datacenter/images/nodes-page.png → ...6/docker-datacenter/images/nodes-page.png
diff --git a/...con-us/docker-datacenter/images/nodes.jpg → ...s-2016/docker-datacenter/images/nodes.jpg b/...con-us/docker-datacenter/images/nodes.jpg → ...s-2016/docker-datacenter/images/nodes.jpg
diff --git a/...con-us/docker-datacenter/images/nodes.png → ...s-2016/docker-datacenter/images/nodes.png b/...con-us/docker-datacenter/images/nodes.png → ...s-2016/docker-datacenter/images/nodes.png
diff --git a/...ker-datacenter/images/orca_components.png → ...ker-datacenter/images/orca_components.png b/...ker-datacenter/images/orca_components.png → ...ker-datacenter/images/orca_components.png
diff --git a/...s/docker-datacenter/images/overview-1.png → ...6/docker-datacenter/images/overview-1.png b/...s/docker-datacenter/images/overview-1.png → ...6/docker-datacenter/images/overview-1.png
diff --git a/...s/docker-datacenter/images/overview-2.png → ...6/docker-datacenter/images/overview-2.png b/...s/docker-datacenter/images/overview-2.png → ...6/docker-datacenter/images/overview-2.png
diff --git a/...s/docker-datacenter/images/overview-3.png → ...6/docker-datacenter/images/overview-3.png b/...s/docker-datacenter/images/overview-3.png → ...6/docker-datacenter/images/overview-3.png
diff --git a/...n-us/docker-datacenter/images/port_80.png → ...2016/docker-datacenter/images/port_80.png b/...n-us/docker-datacenter/images/port_80.png → ...2016/docker-datacenter/images/port_80.png
diff --git a/.../docker-datacenter/images/port_config.png → .../docker-datacenter/images/port_config.png b/.../docker-datacenter/images/port_config.png → .../docker-datacenter/images/port_config.png
diff --git a/...ocker-datacenter/images/port_mappings.png → ...ocker-datacenter/images/port_mappings.png b/...ocker-datacenter/images/port_mappings.png → ...ocker-datacenter/images/port_mappings.png
diff --git a/...datacenter/images/port_mappings_check.png → ...datacenter/images/port_mappings_check.png b/...datacenter/images/port_mappings_check.png → ...datacenter/images/port_mappings_check.png
diff --git a/...ocker-datacenter/images/replica-nodes.png → ...ocker-datacenter/images/replica-nodes.png b/...ocker-datacenter/images/replica-nodes.png → ...ocker-datacenter/images/replica-nodes.png
diff --git a/...s/docker-datacenter/images/sandbox.gliffy → ...6/docker-datacenter/images/sandbox.gliffy b/...s/docker-datacenter/images/sandbox.gliffy → ...6/docker-datacenter/images/sandbox.gliffy
diff --git a/...n-us/docker-datacenter/images/sandbox.png → ...2016/docker-datacenter/images/sandbox.png b/...n-us/docker-datacenter/images/sandbox.png → ...2016/docker-datacenter/images/sandbox.png
diff --git a/...us/docker-datacenter/images/save_team.png → ...16/docker-datacenter/images/save_team.png b/...us/docker-datacenter/images/save_team.png → ...16/docker-datacenter/images/save_team.png
diff --git a/.../docker-datacenter/images/second_node.png → .../docker-datacenter/images/second_node.png b/.../docker-datacenter/images/second_node.png → .../docker-datacenter/images/second_node.png
diff --git a/...docker-datacenter/images/settings-log.png → ...docker-datacenter/images/settings-log.png b/...docker-datacenter/images/settings-log.png → ...docker-datacenter/images/settings-log.png
diff --git a/...us/docker-datacenter/images/skip-this.png → ...16/docker-datacenter/images/skip-this.png b/...us/docker-datacenter/images/skip-this.png → ...16/docker-datacenter/images/skip-this.png
diff --git a/...rcon-us/docker-datacenter/images/skip.jpg → ...us-2016/docker-datacenter/images/skip.jpg b/...rcon-us/docker-datacenter/images/skip.jpg → ...us-2016/docker-datacenter/images/skip.jpg
diff --git a/...s/docker-datacenter/images/stop_error.png → ...6/docker-datacenter/images/stop_error.png b/...s/docker-datacenter/images/stop_error.png → ...6/docker-datacenter/images/stop_error.png
diff --git a/...-datacenter/images/troubleshoot-ucp-1.png → ...-datacenter/images/troubleshoot-ucp-1.png b/...-datacenter/images/troubleshoot-ucp-1.png → ...-datacenter/images/troubleshoot-ucp-1.png
diff --git a/...s/docker-datacenter/images/ub2_deploy.png → ...6/docker-datacenter/images/ub2_deploy.png b/...s/docker-datacenter/images/ub2_deploy.png → ...6/docker-datacenter/images/ub2_deploy.png
diff --git a/...ocker-datacenter/images/ubuntu_deploy.png → ...ocker-datacenter/images/ubuntu_deploy.png b/...ocker-datacenter/images/ubuntu_deploy.png → ...ocker-datacenter/images/ubuntu_deploy.png
diff --git a/...mages/ucp02_t2_container_details_node.PNG → ...mages/ucp02_t2_container_details_node.PNG b/...mages/ucp02_t2_container_details_node.PNG → ...mages/ucp02_t2_container_details_node.PNG
diff --git a/...datacenter/images/ucp02_t2_containers.PNG → ...datacenter/images/ucp02_t2_containers.PNG b/...datacenter/images/ucp02_t2_containers.PNG → ...datacenter/images/ucp02_t2_containers.PNG
diff --git a/...ges/ucp02_t2_containers_withhighlight.png → ...ges/ucp02_t2_containers_withhighlight.png b/...ges/ucp02_t2_containers_withhighlight.png → ...ges/ucp02_t2_containers_withhighlight.png
diff --git a/...enter/images/ucp02_t2_networksettings.PNG → ...enter/images/ucp02_t2_networksettings.PNG b/...enter/images/ucp02_t2_networksettings.PNG → ...enter/images/ucp02_t2_networksettings.PNG
diff --git a/...acenter/images/ucp02_t2_nginx_welcome.PNG → ...acenter/images/ucp02_t2_nginx_welcome.PNG b/...acenter/images/ucp02_t2_nginx_welcome.PNG → ...acenter/images/ucp02_t2_nginx_welcome.PNG
diff --git a/...tacenter/images/ucp02_t2_portmappings.PNG → ...tacenter/images/ucp02_t2_portmappings.PNG b/...tacenter/images/ucp02_t2_portmappings.PNG → ...tacenter/images/ucp02_t2_portmappings.PNG
diff --git a/...tacenter/images/ucp02_t4_applications.PNG → ...tacenter/images/ucp02_t4_applications.PNG b/...tacenter/images/ucp02_t4_applications.PNG → ...tacenter/images/ucp02_t4_applications.PNG
diff --git a/...images/ucp02_t4_applications_expanded.PNG → ...images/ucp02_t4_applications_expanded.PNG b/...images/ucp02_t4_applications_expanded.PNG → ...images/ucp02_t4_applications_expanded.PNG
diff --git a/...r/images/ucp02_t4_applications_remove.PNG → ...r/images/ucp02_t4_applications_remove.PNG b/...r/images/ucp02_t4_applications_remove.PNG → ...r/images/ucp02_t4_applications_remove.PNG
diff --git a/...acenter/images/ucp02_t4_client_bundle.PNG → ...acenter/images/ucp02_t4_client_bundle.PNG b/...acenter/images/ucp02_t4_client_bundle.PNG → ...acenter/images/ucp02_t4_client_bundle.PNG
diff --git a/...datacenter/images/ucp02_t4_foodtrucks.PNG → ...datacenter/images/ucp02_t4_foodtrucks.PNG b/...datacenter/images/ucp02_t4_foodtrucks.PNG → ...datacenter/images/ucp02_t4_foodtrucks.PNG
diff --git a/...datacenter/images/ucp02_t4_helloredis.PNG → ...datacenter/images/ucp02_t4_helloredis.PNG b/...datacenter/images/ucp02_t4_helloredis.PNG → ...datacenter/images/ucp02_t4_helloredis.PNG
diff --git a/...nter/images/ucp02_t4_profile_dropdown.PNG → ...nter/images/ucp02_t4_profile_dropdown.PNG b/...nter/images/ucp02_t4_profile_dropdown.PNG → ...nter/images/ucp02_t4_profile_dropdown.PNG
diff --git a/...r/images/ucp02_t5_compose_application.PNG → ...r/images/ucp02_t5_compose_application.PNG b/...r/images/ucp02_t5_compose_application.PNG → ...r/images/ucp02_t5_compose_application.PNG
diff --git a/...es/ucp02_t5_create_application_output.PNG → ...es/ucp02_t5_create_application_output.PNG b/...es/ucp02_t5_create_application_output.PNG → ...es/ucp02_t5_create_application_output.PNG
diff --git a/...es/ucp02_t5_create_application_screen.PNG → ...es/ucp02_t5_create_application_screen.PNG b/...es/ucp02_t5_create_application_screen.PNG → ...es/ucp02_t5_create_application_screen.PNG
diff --git a/...-datacenter/images/ucp03_t1_add_label.PNG → ...-datacenter/images/ucp03_t1_add_label.PNG b/...-datacenter/images/ucp03_t1_add_label.PNG → ...-datacenter/images/ucp03_t1_add_label.PNG
diff --git a/...nter/images/ucp03_t1_add_user_to_team.PNG → ...nter/images/ucp03_t1_add_user_to_team.PNG b/...nter/images/ucp03_t1_add_user_to_team.PNG → ...nter/images/ucp03_t1_add_user_to_team.PNG
diff --git a/...tacenter/images/ucp03_t1_create_label.PNG → ...tacenter/images/ucp03_t1_create_label.PNG b/...tacenter/images/ucp03_t1_create_label.PNG → ...tacenter/images/ucp03_t1_create_label.PNG
diff --git a/...atacenter/images/ucp03_t1_create_team.PNG → ...atacenter/images/ucp03_t1_create_team.PNG b/...atacenter/images/ucp03_t1_create_team.PNG → ...atacenter/images/ucp03_t1_create_team.PNG
diff --git a/...atacenter/images/ucp03_t1_create_user.PNG → ...atacenter/images/ucp03_t1_create_user.PNG b/...atacenter/images/ucp03_t1_create_user.PNG → ...atacenter/images/ucp03_t1_create_user.PNG
diff --git a/...er/images/ucp03_t1_create_user_dialog.PNG → ...er/images/ucp03_t1_create_user_dialog.PNG b/...er/images/ucp03_t1_create_user_dialog.PNG → ...er/images/ucp03_t1_create_user_dialog.PNG
diff --git a/...atacenter/images/ucp03_t1_permissions.PNG → ...atacenter/images/ucp03_t1_permissions.PNG b/...atacenter/images/ucp03_t1_permissions.PNG → ...atacenter/images/ucp03_t1_permissions.PNG
diff --git a/...ter/images/ucp03_t1_permissions_label.PNG → ...ter/images/ucp03_t1_permissions_label.PNG b/...ter/images/ucp03_t1_permissions_label.PNG → ...ter/images/ucp03_t1_permissions_label.PNG
diff --git a/...atacenter/images/ucp03_t1_select_team.PNG → ...atacenter/images/ucp03_t1_select_team.PNG b/...atacenter/images/ucp03_t1_select_team.PNG → ...atacenter/images/ucp03_t1_select_team.PNG
diff --git a/...enter/images/ucp03_t1_users_and_teams.PNG → ...enter/images/ucp03_t1_users_and_teams.PNG b/...enter/images/ucp03_t1_users_and_teams.PNG → ...enter/images/ucp03_t1_users_and_teams.PNG
diff --git a/...ocker-datacenter/images/ucp03_t2_bash.PNG → ...ocker-datacenter/images/ucp03_t2_bash.PNG b/...ocker-datacenter/images/ucp03_t2_bash.PNG → ...ocker-datacenter/images/ucp03_t2_bash.PNG
diff --git a/...center/images/ucp03_t2_container_tabs.PNG → ...center/images/ucp03_t2_container_tabs.PNG b/...center/images/ucp03_t2_container_tabs.PNG → ...center/images/ucp03_t2_container_tabs.PNG
diff --git a/...ker-datacenter/images/ucp03_t2_labels.PNG → ...ker-datacenter/images/ucp03_t2_labels.PNG b/...ker-datacenter/images/ucp03_t2_labels.PNG → ...ker-datacenter/images/ucp03_t2_labels.PNG
diff --git a/...r-datacenter/images/ucp03_t4_AllUsers.PNG → ...r-datacenter/images/ucp03_t4_AllUsers.PNG b/...r-datacenter/images/ucp03_t4_AllUsers.PNG → ...r-datacenter/images/ucp03_t4_AllUsers.PNG
diff --git a/...ocker-datacenter/images/ucp03_t4_LDAP.PNG → ...ocker-datacenter/images/ucp03_t4_LDAP.PNG b/...ocker-datacenter/images/ucp03_t4_LDAP.PNG → ...ocker-datacenter/images/ucp03_t4_LDAP.PNG
diff --git a/...nter/images/ucp03_t4_LDAP_user_search.PNG → ...nter/images/ucp03_t4_LDAP_user_search.PNG b/...nter/images/ucp03_t4_LDAP_user_search.PNG → ...nter/images/ucp03_t4_LDAP_user_search.PNG
diff --git a/...r-datacenter/images/ucp03_t4_startTLS.PNG → ...r-datacenter/images/ucp03_t4_startTLS.PNG b/...r-datacenter/images/ucp03_t4_startTLS.PNG → ...r-datacenter/images/ucp03_t4_startTLS.PNG
diff --git a/...r-datacenter/images/ucp03_t5_ChangePW.PNG → ...r-datacenter/images/ucp03_t5_ChangePW.PNG b/...r-datacenter/images/ucp03_t5_ChangePW.PNG → ...r-datacenter/images/ucp03_t5_ChangePW.PNG
diff --git a/.../docker-datacenter/images/users_teams.png → .../docker-datacenter/images/users_teams.png b/.../docker-datacenter/images/users_teams.png → .../docker-datacenter/images/users_teams.png
diff --git a/...s/docker-datacenter/images/view_label.png → ...6/docker-datacenter/images/view_label.png b/...s/docker-datacenter/images/view_label.png → ...6/docker-datacenter/images/view_label.png
diff --git a/...ocker-datacenter/images/vote-app-test.jpg → ...ocker-datacenter/images/vote-app-test.jpg b/...ocker-datacenter/images/vote-app-test.jpg → ...ocker-datacenter/images/vote-app-test.jpg
diff --git a/...ocker-datacenter/images/votingapp-net.png → ...ocker-datacenter/images/votingapp-net.png b/...ocker-datacenter/images/votingapp-net.png → ...ocker-datacenter/images/votingapp-net.png
diff --git a/...r-datacenter/images/votingapp_default.png → ...r-datacenter/images/votingapp_default.png b/...r-datacenter/images/votingapp_default.png → ...r-datacenter/images/votingapp_default.png
diff --git a/...ocker-datacenter/images/welcome_nginx.png → ...ocker-datacenter/images/welcome_nginx.png b/...ocker-datacenter/images/welcome_nginx.png → ...ocker-datacenter/images/welcome_nginx.png
diff --git a/dockercon-us/docker-developer/README.MD → dockercon-us-2016/docker-developer/README.MD b/dockercon-us/docker-developer/README.MD → dockercon-us-2016/docker-developer/README.MD
diff --git a/...on-us/docker-developer/images/About16.png → ...-2016/docker-developer/images/About16.png b/...on-us/docker-developer/images/About16.png → ...-2016/docker-developer/images/About16.png
diff --git a/.../docker-developer/images/Config-popup.png → .../docker-developer/images/Config-popup.png b/.../docker-developer/images/Config-popup.png → .../docker-developer/images/Config-popup.png
diff --git a/...-developer/images/Docker-win-settings.png → ...-developer/images/Docker-win-settings.png b/...-developer/images/Docker-win-settings.png → ...-developer/images/Docker-win-settings.png
diff --git a/...cker-developer/images/Start-Authorize.png → ...cker-developer/images/Start-Authorize.png b/...cker-developer/images/Start-Authorize.png → ...cker-developer/images/Start-Authorize.png
diff --git a/...us/docker-developer/images/Start-init.png → ...16/docker-developer/images/Start-init.png b/...us/docker-developer/images/Start-init.png → ...16/docker-developer/images/Start-init.png
diff --git a/...ker-developer/images/about-docker-win.png → ...ker-developer/images/about-docker-win.png b/...ker-developer/images/about-docker-win.png → ...ker-developer/images/about-docker-win.png
diff --git a/...eveloper/images/changelog-placeholder.png → ...eveloper/images/changelog-placeholder.png b/...eveloper/images/changelog-placeholder.png → ...eveloper/images/changelog-placeholder.png
diff --git a/...eveloper/images/config-popup-menu-win.png → ...eveloper/images/config-popup-menu-win.png b/...eveloper/images/config-popup-menu-win.png → ...eveloper/images/config-popup-menu-win.png
diff --git a/.../docker-developer/images/console_logs.png → .../docker-developer/images/console_logs.png b/.../docker-developer/images/console_logs.png → .../docker-developer/images/console_logs.png
diff --git a/...-developer/images/console_logs_search.png → ...-developer/images/console_logs_search.png b/...-developer/images/console_logs_search.png → ...-developer/images/console_logs_search.png
diff --git a/...r-developer/images/desktop-whale-icon.png → ...r-developer/images/desktop-whale-icon.png b/...r-developer/images/desktop-whale-icon.png → ...r-developer/images/desktop-whale-icon.png
diff --git a/...loper/images/diagnose-feedback-id-win.png → ...loper/images/diagnose-feedback-id-win.png b/...loper/images/diagnose-feedback-id-win.png → ...loper/images/diagnose-feedback-id-win.png
diff --git a/...eveloper/images/diagnose-feedback-win.png → ...eveloper/images/diagnose-feedback-win.png b/...eveloper/images/diagnose-feedback-win.png → ...eveloper/images/diagnose-feedback-win.png
diff --git a/...r-developer/images/diagnose-id-forums.png → ...r-developer/images/diagnose-id-forums.png b/...r-developer/images/diagnose-id-forums.png → ...r-developer/images/diagnose-id-forums.png
diff --git a/...n-us/docker-developer/images/diagnose.png → ...2016/docker-developer/images/diagnose.png b/...n-us/docker-developer/images/diagnose.png → ...2016/docker-developer/images/diagnose.png
diff --git a/...-developer/images/docker-app-drag-old.png → ...-developer/images/docker-app-drag-old.png b/...-developer/images/docker-app-drag-old.png → ...-developer/images/docker-app-drag-old.png
diff --git a/...cker-developer/images/docker-app-drag.png → ...cker-developer/images/docker-app-drag.png b/...cker-developer/images/docker-app-drag.png → ...cker-developer/images/docker-app-drag.png
diff --git a/...r-developer/images/docker-app-in-apps.png → ...r-developer/images/docker-app-in-apps.png b/...r-developer/images/docker-app-in-apps.png → ...r-developer/images/docker-app-in-apps.png
diff --git a/...ocker-developer/images/docker-app-log.png → ...ocker-developer/images/docker-app-log.png b/...ocker-developer/images/docker-app-log.png → ...ocker-developer/images/docker-app-log.png
diff --git a/...us/docker-developer/images/docker-app.png → ...16/docker-developer/images/docker-app.png b/...us/docker-developer/images/docker-app.png → ...16/docker-developer/images/docker-app.png
diff --git a/...docker-developer/images/docker-daemon.png → ...docker-developer/images/docker-daemon.png b/...docker-developer/images/docker-daemon.png → ...docker-developer/images/docker-daemon.png
diff --git a/...per/images/docker-for-mac-and-toolbox.png → ...per/images/docker-for-mac-and-toolbox.png b/...per/images/docker-for-mac-and-toolbox.png → ...per/images/docker-for-mac-and-toolbox.png
diff --git a/...veloper/images/docker-for-mac-install.png → ...veloper/images/docker-for-mac-install.png b/...veloper/images/docker-for-mac-install.png → ...veloper/images/docker-for-mac-install.png
diff --git a/...er-developer/images/docker-is-running.png → ...er-developer/images/docker-is-running.png b/...er-developer/images/docker-is-running.png → ...er-developer/images/docker-is-running.png
diff --git a/...n-us/docker-developer/images/download.png → ...2016/docker-developer/images/download.png b/...n-us/docker-developer/images/download.png → ...2016/docker-developer/images/download.png
diff --git a/...er-developer/images/hello-world-nginx.png → ...er-developer/images/hello-world-nginx.png b/...er-developer/images/hello-world-nginx.png → ...er-developer/images/hello-world-nginx.png
diff --git a/...s/docker-developer/images/hello-world.png → ...6/docker-developer/images/hello-world.png b/...s/docker-developer/images/hello-world.png → ...6/docker-developer/images/hello-world.png
diff --git a/...ker-developer/images/hockeyapp-docker.png → ...ker-developer/images/hockeyapp-docker.png b/...ker-developer/images/hockeyapp-docker.png → ...ker-developer/images/hockeyapp-docker.png
diff --git a/...cker-developer/images/hyper-v-message.png → ...cker-developer/images/hyper-v-message.png b/...cker-developer/images/hyper-v-message.png → ...cker-developer/images/hyper-v-message.png
diff --git a/...con-us/docker-developer/images/image1.png → ...s-2016/docker-developer/images/image1.png b/...con-us/docker-developer/images/image1.png → ...s-2016/docker-developer/images/image1.png
diff --git a/...con-us/docker-developer/images/image2.png → ...s-2016/docker-developer/images/image2.png b/...con-us/docker-developer/images/image2.png → ...s-2016/docker-developer/images/image2.png
diff --git a/...con-us/docker-developer/images/image4.png → ...s-2016/docker-developer/images/image4.png b/...con-us/docker-developer/images/image4.png → ...s-2016/docker-developer/images/image4.png
diff --git a/...eveloper/images/import-docker-content.png → ...eveloper/images/import-docker-content.png b/...eveloper/images/import-docker-content.png → ...eveloper/images/import-docker-content.png
diff --git a/...cker-developer/images/installer-allow.png → ...cker-developer/images/installer-allow.png b/...cker-developer/images/installer-allow.png → ...cker-developer/images/installer-allow.png
diff --git a/...r-developer/images/installer-finishes.png → ...r-developer/images/installer-finishes.png b/...r-developer/images/installer-finishes.png → ...r-developer/images/installer-finishes.png
diff --git a/...veloper/images/installer-in-downloads.png → ...veloper/images/installer-in-downloads.png b/...veloper/images/installer-in-downloads.png → ...veloper/images/installer-in-downloads.png
diff --git a/...developer/images/installer-license-ok.png → ...developer/images/installer-license-ok.png b/...developer/images/installer-license-ok.png → ...developer/images/installer-license-ok.png
diff --git a/...veloper/images/installer-license-show.png → ...veloper/images/installer-license-show.png b/...veloper/images/installer-license-show.png → ...veloper/images/installer-license-show.png
diff --git a/...veloper/images/installer-progress-bar.png → ...veloper/images/installer-progress-bar.png b/...veloper/images/installer-progress-bar.png → ...veloper/images/installer-progress-bar.png
diff --git a/...ker-developer/images/log-files-finder.png → ...ker-developer/images/log-files-finder.png b/...ker-developer/images/log-files-finder.png → ...ker-developer/images/log-files-finder.png
diff --git a/...ercon-us/docker-developer/images/logs.png → ...-us-2016/docker-developer/images/logs.png b/...ercon-us/docker-developer/images/logs.png → ...-us-2016/docker-developer/images/logs.png
diff --git a/...mages/mac-activity-monitor-docker-app.png → ...mages/mac-activity-monitor-docker-app.png b/...mages/mac-activity-monitor-docker-app.png → ...mages/mac-activity-monitor-docker-app.png
diff --git a/.../images/mac-install-success-docker-ps.png → .../images/mac-install-success-docker-ps.png b/.../images/mac-install-success-docker-ps.png → .../images/mac-install-success-docker-ps.png
diff --git a/...ercon-us/docker-developer/images/menu.png → ...-us-2016/docker-developer/images/menu.png b/...ercon-us/docker-developer/images/menu.png → ...-us-2016/docker-developer/images/menu.png
diff --git a/...ocker-developer/images/proxy-settings.png → ...ocker-developer/images/proxy-settings.png b/...ocker-developer/images/proxy-settings.png → ...ocker-developer/images/proxy-settings.png
diff --git a/...developer/images/remove-app-instances.png → ...developer/images/remove-app-instances.png b/...developer/images/remove-app-instances.png → ...developer/images/remove-app-instances.png
diff --git a/...-us/docker-developer/images/run-nginx.png → ...016/docker-developer/images/run-nginx.png b/...-us/docker-developer/images/run-nginx.png → ...016/docker-developer/images/run-nginx.png
diff --git a/...er-developer/images/settings-advanced.png → ...er-developer/images/settings-advanced.png b/...er-developer/images/settings-advanced.png → ...er-developer/images/settings-advanced.png
diff --git a/...ker-developer/images/settings-cpu-ram.png → ...ker-developer/images/settings-cpu-ram.png b/...ker-developer/images/settings-cpu-ram.png → ...ker-developer/images/settings-cpu-ram.png
diff --git a/...-developer/images/settings-docker-win.png → ...-developer/images/settings-docker-win.png b/...-developer/images/settings-docker-win.png → ...-developer/images/settings-docker-win.png
diff --git a/...ker-developer/images/settings-general.png → ...ker-developer/images/settings-general.png b/...ker-developer/images/settings-general.png → ...ker-developer/images/settings-general.png
diff --git a/...cker-developer/images/settings-kernel.png → ...cker-developer/images/settings-kernel.png b/...cker-developer/images/settings-kernel.png → ...cker-developer/images/settings-kernel.png
diff --git a/...ker-developer/images/settings-network.png → ...ker-developer/images/settings-network.png b/...ker-developer/images/settings-network.png → ...ker-developer/images/settings-network.png
diff --git a/...ocker-developer/images/settings-reset.png → ...ocker-developer/images/settings-reset.png b/...ocker-developer/images/settings-reset.png → ...ocker-developer/images/settings-reset.png
diff --git a/...veloper/images/settings-shared-drives.png → ...veloper/images/settings-shared-drives.png b/...veloper/images/settings-shared-drives.png → ...veloper/images/settings-shared-drives.png
diff --git a/...eloper/images/settings-toolbox-import.png → ...eloper/images/settings-toolbox-import.png b/...eloper/images/settings-toolbox-import.png → ...eloper/images/settings-toolbox-import.png
diff --git a/...r-developer/images/settings-uninstall.png → ...r-developer/images/settings-uninstall.png b/...r-developer/images/settings-uninstall.png → ...r-developer/images/settings-uninstall.png
diff --git a/...n-us/docker-developer/images/settings.png → ...2016/docker-developer/images/settings.png b/...n-us/docker-developer/images/settings.png → ...2016/docker-developer/images/settings.png
diff --git a/.../docker-developer/images/startup-help.png → .../docker-developer/images/startup-help.png b/.../docker-developer/images/startup-help.png → .../docker-developer/images/startup-help.png
diff --git a/.../docker-developer/images/submit-token.png → .../docker-developer/images/submit-token.png b/.../docker-developer/images/submit-token.png → .../docker-developer/images/submit-token.png
diff --git a/...cker-developer/images/toolbox-install.png → ...cker-developer/images/toolbox-install.png b/...cker-developer/images/toolbox-install.png → ...cker-developer/images/toolbox-install.png
diff --git a/...er-developer/images/whale-in-menu-bar.png → ...er-developer/images/whale-in-menu-bar.png b/...er-developer/images/whale-in-menu-bar.png → ...er-developer/images/whale-in-menu-bar.png
diff --git a/...docker-developer/images/whale-systray.png → ...docker-developer/images/whale-systray.png b/...docker-developer/images/whale-systray.png → ...docker-developer/images/whale-systray.png
diff --git a/...on-us/docker-developer/images/whale-x.png → ...-2016/docker-developer/images/whale-x.png b/...on-us/docker-developer/images/whale-x.png → ...-2016/docker-developer/images/whale-x.png
diff --git a/...rcon-us/docker-developer/images/whale.png → ...us-2016/docker-developer/images/whale.png b/...rcon-us/docker-developer/images/whale.png → ...us-2016/docker-developer/images/whale.png
diff --git a/...r/images/win-file-and-printer-sharing.png → ...r/images/win-file-and-printer-sharing.png b/...r/images/win-file-and-printer-sharing.png → ...r/images/win-file-and-printer-sharing.png
diff --git a/...mages/win-install-success-hello-world.png → ...mages/win-install-success-hello-world.png b/...mages/win-install-success-hello-world.png → ...mages/win-install-success-hello-world.png
diff --git a/...-developer/images/win-install-success.png → ...-developer/images/win-install-success.png b/...-developer/images/win-install-success.png → ...-developer/images/win-install-success.png
diff --git a/dockercon-us/docker-orchestration/Dockerfile → ...n-us-2016/docker-orchestration/Dockerfile b/dockercon-us/docker-orchestration/Dockerfile → ...n-us-2016/docker-orchestration/Dockerfile
diff --git a/dockercon-us/docker-orchestration/README.md → ...on-us-2016/docker-orchestration/README.md b/dockercon-us/docker-orchestration/README.md → ...on-us-2016/docker-orchestration/README.md
diff --git a/dockercon-us/docker-orchestration/app.py → ...ercon-us-2016/docker-orchestration/app.py b/dockercon-us/docker-orchestration/app.py → ...ercon-us-2016/docker-orchestration/app.py
diff --git a/...s/docker-orchestration/images/browser.png → ...6/docker-orchestration/images/browser.png b/...s/docker-orchestration/images/browser.png → ...6/docker-orchestration/images/browser.png
diff --git a/...on-us/docker-orchestration/images/cat.png → ...-2016/docker-orchestration/images/cat.png b/...on-us/docker-orchestration/images/cat.png → ...-2016/docker-orchestration/images/cat.png
diff --git a/...n-us/docker-orchestration/images/food.png → ...2016/docker-orchestration/images/food.png b/...n-us/docker-orchestration/images/food.png → ...2016/docker-orchestration/images/food.png
diff --git a/...on-us/docker-orchestration/images/hub.png → ...-2016/docker-orchestration/images/hub.png b/...on-us/docker-orchestration/images/hub.png → ...-2016/docker-orchestration/images/hub.png
diff --git a/...docker-orchestration/templates/index.html → ...docker-orchestration/templates/index.html b/...docker-orchestration/templates/index.html → ...docker-orchestration/templates/index.html
diff --git a/dockercon-us/images/dockercon.png → dockercon-us-2016/images/dockercon.png b/dockercon-us/images/dockercon.png → dockercon-us-2016/images/dockercon.png
diff --git a/windows/aspnet-web/docker-compose.yml b/windows/aspnet-web/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "3"
 
 services: