diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 052240d1..1e4ec7f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ try asking [on the Leaflet forum](https://groups.google.com/forum/#!forum/leafle ### Considerations for Accepting Patches -While we happily accept patches, we're also commited to keeping Leaflet simple, lightweight and blazingly fast. +While we happily accept patches, we're also committed to keeping Leaflet simple, lightweight and blazingly fast. So bugfixes, performance optimizations and small improvements that don't add a lot of code are much more likely to get accepted quickly. @@ -53,7 +53,7 @@ Before sending a pull request with a new feature, first check if it's been discu or [Leaflet UserVoice](http://leaflet.uservoice.com/)), and then ask yourself two questions: - 1. Are you sure that this new feature is important enough to justify its presense in the Leaflet core? + 1. Are you sure that this new feature is important enough to justify its presence in the Leaflet core? Or will it look better as a plugin in a separate repository? 2. Is it written in a simple, concise way that doesn't add bulk to the codebase? @@ -85,7 +85,7 @@ Please do not commit to the `master` branch, or your unrelated changes will go i You should also follow the code style and whitespace conventions of the original codebase. In particular, use tabs for indentation and spaces for alignment. -Before commiting your changes, run `jake lint` to catch any JS errors in the code and fix them. +Before committing your changes, run `jake lint` to catch any JS errors in the code and fix them. If you add any new files to the Leaflet source, make sure to also add them to `build/deps.js` so that the build system knows about them. @@ -142,7 +142,7 @@ If you need to make edits in a local repository to see how it looks in the proce 4. Open `localhost:4000` in your browser. Now any file changes will be updated when you reload pages automatically. -After commiting the changes, just send a pull request. +After committing the changes, just send a pull request. If you need to update documentation according to a new feature that only appeared in the master version (not stable one), you need to make changes to `gh-pages-master` branch instead of `gh-pages`. diff --git a/FAQ.md b/FAQ.md index 669662ae..e44e363d 100644 --- a/FAQ.md +++ b/FAQ.md @@ -29,7 +29,7 @@ Check out [this example](http://leaflet-extras.github.io/leaflet-providers/previ with half a hundred different layers to choose from. Popular commercial options, free up to a particular number of requests, include [MapBox](http://mapbox.com), -[Bing Maps](http://www.microsoft.com/maps/choose-your-binge's-maps-API.aspx) (using a [plugin](https://github.com/shramov/leaflet-plugins)), +[Bing Maps](http://www.microsoft.com/maps/choose-your-bing-maps-API.aspx) (using a [plugin](https://github.com/shramov/leaflet-plugins)), [Esri ArcGIS](http://www.arcgis.com/features/maps/imagery.html) ([official plugin](https://github.com/Esri/esri-leaflet)) and [Nokia Here](http://developer.here.com/web-experiences). A notable exception is [MapQuest Open](http://developer.mapquest.com/web/products/open/map), which is free for any number of requests. @@ -45,7 +45,7 @@ and [MapQuest Open](http://developer.mapquest.com/web/products/open/map) provide #### I want to use Google Maps API tiles with Leaflet, can I do that? -The problem with Google is that its [Terms of Use](https://developers.google.com/maps/terms?hl=ru) forbid any means of tile access other than through the Google Maps API. +The problem with Google is that its [Terms of Use](https://developers.google.com/maps/terms) forbid any means of tile access other than through the Google Maps API. You can add the Google Maps API as a Leaflet layer with a [plugin](https://github.com/shramov/leaflet-plugins). But note that the map experience will not be perfect, because Leaflet will just act as a proxy to the Google Maps JS engine, so you won't get all the performance and usability benefits of using Leaflet when the Google layer is on.