From 41be5dca4e0b03eedc86d49caba33a65111359a5 Mon Sep 17 00:00:00 2001
From: Brandon Casey <BrandonOCasey@users.noreply.github.com>
Date: Mon, 13 Mar 2017 11:53:30 -0400
Subject: [PATCH] docs: tech order will only have html5 by default (#4188)

---
 docs/guides/faq.md     | 16 +++++++---------
 docs/guides/options.md |  6 +++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/docs/guides/faq.md b/docs/guides/faq.md
index f625357e37..428a47f96a 100644
--- a/docs/guides/faq.md
+++ b/docs/guides/faq.md
@@ -45,7 +45,7 @@
 video.js is an extendable framework/library around the native video element. It does the following:
 
 * Offers a plugin API so that different types of video can be handed to the native
-  video element (e.g. HLS, Flash, HTML5 video, etc).
+  video element (e.g. [HLS][hls], [Flash][flash], HTML5 video, etc).
 * Unifies the native video api across browsers (polyfilling support for features
   if necessary)
 * Offers an extendable and themable UI
@@ -117,9 +117,7 @@ about reduced test cases visit [css-tricks](https://css-tricks.com/reduced-test-
 ## Q: What media formats does video.js support?
 
 This depends on the formats supported by the browser's HTML5 video element, and the playback
-techs made available to video.js. For example, video.js 5 includes the Flash tech by default which
-enables the playback of FLV video where the Flash plugin is available. For more information
-on media formats see the [troubleshooting guide][troubleshooting].
+techs/plugins made available to video.js. For more information on media formats see the [troubleshooting guide][troubleshooting].
 
 ## Q: How to I autoplay the video?
 
@@ -156,8 +154,7 @@ Will make an inline, muted, autoplaying video on an iPhone with iOS10.
 
 ## Q: How can I play RTMP video in video.js?
 
-Make sure that the Flash tech is available -- RTMP is not playable on browsers without Flash including mobile. Then, just set the rtmp source with
-an appropriate type -- `rtmp/mp4` or `rtmp/flv`.
+Make sure that the Flash tech is available -- RTMP is not playable on browsers without Flash including mobile. Flash will only be available on video.js 6 with the [videojs-flash package][flash], in previous versions it was builtin to video.js. Then, just set the rtmp source with an appropriate type -- `rtmp/mp4` or `rtmp/flv`.
 The main thing to be aware of is that video.js splits the connection url and stream name with the `&` character.
 So, you'd want to update the url to follow that format. For example: `rtmp://example.com/live&foo` or `rtmp://example.com/fms&mp4:path/to/file.mp4`.
 
@@ -214,7 +211,7 @@ See the [video.js github wiki][skins-list].
 
 Yes! It can be used to play audio only files in a `<video>` or `<audio>` tag. The
 difference being that the `<audio>` tag will not have a blank display area and the `<video>`
-tag will. Note that audio only will not work with the Flash playback tech.
+tag will. Note that audio only will not work with the Flash playback tech. The Flash playback tech will only be included in versions of video.js before 6. In Video.js 6 you will need to use the [videojs-flash package][flash].
 
 ## Q: Does video.js support audio tracks?
 
@@ -242,8 +239,7 @@ adds support for MPEG DASH video.
 
 ## Q: Does video.js support live video?
 
-Yes! Video.js adds support for live videos via the Flash tech which supports RTMP streams.
-The official HLS tech, [videojs-contrib-hls][hls], will add support for live HLS video
+Yes! Video.js adds support for live videos via the Flash tech tech which supports RTMP streams. In Video.js 6 you will have to use [videojs-flash][flash] to get this. In previous versions the Flash tech was builtin. The official HLS tech, [videojs-contrib-hls][hls], will add support for live HLS video
 if you add it to your page with video.js.
 
 ## Q: Can video.js wrap around YouTube videos?
@@ -292,6 +288,8 @@ Yes! See [ReactJS integration example](./guides/react.md).
 
 [hls]: http://github.com/videojs/videojs-contrib-hls
 
+[flash]: https://github.com/videojs/videojs-flash
+
 [dash]: http://github.com/videojs/videojs-contrib-dash
 
 [eme]: https://github.com/videojs/videojs-contrib-eme
diff --git a/docs/guides/options.md b/docs/guides/options.md
index 9f62ca8a1d..f5150600ac 100644
--- a/docs/guides/options.md
+++ b/docs/guides/options.md
@@ -207,7 +207,7 @@ See [the plugins guide](plugins.md) for more information on Video.js plugins.
 
 > Type: `boolean`, Default: `false`
 >
-> **Note:** In video.js 6.0, this option will default to `true`.
+> **Note:** In video.js 6.0, this option will default to `true`. and that [videojs-flash](https://github.com/videojs/videojs-flash) will be required to use the flash tech.
 
 Tells Video.js to prefer the order of [`sources`](#sources) over [`techOrder`](#techorder) in selecting a source and playback tech.
 
@@ -275,9 +275,9 @@ Using `<source>` elements will have the same effect:
 
 ### `techOrder`
 
-> Type: `Array`, Default: `['html5', 'flash']`
+> Type: `Array`, Default: `['html5']`
 
-Defines the order in which Video.js techs are preferred. By default, this means that the `Html5` tech is preferred, but Video.js will fall back to `Flash` if no `Html5`-compatible source can be found.
+Defines the order in which Video.js techs are preferred. By default, this means that the `Html5` tech is preferred. Other regisetered techs will be added after this tech in the order in which they are registered.
 
 ### `vtt.js`