Merge branch 'master' into x/terrain-readme

docs/get-started/using-with-map.md

@@ -20,7 +20,7 @@ When using deck.gl and Mapbox, there are two options you can choose from:
 
 [react-map-gl](https://github.com/visgl/react-map-gl) is a React wrapper around mapbox-gl. If you'd like to use deck.gl with React, this component is the recommended companion.
 
-All the [examples on this website](https://github.com/visgl/deck.gl/tree/master/examples/website) are implemented using the React integration. The `DeckGL` React component works especially well as the parent of a react-map-gl [StaticMap](https://visgl.github.io/react-map-gl/#/Documentation/api-reference/static-map), which automatically interprets the deck.gl view state (i.e. latitude, longitude, zoom etc). In this configuration your deck.gl layers will render as a perfectly synchronized geospatial overlay over the underlying map.
+All the [examples on this website](https://github.com/visgl/deck.gl/tree/master/examples/website) are implemented using the React integration. The `DeckGL` React component works especially well as the parent of a react-map-gl [StaticMap](https://visgl.github.io/react-map-gl/docs/api-reference/static-map), which automatically interprets the deck.gl view state (i.e. latitude, longitude, zoom etc). In this configuration your deck.gl layers will render as a perfectly synchronized geospatial overlay over the underlying map.
 
 ### About Mapbox Tokens
 

docs/get-started/using-with-react.md

@@ -132,7 +132,7 @@ For more information on this syntax, see [DeckGL API](/docs/api-reference/react/
 ## Remarks
 
 * The `DeckGL` component is typically rendered as a child of a
-  map component like [react-map-gl](https://visgl.github.io/react-map-gl/#/),
+  map component like [react-map-gl](https://visgl.github.io/react-map-gl),
   but could be rendered as a child of any React component that you want to
   overlay your layers on top of.
 

examples/website/trips/README.md

@@ -1,4 +1,4 @@
-This is a minimal standalone version of the [TripsLayer example](https://deck.gl/#/examples/custom-layers/trip-routes)
+This is a minimal standalone version of the [TripsLayer example](https://deck.gl/#/examples/core-layers/trips-layer)
 on [deck.gl](http://deck.gl) website.
 
 ### Usage
@@ -26,4 +26,4 @@ npm start
 
 ### Data format
 Sample data is stored in [deck.gl Example Data](https://github.com/visgl/deck.gl-data/tree/master/examples/trips). To use your own data, check out
-the [documentation of TripsLayer](https://github.com/visgl/deck.gl/tree/master/modules/experimental-layers/src/trips-layer).
+the [documentation of TripsLayer](../../../docs/layers/trips-layer.md).