From 7f966c4c10a9109ffa35a45ba3116ce1e47dcd23 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 26 Jun 2017 10:49:11 -0700 Subject: [PATCH] Remove edge-only admonitions --- engine/admin/logging/awslogs.md | 2 -- engine/admin/logging/overview.md | 1 - engine/admin/logging/plugins.md | 2 -- engine/swarm/networking.md | 2 -- engine/swarm/services.md | 3 --- engine/userguide/eng-image/multistage-build.md | 3 --- 6 files changed, 13 deletions(-) diff --git a/engine/admin/logging/awslogs.md b/engine/admin/logging/awslogs.md index c1aa188857..bf835b6551 100644 --- a/engine/admin/logging/awslogs.md +++ b/engine/admin/logging/awslogs.md @@ -77,8 +77,6 @@ specified, the container ID is used as the log stream. ### awslogs-create-group -{% include edge_only.md section="option" %} - Log driver will return an error by default if the log group does not exist. However, you can set the `awslogs-create-group` to `true` to automatically create the log group as needed. The `awslogs-create-group` option defaults to `false`. diff --git a/engine/admin/logging/overview.md b/engine/admin/logging/overview.md index e6af21ff9c..9a0e7f55b4 100644 --- a/engine/admin/logging/overview.md +++ b/engine/admin/logging/overview.md @@ -19,7 +19,6 @@ In addition to using the logging drivers included with Docker, you can also implement and use [logging driver plugins](/engine/admin/logging/plugins.md). Logging driver plugins are available in Docker 17.05 and higher. -{% include edge_only.md section="feature" %} ## Configure the default logging driver diff --git a/engine/admin/logging/plugins.md b/engine/admin/logging/plugins.md index d8695aeb82..387c630a1c 100644 --- a/engine/admin/logging/plugins.md +++ b/engine/admin/logging/plugins.md @@ -4,8 +4,6 @@ title: Use a logging driver plugin keywords: logging, driver, plugins, monitoring --- -{% include edge_only.md section="page" %} - Docker logging plugins allow you to extend and customize Docker's logging capabilities beyond those of the [built-in logging drivers](overview.md). A logging service provider can diff --git a/engine/swarm/networking.md b/engine/swarm/networking.md index 8eb0e83c5e..6be5c3c867 100644 --- a/engine/swarm/networking.md +++ b/engine/swarm/networking.md @@ -259,8 +259,6 @@ DNS round robin (DNSRR). You can configure this per service. ## Customize the ingress network -{% include edge_only.md section="feature" %} - Most users never need to configure the `ingress` network, but Docker 17.05 and higher allow you to do so. This can be useful if the automatically-chosen subnet conflicts with one that already exists on your network, or you need to customize diff --git a/engine/swarm/services.md b/engine/swarm/services.md index a0213bbfbd..ffa063db6c 100644 --- a/engine/swarm/services.md +++ b/engine/swarm/services.md @@ -472,7 +472,6 @@ flag. For more information, see ### Control service scale and placement -{% include edge_only.md section="options" %} Swarm mode has two types of services: replicated and global. For replicated services, you specify the number of replica tasks for the swarm manager to schedule onto available nodes. For global services, the scheduler places one @@ -540,8 +539,6 @@ labels to ensure that your service is deployed to the appropriate swarm nodes. ### Specify service placement preferences (--placement-pref) -{% include edge_only.md section="feature" %} - You can set up the service to divide tasks evenly over different categories of nodes. One example of where this can be useful is to balance tasks over a set of datacenters or availability zones. The example below illustrates this: diff --git a/engine/userguide/eng-image/multistage-build.md b/engine/userguide/eng-image/multistage-build.md index a7f15b22f0..175a8a839b 100644 --- a/engine/userguide/eng-image/multistage-build.md +++ b/engine/userguide/eng-image/multistage-build.md @@ -4,8 +4,6 @@ keywords: images, containers, best practices title: Use multi-stage builds --- -{% include edge_only.md section="page" %} - Multi-stage builds are a new feature in Docker 17.05, and they will be exciting to anyone who has struggled to optimize Dockerfiles while keeping them easy to read and maintain. @@ -156,4 +154,3 @@ CMD ["./app"] - Check out the blog post [Builder pattern vs. Multi-stage builds in Docker](http://blog.alexellis.io/mutli-stage-docker-builds/) for full source code and a walk-through of these examples. -- Check out other features available in [Docker Edge](/edge/)