Simplify layout mentions

josevalim · josevalim · commit 4b5f68f4ac58 · 2025-03-25T17:11:41.000+01:00
diff --git a/guides/server/gettext.md b/guides/server/gettext.md
@@ -53,8 +53,7 @@ LiveViews by default:
 
     def live_view do
       quote do
-        use Phoenix.LiveView,
-          layout: {MyAppWeb.Layouts, :app}
+        use Phoenix.LiveView
 
         on_mount MyAppWeb.RestoreLocale
         unquote(view_helpers())
diff --git a/guides/server/live-layouts.md b/guides/server/live-layouts.md
@@ -1,25 +1,26 @@
 # Live layouts
 
-From Phoenix v1.7, your application is made of two layouts:
+Your LvieView applications can be made of two layouts:
 
   * the root layout - this is a layout used by both LiveView and
     regular views. This layout typically contains the `<html>`
     definition alongside the head and body tags. Any content defined
     in the root layout will remain the same, even as you live navigate
     across LiveViews. The root layout is typically declared on the
     router with `put_root_layout` and defined as "root.html.heex"
-    in your layouts folder
+    in your layouts folder. It calls `{@inner_content}` to inject the
+    content rendered by the layout
 
   * the app layout - this is the default application layout which
     is rendered on both regular HTTP requests and LiveViews.
-    It defaults to "app.html.heex"
+    It defaults to "app.html.heex". This layout is typically set
+    on `use Phoenix.LiveView, layout: ...` but it has been discouraged
+    in more recent Phoenix versions, in favor of using explicit function
+    components as layouts.
 
 Overall, those layouts are found in `components/layouts` and are
 embedded within `MyAppWeb.Layouts`.
 
-All layouts must call `{@inner_content}` to inject the
-content rendered by the layout.
-
 ## Root layout
 
 The "root" layout is rendered only on the initial request and
@@ -31,27 +32,6 @@ is typically defined in your router:
 The root layout can also be set via the `:root_layout` option
 in your router via `Phoenix.LiveView.Router.live_session/2`.
 
-## Application layout
-
-The "app.html.heex" layout is rendered with either `@conn` or
-`@socket`. Both Controllers and LiveViews explicitly define
-the default layouts they will use. See the `def controller`
-and `def live_view` definitions in your `MyAppWeb` to learn how
-it is included.
-
-For LiveViews, the default layout can be overridden in two different
-ways for flexibility:
-
-  1. The `:layout` option in `Phoenix.LiveView.Router.live_session/2`,
-     when set, will override the `:layout` option given via
-     `use Phoenix.LiveView`
-
-  2. The `:layout` option returned on mount, via `{:ok, socket, layout: ...}`
-     will override any previously set layout option
-
-The LiveView itself will be rendered inside the layout wrapped by
-the `:container` tag.
-
 ## Updating document title
 
 Because the root layout from the Plug pipeline is rendered outside of
diff --git a/guides/server/security-model.md b/guides/server/security-model.md
@@ -186,8 +186,7 @@ to run it on all LiveViews by default:
 
     def live_view do
       quote do
-        use Phoenix.LiveView,
-          layout: {MyAppWeb.Layouts, :app}
+        use Phoenix.LiveView
 
         on_mount MyAppWeb.UserLiveAuth
         unquote(html_helpers())
diff --git a/lib/phoenix_component.ex b/lib/phoenix_component.ex
@@ -969,8 +969,9 @@ defmodule Phoenix.Component do
   * `:sticky` - an optional flag to maintain the LiveView across live redirects, even if it is
   nested within another LiveView. Note that this only works for LiveViews that are in the same
   [live_session](`Phoenix.LiveView.Router.live_session/3`).
-  If you are rendering the sticky view within make sure that the sticky view itself does not use
-  the same layout. You can do so by returning `{:ok, socket, layout: false}` from mount.
+  If you are rendering the sticky view within another LiveView, make sure that the sticky view
+  itself does not use the same layout. You can do so by returning `{:ok, socket, layout: false}`
+  from mount.
 
   ## Examples
 
