Skip to content

Commit f349db3

Browse files
committed
docs(en): fix conflicts
1 parent 18cca1d commit f349db3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/content/api/loaders.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ module.exports.pitch = function (remainingRequest, precedingRequest, data) {
188188

189189
loader context 表示在 loader 内使用 `this` 可以访问的一些方法或属性。
190190

191-
### Example for the loader context {#example-for-the-loader-context}
191+
### loader 上下文示例 {#example-for-the-loader-context}
192192

193193
下面提供一个例子,将使用 require 进行调用:
194194

src/content/configuration/other-options.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ module.exports = {
193193
};
194194
```
195195

196-
### cache.idleTimeout
196+
### cache.idleTimeout {#cacheidletimeout}
197197

198198
`number = 60000`
199199

200-
Time in milliseconds. `cache.idleTimeout` denotes the time period after which the cache storing should happen.
200+
时间以毫秒为单位。`cache.idleTimeout` 表示缓存存储发生的时间间隔。
201201

202-
`cache.idleTimeout` option is only available when [`cache.type`](#cachetype) is set to `'filesystem'`.
202+
`cache.idleTimeout` 配置项仅在 [`cache.type`] `'filesystem'` 时生效。
203203

204204
**webpack.config.js**
205205

@@ -219,7 +219,7 @@ module.exports = {
219219

220220
单位毫秒。 `cache.idleTimeoutForInitialStore` 是在初始缓存存储发生后的时间段。
221221

222-
`cache.idleTimeoutForInitialStore` option is only available when [`cache.type`](#cachetype) is set to `filesystem`.
222+
`cache.idleTimeoutForInitialStore` 配置项仅在 [`cache.type`] `'filesystem'` 时生效。
223223

224224
**webpack.config.js**
225225

0 commit comments

Comments
 (0)