diff --git a/config/containers/multi-service_container.md b/config/containers/multi-service_container.md
index 566d879b5a..ddb7235c36 100644
--- a/config/containers/multi-service_container.md
+++ b/config/containers/multi-service_container.md
@@ -2,9 +2,10 @@
 description: How to run more than one process in a container
 keywords: docker, supervisor, process management
 redirect_from:
-- /engine/articles/using_supervisord/
-- /engine/admin/using_supervisord/
+- /articles/using_supervisord/
 - /engine/admin/multi-service_container/
+- /engine/admin/using_supervisord/
+- /engine/articles/using_supervisord/
 title: Run multiple services in a container
 ---
 
diff --git a/config/daemon/index.md b/config/daemon/index.md
index dc7032ea8c..11d4d915f0 100644
--- a/config/daemon/index.md
+++ b/config/daemon/index.md
@@ -2,22 +2,26 @@
 description: Configuring and troubleshooting the Docker daemon
 keywords: docker, daemon, configuration, troubleshooting
 redirect_from:
-- /engine/articles/chef/
-- /engine/articles/configuring/
-- /engine/articles/dsc/
-- /engine/articles/puppet/
-- /engine/admin/configuring/
-- /engine/admin/
-- /engine/admin/ansible/
-- /engine/admin/chef/
-- /engine/admin/dsc/
-- /engine/admin/puppet/
-- /engine/userguide/
+- /articles/chef/
+- /articles/configuring/
+- /articles/dsc/
+- /articles/puppet/
 - /config/thirdparty/
 - /config/thirdparty/ansible/
 - /config/thirdparty/chef/
 - /config/thirdparty/dsc/
 - /config/thirdparty/puppet/
+- /engine/admin/
+- /engine/admin/ansible/
+- /engine/admin/chef/
+- /engine/admin/configuring/
+- /engine/admin/dsc/
+- /engine/admin/puppet/
+- /engine/articles/chef/
+- /engine/articles/configuring/
+- /engine/articles/dsc/
+- /engine/articles/puppet/
+- /engine/userguide/
 
 title: Configure and troubleshoot the Docker daemon
 ---
diff --git a/config/daemon/systemd.md b/config/daemon/systemd.md
index 9efef3dc71..ba459bbe13 100644
--- a/config/daemon/systemd.md
+++ b/config/daemon/systemd.md
@@ -2,9 +2,10 @@
 description: Controlling and configuring Docker using systemd
 keywords: docker, daemon, systemd, configuration
 redirect_from:
-- /engine/articles/systemd/
+- /articles/host_integration/
 - /articles/systemd/
 - /engine/admin/systemd/
+- /engine/articles/systemd/
 title: Control Docker with systemd
 ---
 
diff --git a/develop/develop-images/baseimages.md b/develop/develop-images/baseimages.md
index aa55716b08..64053044a5 100644
--- a/develop/develop-images/baseimages.md
+++ b/develop/develop-images/baseimages.md
@@ -2,6 +2,7 @@
 description: How to create base images
 keywords: images, base image, examples
 redirect_from:
+- /articles/baseimages/
 - /engine/articles/baseimages/
 - /engine/userguide/eng-image/baseimages/
 title: Create a base image
diff --git a/engine/security/certificates.md b/engine/security/certificates.md
index 3a2cbbb7be..fe3a047ff7 100644
--- a/engine/security/certificates.md
+++ b/engine/security/certificates.md
@@ -2,6 +2,7 @@
 description: How to set up and use certificates with a registry to verify access
 keywords: Usage, registry, repository, client, root, certificate, docker, apache, ssl, tls, documentation, examples, articles, tutorials
 redirect_from:
+- /articles/certificates/
 - /engine/articles/certificates/
 title: Verify repository client with certificates
 ---
@@ -60,8 +61,10 @@ creating an os-provided bundled certificate chain.
 Use OpenSSL's `genrsa` and `req` commands to first generate an RSA
 key and then use the key to create the certificate.   
 
-    $ openssl genrsa -out client.key 4096
-    $ openssl req -new -x509 -text -key client.key -out client.cert
+```console
+$ openssl genrsa -out client.key 4096
+$ openssl req -new -x509 -text -key client.key -out client.cert
+```
 
 > **Note**:
 > These TLS commands only generate a working set of certificates on Linux.