diff --git a/_data/toc.yaml b/_data/toc.yaml
index ae8109bc01..b3882524be 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -1018,6 +1018,8 @@ samples:
     title: CouchDB
   - path: /compose/django/
     title: Django and PostgreSQL
+  - path: /compose/wordpress/
+    title: WordPress
   - path: /engine/examples/postgresql_service/
     title: PostgreSQL
   - path: /compose/rails/
diff --git a/compose/completion.md b/compose/completion.md
index ca3fa0d008..40e5a3caed 100644
--- a/compose/completion.md
+++ b/compose/completion.md
@@ -118,8 +118,6 @@ Enjoy working with Compose faster and with fewer typos!
 
 - [User guide](index.md)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/compose-file/compose-file-v1.md b/compose/compose-file/compose-file-v1.md
index 11aeb134ed..9910f6190e 100644
--- a/compose/compose-file/compose-file-v1.md
+++ b/compose/compose-file/compose-file-v1.md
@@ -653,5 +653,5 @@ tty: true
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
-- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index fb19ad4272..ad39219bee 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -1994,5 +1994,5 @@ networks:
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
-- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 056855b35a..98132ed4ae 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -2758,5 +2758,5 @@ stack.
 - [User guide](../index.md)
 - [Installing Compose](../install.md)
 - [Compose file versions and upgrading](compose-versioning.md)
-- [Samples](../../samples/index.md)
+- [Sample apps with Compose](../samples-for-compose.md)
 - [Command line reference](../reference/index.md)
diff --git a/compose/django.md b/compose/django.md
index 87d14a5805..c90c0c6d7d 100644
--- a/compose/django.md
+++ b/compose/django.md
@@ -255,7 +255,6 @@ def85eff5f51        django_web          "python3 manage.py..."   10 minutes ago
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/env-file.md b/compose/env-file.md
index c13823fb3a..7ac2325a8a 100644
--- a/compose/env-file.md
+++ b/compose/env-file.md
@@ -50,5 +50,8 @@ in your Compose file, and can also be used to define the following
 ## More Compose documentation
 
 - [User guide](index.md)
+- [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/extends.md b/compose/extends.md
index 63add279a6..aa645f98f8 100644
--- a/compose/extends.md
+++ b/compose/extends.md
@@ -372,8 +372,6 @@ container:
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/faq.md b/compose/faq.md
index 8923ddc510..2f60603cb2 100644
--- a/compose/faq.md
+++ b/compose/faq.md
@@ -111,9 +111,9 @@ github](https://github.com/search?q=in%3Apath+docker-compose.yml+extension%3Ayml
 
 ## Compose documentation
 
+- [User guide](index.md)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/gettingstarted.md b/compose/gettingstarted.md
index fb0e7b0a38..c84b0ed37f 100644
--- a/compose/gettingstarted.md
+++ b/compose/gettingstarted.md
@@ -333,8 +333,7 @@ At this point, you have seen the basics of how Compose works.
 
 ## Where to go next
 
-- Next, try the quick start guide for [Django](django.md),
-  [Rails](rails.md), or [WordPress](wordpress.md)
+- Next, try the [Sample apps with Compose](samples-for-compose.md)
 - [Explore the full list of Compose commands](reference/index.md)
 - [Compose configuration file reference](compose-file/index.md)
 - To learn more about volumes and bind mounts, see [Manage data in Docker](../storage/index.md)
diff --git a/compose/install.md b/compose/install.md
index 96384ea7b7..403d7b4fd3 100644
--- a/compose/install.md
+++ b/compose/install.md
@@ -277,9 +277,8 @@ pip uninstall docker-compose
 ## Where to go next
 
 - [User guide](index.md)
+- [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/link-env-deprecated.md b/compose/link-env-deprecated.md
index e163dbd133..d4b5095e37 100644
--- a/compose/link-env-deprecated.md
+++ b/compose/link-env-deprecated.md
@@ -39,5 +39,7 @@ Fully qualified container name, such as `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 - [User guide](index.md)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/production.md b/compose/production.md
index aff87a64ad..c864daeac4 100644
--- a/compose/production.md
+++ b/compose/production.md
@@ -75,6 +75,9 @@ Read more about the Compose/Swarm integration in the
 
 ## Compose documentation
 
+- [User guide](index.md)
 - [Installing Compose](install.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/rails.md b/compose/rails.md
index dab3656d16..19312ec589 100644
--- a/compose/rails.md
+++ b/compose/rails.md
@@ -269,7 +269,6 @@ host.
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with WordPress](wordpress.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/startup-order.md b/compose/startup-order.md
index 732fba8376..35f63abb2c 100644
--- a/compose/startup-order.md
+++ b/compose/startup-order.md
@@ -89,9 +89,9 @@ script:
 
 ## Compose documentation
 
+- [User guide](index.md)
 - [Installing Compose](install.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
-- [Get started with WordPress](wordpress.md)
+- [Getting Started](gettingstarted.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/compose/wordpress.md b/compose/wordpress.md
index ad05f3a3b8..e3f31eaf1a 100644
--- a/compose/wordpress.md
+++ b/compose/wordpress.md
@@ -142,7 +142,6 @@ network, and the WordPress database.
 - [User guide](index.md)
 - [Installing Compose](install.md)
 - [Getting Started](gettingstarted.md)
-- [Get started with Django](django.md)
-- [Get started with Rails](rails.md)
 - [Command line reference](reference/index.md)
 - [Compose file reference](compose-file/index.md)
+- [Sample apps with Compose](samples-for-compose.md)
diff --git a/samples/index.md b/samples/index.md
index 5749c4602d..7970f60a2c 100644
--- a/samples/index.md
+++ b/samples/index.md
@@ -27,17 +27,18 @@ repository]({{ labsbase }}).
 
 Run popular software using Docker.
 
-| Sample | Description |
-| ------ | ----------- |
-| [apt-cacher-ng](/engine/examples/apt-cacher-ng/) | Run a Dockerized apt-cacher-ng instance. |
-| [.Net Core application](/engine/examples/dotnetcore/) | Run a Dockerized ASP.NET Core application. |
-| [ASP.NET Core + SQL Server on Linux](/compose/aspnet-mssql-compose/) | Run a Dockerized ASP.NET Core + SQL Server environment. |
-| [CouchDB](/engine/examples/couchdb_data_volumes/) | Run a Dockerized CouchDB instance. |
-| [Django + PostgreSQL](/compose/django/) | Run a Dockerized Django + PostgreSQL environment. |
-| [PostgreSQL](/engine/examples/postgresql_service/) | Run a Dockerized PostgreSQL instance. |
-| [Rails + PostgreSQL](/compose/rails/) | Run a Dockerized Rails + PostgreSQL environment. |
-| [Riak](/engine/examples/running_riak_service/) | Run a Dockerized Riak instance. |
-| [SSHd](/engine/examples/running_ssh_service/) | Run a Dockerized SSHd instance. |
+| Sample                                                                    | Description                                               |
+| ------------------------------------------------------------------------- | --------------------------------------------------------- |
+| [apt-cacher-ng](../engine/examples/apt-cacher-ng.md)                      | Run a Dockerized apt-cacher-ng instance.                  |
+| [.Net Core application](../engine/examples/dotnetcore.md)                 | Run a Dockerized ASP.NET Core application.                |
+| [ASP.NET Core + SQL Server on Linux](../compose/aspnet-mssql-compose.md)  | Run a Dockerized ASP.NET Core + SQL Server environment.   |
+| [CouchDB](../engine/examples/couchdb_data_volumes.md)                     | Run a Dockerized CouchDB instance.                        |
+| [Django + PostgreSQL](../compose/django.md)                               | Run a Dockerized Django + PostgreSQL environment.         |
+| [PostgreSQL](../engine/examples/postgresql_service.md)                    | Run a Dockerized PostgreSQL instance.                     |
+| [Rails + PostgreSQL](../compose/rails.md)                                 | Run a Dockerized Rails + PostgreSQL environment.          |
+| [Riak](../engine/examples/running_riak_service.md)                        | Run a Dockerized Riak instance.                           |
+| [SSHd](../engine/examples/running_ssh_service.md)                         | Run a Dockerized SSHd instance.                           |
+| [WordPress](../compose/wordpress.md)                                      | Quickstart: Compose and WordPress.                        |
 
 ## Library references