Merge branch 'master' into component-intro-tables

* master:
  [yahoonativeads-amp] code cleanup and bug fix (ampproject#26325)
  rephrased reasoning for text node  (ampproject#26393)
  Render video alt and title attributes in vertical rendering mdoe. (ampproject#26370)
  Revert "Update I2I & I2S to reflect new Open Source process (ampproject#25530)" (ampproject#26392)
  Skip amp story affiliate link test (ampproject#26386)
  Update I2I & I2S to reflect new Open Source process (ampproject#25530)
  ✨ Add support for `"intrisic"` layout for `<amp-script>` (ampproject#26369)
  📖 Rename Dev Channel to Experimental Channel in docs and comments (ampproject#26255)
  ✨Add support for AMP Story Quiz Reaction API calls (ampproject#26242)
  clarified text node behavior (ampproject#26376)

# Conflicts:
#	extensions/amp-script/amp-script.md
#	extensions/amp-timeago/amp-timeago.md

.github/ISSUE_TEMPLATE/release-tracking-issue.md

@@ -13,8 +13,8 @@ assignees: ''
 <!--
 Note to onduty:
 
-Use this issue to track a release from the initial canary release build through
-production. The community uses this issue to keep track of what is going on
+Use this issue to track a release from the initial experimental/beta release build through
+promotion to stable and LTS. The community uses this issue to keep track of what is going on
 with the release so please keep this issue up to date:
 
 - As you reach each stage of the release, check the appropriate checkbox and replace <CL submit time> with the "Submitted" text from the corresponding CL, e.g. "2:49 PM, Jul 25, 2018 UTC-4".
@@ -23,30 +23,30 @@ with the release so please keep this issue up to date:
   release number to the GitHub tag page the first time a given release number
   appears in the checkboxes.
 - Add any updates that may be of interest to the community (such as delays) as
-  comments on this issue, including after the release is pushed to production.
+  comments on this issue, including after the release is promoted to Stable (and, in some cases, LTS).
 - Keep the title of the issue updated to reflect whether this issue is tracking
-  the Canary or the build in Production.
+  the Experimental/Beta builds or the build in Stable.
 
 Note: remove the backticks (``) from the link.
 -->
 
 - [x] Release `[<RELEASE_NUMBER>](https://github.com/ampproject/amphtml/releases/tag/<RELEASE_NUMBER>)` is cut as a new canary release
-- [ ] Release <RELEASE_NUMBER> pushed to dev channel (<CL submit time>)
-- [ ] Release <RELEASE_NUMBER> pushed to 1% (<CL submit time>)
-- [ ] Release <RELEASE_NUMBER> pushed to production (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Experimental and Beta (opt-in) channels (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Experimental and Beta (1% traffic) channels (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to Stable channel (<CL submit time>)
 
 <!--
 If this release will become the next LTS release, add/update the checkboxes above as needed e.g.
 
 - [x] Release <RELEASE_NUMBER> will be the next LTS
-- [ ] Release <RELEASE_NUMBER> pushed to LTS (<CL submit time>)
+- [ ] Release <RELEASE_NUMBER> promoted to LTS (<CL submit time>)
 
 If you perform cherry picks, add/update the checkboxes above as needed e.g.
 
 - [ ] Release `[<CHERRY_PICK_RELEASE_NUMBER>](...)` created with cherry picks
-- [ ] Release <CHERRY_PICK_RELEASE_NUMBER> pushed to Dev Channel
+- [ ] Release <CHERRY_PICK_RELEASE_NUMBER> promoted to Experimental and Beta channels
 -->
 
-See the [release documentation](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md) for more information on the release process, including how to test changes in the Dev Channel.
+See the [release documentation](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md) for more information on the release process, including how to test changes in the Experimental channel.
 
 If you find a bug in this build, please file an [issue](https://github.com/ampproject/amphtml/issues/new). If you believe the bug should be fixed in this build, follow the instructions in the [cherry picks documentation](https://go.amp.dev/cherry-picks).

3p/README.md

@@ -66,5 +66,5 @@ Review the [ads/README](../ads/README.md) for further details on ad integration.
 You should ensure there are integration tests for your extension. These should be added to the AMP
 repo where it makes sense. In some cases this won't be possible because it relies on bringing up
 third-party infrastructure. In these cases you should maintain testing for the extension on your
-infrastructure against both production AMP and [canary](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#amp-dev-channel).
+infrastructure against both production AMP and [canary](https://github.com/ampproject/amphtml/blob/master/contributing/release-schedule.md#amp-experimental-and-beta-channels).
 Upon any monitored failures, an escalation can be raised in [regular AMP communication channel](https://github.com/ampproject/amphtml/blob/master/CONTRIBUTING.md#discussion-channels).

ads/yahoonativeads.js

@@ -29,21 +29,6 @@ export function yahoonativeads(global, data) {
   global.publisherUrl = data.url;
   global.amp = true;
 
-  global.context.observeIntersection(
-    entries => {
-      entries.forEach(entry => {
-        if (global.Native) {
-          global.Native.onViewChange({
-            intersectionRatio: entry.intersectionRatio,
-          });
-        }
-      });
-    },
-    {
-      threshold: [0, 0.5, 1],
-    }
-  );
-
   loadScript(global, 'https://s.yimg.com/dy/ads/native.js', () =>
     global.context.renderStart()
   );

build-system/tasks/presubmit-checks.js

@@ -427,6 +427,7 @@ const forbiddenTerms = {
       'extensions/amp-experiment/1.0/variant.js',
       'extensions/amp-user-notification/0.1/amp-user-notification.js',
       'extensions/amp-consent/0.1/consent-state-manager.js',
+      'extensions/amp-story/1.0/amp-story-quiz.js',
     ],
   },
   'getBaseCid': {

contributing/getting-started-e2e.md

@@ -582,9 +582,9 @@ AMP is pushed to production after undergoing testing. Generally, it takes about
 
 **Once the push of the build that includes your change is complete all users of AMP will be using the code you contributed!**
 
-You can see whether your change made it into a given build on the [amphtml Releases page](https://github.com/ampproject/amphtml/releases). The build marked `Pre-release` is the version on the Dev Channel and the build marked `Latest Release` is what is running in production. Your Pull Request will be listed in the first build that includes it; if you don't see your Pull Request listed it will likely be in the next build.
+You can see whether your change made it into a given build on the [amphtml Releases page](https://github.com/ampproject/amphtml/releases). The build marked `Pre-release` is the version on the Experimental Channel and the build marked `Latest Release` is what is running in production. Your Pull Request will be listed in the first build that includes it; if you don't see your Pull Request listed it will likely be in the next build.
 
-You can set your browser to use the Dev Channel build by enabling `dev-channel` on the [AMP Experiments](https://cdn.ampproject.org/experiments.html) page. This will let you see how your changes will affect any AMP page before your changes are rolled out to all AMP pages. Note that this only affects the browser in which you enable the experiment.
+You can set your browser to use the Experimental Channel build by enabling `experimental-channel` on the [AMP Experiments](https://cdn.ampproject.org/experiments.html) page. This will let you see how your changes will affect any AMP page before your changes are rolled out to all AMP pages. Note that this only affects the browser in which you enable the experiment.
 
 You can verify the AMP version your browser is using for a given page by looking at your browser's developer console. After loading an AMP page (e.g. [https://amp.dev](https://amp.dev)) the console will have a message like `Powered by AMP ⚡ HTML – Version <build number>`). The `<build number>` will match one of the build numbers on the [amphtml Releases page](https://github.com/ampproject/amphtml/releases).
 

contributing/getting-started-quick.md

@@ -155,6 +155,6 @@ git checkout -b <branch name> master
 
 - If your change affected internal documentation, tests, the build process, etc. you can generally see your changes right after they're merged.
 - If your change was to the code that runs on AMP pages across the web, you'll have to wait for the change to be included in a production release. Generally, it takes about 1-2 weeks for a change to be live for all users. See the [release schedule](release-schedule.md) for more specific details.
-- The [amphtml Releases page](https://github.com/ampproject/amphtml/releases) will list your PR in the first build that contains it. `Pre-release` is the build on the Dev Channel, `Latest Release` is the build in production.
-- Opt in to using the Dev Channel in a browser by enabling `dev-channel` on the [AMP Experiments](https://cdn.ampproject.org/experiments.html) page.
+- The [amphtml Releases page](https://github.com/ampproject/amphtml/releases) will list your PR in the first build that contains it. `Pre-release` is the build on the Experimental Channel, `Latest Release` is the build in production.
+- Opt in to using the Experimental Channel in a browser by enabling `experimental-channel` on the [AMP Experiments](https://cdn.ampproject.org/experiments.html) page.
 - Find the AMP version being used on a page in the developer console, i.e. `Powered by AMP ⚡ HTML – Version <build number>`.