From 094098b571d883b417a64226daff9f3511e0b90a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 16 Jun 2016 15:19:38 -0700 Subject: [PATCH 1/2] Correct typos in docs --- docs/api/app.md | 2 +- docs/api/web-contents.md | 4 ++-- docs/api/web-frame.md | 2 +- docs/tutorial/security.md | 2 +- docs/tutorial/windows-store-guide.md | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/api/app.md b/docs/api/app.md index 26db57704d67..7082c76f2515 100644 --- a/docs/api/app.md +++ b/docs/api/app.md @@ -424,7 +424,7 @@ Clears the recent documents list. 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 -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 your application as a parameter. diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md index 60c736e0041c..19a7ba07556c 100644 --- a/docs/api/web-contents.md +++ b/docs/api/web-contents.md @@ -325,8 +325,8 @@ Returns: * `event` Event * `params` Object - * `x` Integer - x coodinate - * `y` Integer - y coodinate + * `x` Integer - x coordinate + * `y` Integer - y coordinate * `linkURL` String - URL of the link that encloses the node the context menu was invoked on. * `linkText` String - Text associated with the link. May be an empty diff --git a/docs/api/web-frame.md b/docs/api/web-frame.md index a933b8b48138..1ad5589bfb4e 100644 --- a/docs/api/web-frame.md +++ b/docs/api/web-frame.md @@ -141,7 +141,7 @@ previous navigation). 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 -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, and intend to stay there). diff --git a/docs/tutorial/security.md b/docs/tutorial/security.md index 2ac25d135ebc..ca8bd3a4b7fc 100644 --- a/docs/tutorial/security.md +++ b/docs/tutorial/security.md @@ -56,7 +56,7 @@ This is not bulletproof, but at the least, you should attempt the following: (using `webPreferences`) * 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/) -, 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) , which allows strings to be executed as code. * Do not set `allowDisplayingInsecureContent` to true. diff --git a/docs/tutorial/windows-store-guide.md b/docs/tutorial/windows-store-guide.md index 6378ccb25a28..7a5108d66ba2 100644 --- a/docs/tutorial/windows-store-guide.md +++ b/docs/tutorial/windows-store-guide.md @@ -104,7 +104,7 @@ folder. 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. 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. ## 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 [electron-packager]: https://github.com/electron-userland/electron-packager [electron-windows-store]: https://github.com/catalystcode/electron-windows-store -[background-task]: https://github.com/felixrieseberg/electron-uwp-background \ No newline at end of file +[background-task]: https://github.com/felixrieseberg/electron-uwp-background From a3b933f1f8c99018936cbaad010efa8503339e0f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 16 Jun 2016 15:26:58 -0700 Subject: [PATCH 2/2] Fence block as yml --- docs/tutorial/testing-on-headless-ci.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorial/testing-on-headless-ci.md b/docs/tutorial/testing-on-headless-ci.md index 5e75235d4f28..343d2d242cc9 100644 --- a/docs/tutorial/testing-on-headless-ci.md +++ b/docs/tutorial/testing-on-headless-ci.md @@ -34,7 +34,7 @@ xvfb-maybe electron-mocha ./test/*.js On Travis, your `.travis.yml` should look roughly like this: -``` +```yml addons: apt: packages: