From 77253abbd70105f223db10a2c98552fd52b8734b Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 4 Mar 2014 21:25:43 +0800 Subject: [PATCH] :memo: Mention the change of default security of node integration. --- docs/api/browser/browser-window.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/api/browser/browser-window.md b/docs/api/browser/browser-window.md index d6ef45380a61..ce019154a4dd 100644 --- a/docs/api/browser/browser-window.md +++ b/docs/api/browser/browser-window.md @@ -48,9 +48,9 @@ Creates a new `BrowserWindow` with native properties set by the `options`. Usually you only need to set the `width` and `height`, other properties will have decent default values. -By default the `node-integration` option is `all`, which means node integration -is available to the main page and all its iframes. You can also set it to -`except-iframe`, which would disable node integration in all iframes, or +By default the `node-integration` option is `except-iframe`, which means node +integration is disabled in all iframes, . You can also set it to `all`, with +which node integration is available to the main page and all its iframes, or `manual-enable-iframe`, which is like `except-iframe`, but would enable iframes whose name is suffixed by `-enable-node-integration`. And setting to `disable` would disable the node integration in both the main page and its iframes.