Merge pull request #6092 from electron/doc-typos

Minor doc typo fixes
This commit is contained in:
Kevin Sawicki 2016-06-16 15:27:59 -07:00 committed by GitHub
commit a6e3eeee2d
6 changed files with 8 additions and 8 deletions

View file

@ -424,7 +424,7 @@ Clears the recent documents list.
This method sets the current executable as the default handler for a protocol This method sets the current executable as the default handler for a protocol
(aka URI scheme). It allows you to integrate your app deeper into the operating (aka URI scheme). It allows you to integrate your app deeper into the operating
system. Once registered, all links with `your-protocol://` will be openend with system. Once registered, all links with `your-protocol://` will be opened with
the current executable. The whole link, including protocol, will be passed to the current executable. The whole link, including protocol, will be passed to
your application as a parameter. your application as a parameter.

View file

@ -325,8 +325,8 @@ Returns:
* `event` Event * `event` Event
* `params` Object * `params` Object
* `x` Integer - x coodinate * `x` Integer - x coordinate
* `y` Integer - y coodinate * `y` Integer - y coordinate
* `linkURL` String - URL of the link that encloses the node the context menu * `linkURL` String - URL of the link that encloses the node the context menu
was invoked on. was invoked on.
* `linkText` String - Text associated with the link. May be an empty * `linkText` String - Text associated with the link. May be an empty

View file

@ -141,7 +141,7 @@ previous navigation).
Note that blindly calling this method probably makes Electron slower since it Note that blindly calling this method probably makes Electron slower since it
will have to refill these emptied caches, you should only call it if an event will have to refill these emptied caches, you should only call it if an event
in your app has occured that makes you think your page is actually using less in your app has occurred that makes you think your page is actually using less
memory (i.e. you have navigated from a super heavy page to a mostly empty one, memory (i.e. you have navigated from a super heavy page to a mostly empty one,
and intend to stay there). and intend to stay there).

View file

@ -56,7 +56,7 @@ This is not bulletproof, but at the least, you should attempt the following:
(using `webPreferences`) (using `webPreferences`)
* Do not disable `webSecurity`. Disabling it will disable the same-origin policy. * Do not disable `webSecurity`. Disabling it will disable the same-origin policy.
* Define a [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/) * Define a [`Content-Security-Policy`](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)
, and use restrictive rules (ie: `script-src 'self'`) , and use restrictive rules (i.e. `script-src 'self'`)
* [Override and disable `eval`](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6) * [Override and disable `eval`](https://github.com/nylas/N1/blob/0abc5d5defcdb057120d726b271933425b75b415/static/index.js#L6)
, which allows strings to be executed as code. , which allows strings to be executed as code.
* Do not set `allowDisplayingInsecureContent` to true. * Do not set `allowDisplayingInsecureContent` to true.

View file

@ -34,7 +34,7 @@ xvfb-maybe electron-mocha ./test/*.js
On Travis, your `.travis.yml` should look roughly like this: On Travis, your `.travis.yml` should look roughly like this:
``` ```yml
addons: addons:
apt: apt:
packages: packages:

View file

@ -104,7 +104,7 @@ folder.
Once the expanded AppX files are created, the tool uses the Windows App Packager Once the expanded AppX files are created, the tool uses the Windows App Packager
(`MakeAppx.exe`) to create a single-file AppX package from those files on disk. (`MakeAppx.exe`) to create a single-file AppX package from those files on disk.
Finally, the tool can be used to create a trusted certificate on your computer Finally, the tool can be used to create a trusted certificate on your computer
to sign the new AppX pacakge. With the signed AppX package, the CLI can also to sign the new AppX package. With the signed AppX package, the CLI can also
automatically install the package on your machine. automatically install the package on your machine.
## Step 3: Using the AppX Package ## Step 3: Using the AppX Package
@ -157,4 +157,4 @@ Once installation succeeded, you can move on to compiling your Electron app.
[add-appxpackage]: https://technet.microsoft.com/en-us/library/hh856048.aspx [add-appxpackage]: https://technet.microsoft.com/en-us/library/hh856048.aspx
[electron-packager]: https://github.com/electron-userland/electron-packager [electron-packager]: https://github.com/electron-userland/electron-packager
[electron-windows-store]: https://github.com/catalystcode/electron-windows-store [electron-windows-store]: https://github.com/catalystcode/electron-windows-store
[background-task]: https://github.com/felixrieseberg/electron-uwp-background [background-task]: https://github.com/felixrieseberg/electron-uwp-background