Merge branch 'main' into feat/en-anchor

Author: wxsms

src/guide/essentials/computed.md

@@ -138,7 +138,7 @@ See also: [Typing Computed](/guide/typescript/composition-api.html#typing-comput
 
 </div>
 
-## Computed Caching vs Methods {#computed-caching-vs-methods}
+## Computed Caching vs. Methods {#computed-caching-vs-methods}
 
 You may have noticed we can achieve the same result by invoking a method in the expression:
 

src/guide/essentials/conditional.md

@@ -98,7 +98,7 @@ The difference is that an element with `v-show` will always be rendered and rema
 
 `v-show` doesn't support the `<template>` element, nor does it work with `v-else`.
 
-## `v-if` vs `v-show` {#v-if-vs-v-show}
+## `v-if` vs. `v-show` {#v-if-vs-v-show}
 
 `v-if` is "real" conditional rendering because it ensures that event listeners and child components inside the conditional block are properly destroyed and re-created during toggles.
 

src/guide/extras/render-function.md

@@ -687,4 +687,10 @@ MyComponent.emits = ['click']
 
 If the `props` option is not specified, then the `props` object passed to the function will contain all attributes, the same as `attrs`. The prop names will not be normalized to camelCase unless the `props` option is specified.
 
+For functional components with explicit `props`, [attribute fallthrough](/guide/components/attrs.html) works much the same as with normal components. However, for functional components that don't explicitly specify their `props`, only the `class`, `style`, and `onXxx` event listeners will be inherited from the `attrs` by default. In either case, `inheritAttrs` can be set to `false` to disable attribute inheritance:
+
+```js
+MyComponent.inheritAttrs = false
+```
+
 Functional components can be registered and consumed just like normal components. If you pass a function as the first argument to `h()`, it will be treated as a functional component.