Skip to content

Commit 9d4201e

Browse files
authored
Fix typo index (#2971)
* fix typo * fix typo
1 parent e803866 commit 9d4201e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/v2/api/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ type: api
943943
944944
- **Details:**
945945
946-
Called when an error from any descendent component is captured. The hook receives three arguments: the error, the component instance that triggered the error, and a string containing information on where the error was captured. The hook can return `false` to stop the error from propagating further.
946+
Called when an error from any descendant component is captured. The hook receives three arguments: the error, the component instance that triggered the error, and a string containing information on where the error was captured. The hook can return `false` to stop the error from propagating further.
947947
948948
<p class="tip">You can modify component state in this hook. However, it is important to have conditionals in your template or render function that short circuits other content when an error has been captured; otherwise the component will be thrown into an infinite render loop.</p>
949949

src/v2/guide/components-edge-cases.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Then inside `<google-map-markers>` you might find yourself reaching for a hack l
8181
var map = this.$parent.map || this.$parent.$parent.map
8282
```
8383

84-
This has quickly gotten out of hand. That's why to provide context information to descendent components arbitrarily deep, we instead recommend [dependency injection](#Dependency-Injection).
84+
This has quickly gotten out of hand. That's why to provide context information to descendant components arbitrarily deep, we instead recommend [dependency injection](#Dependency-Injection).
8585

8686
### Accessing Child Component Instances & Child Elements
8787

@@ -138,7 +138,7 @@ Earlier, when we described [Accessing the Parent Component Instance](#Accessing-
138138

139139
In this component, all descendants of `<google-map>` needed access to a `getMap` method, in order to know which map to interact with. Unfortunately, using the `$parent` property didn't scale well to more deeply nested components. That's where dependency injection can be useful, using two new instance options: `provide` and `inject`.
140140

141-
The `provide` options allows us to specify the data/methods we want to **provide** to descendent components. In this case, that's the `getMap` method inside `<google-map>`:
141+
The `provide` options allows us to specify the data/methods we want to **provide** to descendant components. In this case, that's the `getMap` method inside `<google-map>`:
142142

143143
```js
144144
provide: function () {
@@ -288,7 +288,7 @@ Then a `tree-folder-contents` component with this template:
288288
</ul>
289289
```
290290

291-
When you look closely, you'll see that these components will actually be each other's descendent _and_ ancestor in the render tree - a paradox! When registering components globally with `Vue.component`, this paradox is resolved for you automatically. If that's you, you can stop reading here.
291+
When you look closely, you'll see that these components will actually be each other's descendant _and_ ancestor in the render tree - a paradox! When registering components globally with `Vue.component`, this paradox is resolved for you automatically. If that's you, you can stop reading here.
292292

293293
However, if you're requiring/importing components using a __module system__, e.g. via Webpack or Browserify, you'll get an error:
294294

0 commit comments

Comments
 (0)