From aace14e077fcb01baab22a73667d3b8044e7ff38 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 14:38:31 -0500
Subject: [PATCH 01/14] Create 0000-deprecate-non-colocated-components.md

---
 ...0000-deprecate-non-colocated-components.md | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 text/0000-deprecate-non-colocated-components.md

diff --git a/text/0000-deprecate-non-colocated-components.md b/text/0000-deprecate-non-colocated-components.md
new file mode 100644
index 0000000000..cefef1b3aa
--- /dev/null
+++ b/text/0000-deprecate-non-colocated-components.md
@@ -0,0 +1,77 @@
+---
+stage: accepted
+start-date:
+release-date:
+release-versions:
+teams: # delete teams that aren't relevant
+  - cli
+  - data
+  - framework
+  - learning
+  - steering
+  - typescript
+prs:
+  accepted: # update this to the PR that you propose your RFC in
+project-link:
+---
+
+<!---
+Directions for above:
+
+stage: Leave as is
+start-date: Fill in with today's date, 2032-12-01T00:00:00.000Z
+release-date: Leave as is
+release-versions: Leave as is
+teams: Include only the [team(s)](README.md#relevant-teams) for which this RFC applies
+prs:
+  accepted: Fill this in with the URL for the Proposal RFC PR
+project-link: Leave as is
+-->
+
+# Deprecate non-co-located components.
+
+## Summary
+
+Deprecates
+- classic component layout
+- pods component layout
+
+## Motivation
+
+> Why are we doing this? What are the problems with the deprecated feature?
+What is the replacement functionality?
+
+## Transition Path
+
+> This is the bulk of the RFC. Explain the use-cases that deprecated functionality
+covers, and for each use-case, describe the transition path.
+Describe it in enough detail for someone who uses the deprecated functionality
+to understand, for someone to write the deprecation guide, and for someone
+familiar with the implementation to implement.
+
+## How We Teach This
+
+> Would the acceptance of this proposal mean the Ember guides must be
+re-organized or altered? Does it change how Ember is taught to new users
+at any level?
+Does it mean we need to put effort into highlighting the replacement
+functionality more? What should we do about documentation, in the guides
+related to this feature?
+How should this deprecation be introduced and explained to existing Ember
+users?
+
+## Drawbacks
+
+> Why should we *not* do this? Please consider the impact on teaching Ember,
+on the integration of this feature with other existing and planned features,
+on the impact of the API churn on existing apps, etc.
+There are tradeoffs to choosing any path, please attempt to identify them here.
+
+## Alternatives
+
+> What other designs have been considered? What is the impact of not doing this?
+
+## Unresolved questions
+
+> Optional, but suggested for first drafts. What parts of the design are still
+TBD?

From f1757801330b86da7854072b411707f6b1a88d6d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:16:24 -0500
Subject: [PATCH 02/14] Actually write the thing

---
 ...0000-deprecate-non-colocated-components.md |  77 ----------
 ...0995-deprecate-non-colocated-components.md | 132 ++++++++++++++++++
 2 files changed, 132 insertions(+), 77 deletions(-)
 delete mode 100644 text/0000-deprecate-non-colocated-components.md
 create mode 100644 text/0995-deprecate-non-colocated-components.md

diff --git a/text/0000-deprecate-non-colocated-components.md b/text/0000-deprecate-non-colocated-components.md
deleted file mode 100644
index cefef1b3aa..0000000000
--- a/text/0000-deprecate-non-colocated-components.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-stage: accepted
-start-date:
-release-date:
-release-versions:
-teams: # delete teams that aren't relevant
-  - cli
-  - data
-  - framework
-  - learning
-  - steering
-  - typescript
-prs:
-  accepted: # update this to the PR that you propose your RFC in
-project-link:
----
-
-<!---
-Directions for above:
-
-stage: Leave as is
-start-date: Fill in with today's date, 2032-12-01T00:00:00.000Z
-release-date: Leave as is
-release-versions: Leave as is
-teams: Include only the [team(s)](README.md#relevant-teams) for which this RFC applies
-prs:
-  accepted: Fill this in with the URL for the Proposal RFC PR
-project-link: Leave as is
--->
-
-# Deprecate non-co-located components.
-
-## Summary
-
-Deprecates
-- classic component layout
-- pods component layout
-
-## Motivation
-
-> Why are we doing this? What are the problems with the deprecated feature?
-What is the replacement functionality?
-
-## Transition Path
-
-> This is the bulk of the RFC. Explain the use-cases that deprecated functionality
-covers, and for each use-case, describe the transition path.
-Describe it in enough detail for someone who uses the deprecated functionality
-to understand, for someone to write the deprecation guide, and for someone
-familiar with the implementation to implement.
-
-## How We Teach This
-
-> Would the acceptance of this proposal mean the Ember guides must be
-re-organized or altered? Does it change how Ember is taught to new users
-at any level?
-Does it mean we need to put effort into highlighting the replacement
-functionality more? What should we do about documentation, in the guides
-related to this feature?
-How should this deprecation be introduced and explained to existing Ember
-users?
-
-## Drawbacks
-
-> Why should we *not* do this? Please consider the impact on teaching Ember,
-on the integration of this feature with other existing and planned features,
-on the impact of the API churn on existing apps, etc.
-There are tradeoffs to choosing any path, please attempt to identify them here.
-
-## Alternatives
-
-> What other designs have been considered? What is the impact of not doing this?
-
-## Unresolved questions
-
-> Optional, but suggested for first drafts. What parts of the design are still
-TBD?
diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
new file mode 100644
index 0000000000..142d0f71e2
--- /dev/null
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -0,0 +1,132 @@
+---
+stage: accepted
+start-date: 2023-12-15
+release-date:
+release-versions:
+teams: # delete teams that aren't relevant
+  - cli
+  - framework
+  - learning
+  - typescript
+prs:
+  accepted: https://github.com/emberjs/rfcs/pull/995
+project-link:
+---
+
+<!---
+Directions for above:
+
+stage: Leave as is
+start-date: Fill in with today's date, 2032-12-01T00:00:00.000Z
+release-date: Leave as is
+release-versions: Leave as is
+teams: Include only the [team(s)](README.md#relevant-teams) for which this RFC applies
+prs:
+  accepted: Fill this in with the URL for the Proposal RFC PR
+project-link: Leave as is
+-->
+
+# Deprecate non-co-located components.
+
+## Summary
+
+Deprecates
+- classic component layout
+- pods component layout
+
+
+After "ember@6", only the following will be allowed:
+- co-located components 
+- gjs / gts components
+
+## Motivation
+
+These older component layouts force build tooling to keep a lot of resolution rules around, and makes it hard for codemods and other community tooling to effectively work across folks' projects.
+
+
+## Transition Path
+
+There are two types of paths to migrate off the old layouts 
+- use a currently supported multi-file layout (keeping separate `js`, `ts`, and hbs files)
+- migrate the component entirely to the latest component format, `gjs`, `gts`, (aka `<template>`)
+
+There are some tools to help with this:
+- [Classic to Colocation](https://github.com/ember-codemods/ember-component-template-colocation-migrator)
+- [Convert pods to Colocation](https://github.com/ijlee2/ember-codemod-pod-to-octane)
+- [Convert to `<template>`](https://github.com/IgnaceMaes/ember-codemod-template-tag)
+
+
+Specifically, these layouts are no longer supported
+
+### Classic 
+
+```
+{app,addon}/
+  components/
+    foo.js
+    namespace/
+      bar.js
+  templates/
+    components/
+      foo.hbs
+      namespace/
+        bar.hbs
+```
+
+### Pods' Component layout.
+
+```
+{app,addon}/
+  components/
+    foo/
+      component.js
+      template.hbs
+    namespace/
+      bar/
+        component.js
+        template.hbs
+```
+
+The above example(s) could fairly easily be migrated (by users) to:
+
+```
+{app,addon}/
+  components/
+    foo.js 
+    foo.hbs
+    namespace/
+      bar.js
+      bar.hbs
+```
+
+Or using `component-structure=nested`
+
+```
+{app,addon}/
+  components/
+    foo/
+      index.js 
+      index.hbs
+    namespace/
+      bar/
+        index.js
+        index.hbs
+```
+
+
+## How We Teach This
+
+## Drawbacks
+
+- Some super old addons may break
+- Some super old apps may break    
+
+In either case, it's been years, and the deprecation will will give folks actionable information for how to move forward.
+
+## Alternatives
+
+none
+
+## Unresolved questions
+
+none

From f884b338c5cf8dcb13379ccb6e1488a6390139d7 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:18:22 -0500
Subject: [PATCH 03/14] update

---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 142d0f71e2..491f70cca2 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -121,7 +121,7 @@ Or using `component-structure=nested`
 - Some super old addons may break
 - Some super old apps may break    
 
-In either case, it's been years, and the deprecation will will give folks actionable information for how to move forward.
+In either case, it's been ~5 years since co-located components were introduced, and the deprecation will will give folks actionable information for how to move forward (ideally with a link to the deprecation site which can then link to tools folks can try).
 
 ## Alternatives
 

From ec32ff756cdbdc94353ffda8a679632b588dd631 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:18:48 -0500
Subject: [PATCH 04/14] Update timestamp

---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 491f70cca2..58a402f7a4 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -1,6 +1,6 @@
 ---
 stage: accepted
-start-date: 2023-12-15
+start-date: 2023-12-15T00:00:00.000Z
 release-date:
 release-versions:
 teams: # delete teams that aren't relevant

From 64678ce19fe3eb7df13d23942ec07d4d7e43627a Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:19:54 -0500
Subject: [PATCH 05/14] up

---
 text/0995-deprecate-non-colocated-components.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 58a402f7a4..5e008e4ec7 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -118,6 +118,7 @@ Or using `component-structure=nested`
 
 ## Drawbacks
 
+If upgrading to ember v6 without any changes,
 - Some super old addons may break
 - Some super old apps may break    
 

From 788ba16a4b6349ea897df4c150beaf27a2759815 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:30:31 -0500
Subject: [PATCH 06/14] Mention blueprint update

---
 ...0995-deprecate-non-colocated-components.md | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 5e008e4ec7..c1a0a9827e 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -113,9 +113,54 @@ Or using `component-structure=nested`
         index.hbs
 ```
 
+### `ember-source`
+
+The blueprint for components will need to remove the `classic` option:
+
+Here is the output at the time of authoring this RFC:
+```bash 
+❯ pnpm ember g component --help
+Requested ember-cli commands:
+
+ember generate <blueprint> <options...>
+  Generates new code from blueprints.
+  aliases: g
+  --dry-run (Boolean) (Default: false)
+    aliases: -d
+  --verbose (Boolean) (Default: false)
+    aliases: -v
+  --pod (Boolean) (Default: false)
+    aliases: -p, -pods
+  --classic (Boolean) (Default: false)
+    aliases: -c
+  --dummy (Boolean) (Default: false)
+    aliases: -dum, -id
+  --in-repo-addon (String) (Default: null)
+    aliases: --in-repo <value>, -ir <value>
+  --lint-fix (Boolean) (Default: true)
+  --in (String) (Default: null) Runs a blueprint against an in repo addon. A path is expected, relative to the root of the project.
+  --typescript (Boolean) Generates a version of the blueprint written in TypeScript (if available).
+    aliases: -ts
+
+      component <name> <options...>
+        Generates a component.
+        --path (String) (Default: components)
+          aliases: --no-path (--path="")
+        --component-class (@ember/component, @glimmer/component, @ember/component/template-only, "") (Default: --no-component-class)
+          aliases: -cc (--component-class=@ember/component), -gc (--component-class=@glimmer/component), -tc (--component-class=@ember/component/template-only), -nc (--component-class=""), --no-component-class (--component-class=""), --with-component-class (--component-class=@glimmer/component)
+        --component-structure (flat, nested, classic) (Default: flat)
+          aliases: -fs (--component-structure=flat), -ns (--component-structure=nested), -cs (--component-structure=classic)
+
+```
+
+Specifically, we'll remove:
+- `--component-structure=classic` and its alias
+
 
 ## How We Teach This
 
+Guides and docs already dont mention the above old layouts.
+
 ## Drawbacks
 
 If upgrading to ember v6 without any changes,

From b5b24eec53b03f8961d419cdd3707766a7cdc853 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:23:01 -0500
Subject: [PATCH 07/14] Update text/0995-deprecate-non-colocated-components.md

Co-authored-by: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com>
---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index c1a0a9827e..020e058be3 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -159,7 +159,7 @@ Specifically, we'll remove:
 
 ## How We Teach This
 
-Guides and docs already dont mention the above old layouts.
+Guides and docs already don't mention the above old layouts.
 
 ## Drawbacks
 

From 4a7e32f8949a542a41b6f2f708e3f7bbd1df1eea Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:23:06 -0500
Subject: [PATCH 08/14] Update text/0995-deprecate-non-colocated-components.md

Co-authored-by: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com>
---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 020e058be3..209df5146f 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -47,7 +47,7 @@ These older component layouts force build tooling to keep a lot of resolution ru
 ## Transition Path
 
 There are two types of paths to migrate off the old layouts 
-- use a currently supported multi-file layout (keeping separate `js`, `ts`, and hbs files)
+- use a currently supported multi-file layout (keeping separate `js`, `ts`, and `hbs` files)
 - migrate the component entirely to the latest component format, `gjs`, `gts`, (aka `<template>`)
 
 There are some tools to help with this:

From 7a1847e65d547e23b6a3abbacaf5f53f3bff7fe9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 15 Dec 2023 17:23:13 -0500
Subject: [PATCH 09/14] Update text/0995-deprecate-non-colocated-components.md

Co-authored-by: MrChocolatine <47531779+MrChocolatine@users.noreply.github.com>
---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 209df5146f..257458ed8f 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -167,7 +167,7 @@ If upgrading to ember v6 without any changes,
 - Some super old addons may break
 - Some super old apps may break    
 
-In either case, it's been ~5 years since co-located components were introduced, and the deprecation will will give folks actionable information for how to move forward (ideally with a link to the deprecation site which can then link to tools folks can try).
+In either case, it's been ~5 years since co-located components were introduced, and the deprecation will give folks actionable information for how to move forward (ideally with a link to the deprecation site which can then link to tools folks can try).
 
 ## Alternatives
 

From 55dc957b09007e1c5070e021aad00eca72eddd09 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 16 Dec 2023 18:32:22 -0500
Subject: [PATCH 10/14] Update text/0995-deprecate-non-colocated-components.md

Co-authored-by: Jeldrik Hanschke <jelhan@users.noreply.github.com>
---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 257458ed8f..11a4949ded 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -167,7 +167,7 @@ If upgrading to ember v6 without any changes,
 - Some super old addons may break
 - Some super old apps may break    
 
-In either case, it's been ~5 years since co-located components were introduced, and the deprecation will give folks actionable information for how to move forward (ideally with a link to the deprecation site which can then link to tools folks can try).
+In either case, it's been ~4 years since co-located components were introduced, and the deprecation will give folks actionable information for how to move forward (ideally with a link to the deprecation site which can then link to tools folks can try).
 
 ## Alternatives
 

From 2ab46de5a11ab33679af2fcbe1d2c4b2a0768ace Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:50:53 -0500
Subject: [PATCH 11/14] Add deprecation guide and info about layout

---
 ...0995-deprecate-non-colocated-components.md | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 11a4949ded..a3fa79a422 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -113,6 +113,9 @@ Or using `component-structure=nested`
         index.hbs
 ```
 
+Note, however, that classi components _importing_ the `layout` and setting it on an `@ember/component` will still work.
+The key thing being deprecated is the runtime resolution of templates, so if there is an import involved, there is no runtime resolution.
+
 ### `ember-source`
 
 The blueprint for components will need to remove the `classic` option:
@@ -161,6 +164,72 @@ Specifically, we'll remove:
 
 Guides and docs already don't mention the above old layouts.
 
+### How to migrate off old layouts 
+
+#### component templates in `templates/components`
+
+**Before**
+```
+{app,addon}
+  components/
+    demo.js
+  templates/
+    components/
+      demo.hbs
+```
+
+**After**
+```
+{app,addon}
+  components/
+    demo.js
+    demo.hbs
+```
+
+**After (gjs)**
+```
+{app,addon}
+  components/
+    demo.gjs
+```
+
+#### Pods
+
+
+**Before**
+```
+{app,addon}
+  components/
+    demo/
+      component.js
+      template.hbs
+```
+
+**After**
+```
+{app,addon}
+  components/
+    demo/
+      index.js
+      index.hbs
+```
+
+**After (non-nested)**
+```
+{app,addon}
+  components/
+    demo.js
+    demo.hbs
+```
+
+**After (gjs)**
+```
+{app,addon}
+  components/
+    demo.gjs
+```
+
+
 ## Drawbacks
 
 If upgrading to ember v6 without any changes,

From b328d89d4bd963d8ddfff4c14f02902c9092f838 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:39:51 -0500
Subject: [PATCH 12/14] Update text/0995-deprecate-non-colocated-components.md

Co-authored-by: Chris Manson <mansona@users.noreply.github.com>
---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index a3fa79a422..bfec945efb 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -113,7 +113,7 @@ Or using `component-structure=nested`
         index.hbs
 ```
 
-Note, however, that classi components _importing_ the `layout` and setting it on an `@ember/component` will still work.
+Note, however, that classic components _importing_ the `layout` and setting it on an `@ember/component` will still work.
 The key thing being deprecated is the runtime resolution of templates, so if there is an import involved, there is no runtime resolution.
 
 ### `ember-source`

From e657d48c67abcb8a52960de157d9b146ec111b05 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:49:34 -0500
Subject: [PATCH 13/14] Update 0995-deprecate-non-colocated-components.md

---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index bfec945efb..456929503c 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -35,7 +35,7 @@ Deprecates
 - pods component layout
 
 
-After "ember@6", only the following will be allowed:
+Once this deprecation is implemented, only the following will be allowed:
 - co-located components 
 - gjs / gts components
 

From 1f303092fb650991d3a76e272e1106efe5dd51a4 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:50:46 -0500
Subject: [PATCH 14/14] Update text/0995-deprecate-non-colocated-components.md

---
 text/0995-deprecate-non-colocated-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/text/0995-deprecate-non-colocated-components.md b/text/0995-deprecate-non-colocated-components.md
index 456929503c..0de131f283 100644
--- a/text/0995-deprecate-non-colocated-components.md
+++ b/text/0995-deprecate-non-colocated-components.md
@@ -164,7 +164,7 @@ Specifically, we'll remove:
 
 Guides and docs already don't mention the above old layouts.
 
-### How to migrate off old layouts 
+### Deprecation Guide
 
 #### component templates in `templates/components`