diff --git a/docs/reviewing.md b/docs/reviewing.md
index f42f88d674..61fe6a887d 100644
--- a/docs/reviewing.md
+++ b/docs/reviewing.md
@@ -36,6 +36,9 @@ If possible, try to avoid mixing single quotes (`'`) and double quotes (`"`) in
 
 When extracting sources or performing out-of-source builds, it is preferable to use a _subfolder_ attribute, `_source_subfolder` and `_build_subfolder` respectively.
 
+> **Note**: These are only required when using the legacy generator such as `cmake`. For the new generators like `CMakeToolchain` see
+> the [2.0 Migration Guide](v2_migration.md#using-layout-with-new-generators) for more information.
+
 For example doing this with property attributes for these variables:
 
 ```py
@@ -209,9 +212,9 @@ having the same naming conventions for the options may help consumers, e.g. they
 ## Supported Versions
 
 In this repository we are building a subset of all the versions for a given library. This set of version changes over time as new versions
-are released and old ones stop to be used. 
+are released and old ones stop to be used.
 
-We always welcome latest releases as soon as they are available, and from time to time we remove old versions mainly due to technical reasons: 
+We always welcome latest releases as soon as they are available, and from time to time we remove old versions mainly due to technical reasons:
 the more versions we have, the more resources that are needed in the CI and the more time it takes to build each pull-request (also, the
 more chances of failing because of unexpected errors).
 
diff --git a/docs/v2_migration.md b/docs/v2_migration.md
index c38d114a5c..e038ab998d 100644
--- a/docs/v2_migration.md
+++ b/docs/v2_migration.md
@@ -26,6 +26,11 @@ changes and improvements, you can read about them in the
 This document is a practical guide, offering extended information particular to Conan
 Center Index recipes to get them ready to upgrade to Conan 2.0.
 
+## Using Layout with New Generators
+
+All recipes should use a layout, when doing this there is no need to manually define `self._subfolder_[...]` in a recipe.
+Simply use `self.source_folder` and `self.build_folder` instead of [subfolder properties](reviewing.md#subfolder-properties)
+
 ## New cpp_info set_property model
 
 New Conan generators like