Merge remote-tracking branch 'refs/remotes/atom/master'

This commit is contained in:
Plusb Preco 2015-11-04 10:50:33 +09:00
commit df5a3d4e68

View file

@ -178,7 +178,7 @@ Returns:
Emitted when `webContents` wants to do basic auth.
The default behavior is to cancel all authentications, to override this you
should prevent the default behavior with `event.preventDefault()` and call
should prevent the default behavior with `event.preventDefault()` and call
`callback(username, password)` with the credentials.
```javascript