From d4800ac14d81d3308679d9cad7bcc694b2117725 Mon Sep 17 00:00:00 2001
From: Amaltas <amaltas@google.com>
Date: Wed, 12 Feb 2020 14:15:33 -0800
Subject: [PATCH] Validator rollup (#26771)

* cl/294457507 Revision bump for #26475

* cl/294516530 Revision bump for #26708

* cl/294516739 Update node.js version numbers

* cl/294681603 Revision bump for #26747

Co-authored-by: honeybadgerdontcare <honeybadgerdontcare@users.noreply.github.com>
---
 validator/nodejs/README.md          | 86 ++++++++++++++---------------
 validator/validator-main.protoascii |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/validator/nodejs/README.md b/validator/nodejs/README.md
index fee7df6b0666..9680aa1a4483 100644
--- a/validator/nodejs/README.md
+++ b/validator/nodejs/README.md
@@ -53,85 +53,85 @@ As expected, this emits errors because the provided string in the example, `<htm
 
 ## Release Notes
 
-### 1.0.10
+### 1.0.29
 
-- Fixed [#4246: amphtml-validator CLI fails on Mac OS X](https://github.com/ampproject/amphtml/issues/4246).
+- Reintroduce node v8 support. Supports node v8, v10, v12 and v14.
 
-### 1.0.11
+### 1.0.28
 
-- Added support for AMP4ADS (via --html_format command line flag) and
-  argument for validateString function in the API.
+- Reintroduce node v10 support and introduce node v14 support.
 
-### 1.0.12
+### 1.0.27
 
-- Added support for --user-agent option.
+- Removed references to amp.validator.categorizeError.
 
-### 1.0.13
+### 1.0.26
 
-- Added newInstance method, a simple API that's not async.
+- Introduce node v12 support and remove node v10 support.
 
-### 1.0.15
+### 1.0.25
 
-- Added support for installing on Windows.
-  `npm install -g amphtml-validator` should now just work.
+- Broken release, removed.
 
-### 1.0.16
+### 1.0.24
 
-- `npm install amphtml-validator` (local install) should now work on Windows,
-  for `require('amphtml-validator')`.
+- Introduce node v10 support and remove node 8 support.
 
-### 1.0.17
+### 1.0.23
 
-- If the amphtml-validator command is already patched up for Windows, leave it
-  alone instead of failing. Relevant if the package has been installed globally
-  and now we're performing a local install on top of it.
+- The amphtml-validator binary now requires the Node.js binary to be called node.
+  On systems where the Node.js binary is called nodejs, consider installing
+  the nodejs-legacy Debian package or better yet, NVM.
 
-### 1.0.18
+### 1.0.22
 
-- Small tweaks to this file and package.json.
+- --html_format=AMP4EMAIL added.
 
-### 1.0.19
+### 1.0.21
 
-- Set correct process exit status for old versions of Node.js (v0.10.25).
+- --html_format=AMP4ADS is no longer experimental.
 
 ### 1.0.20
 
 - Better npm post-install for virtual machines, running debian over windows with SMB shared folder.
 
-### 1.0.21
+### 1.0.19
 
-- --html_format=AMP4ADS is no longer experimental.
+- Set correct process exit status for old versions of Node.js (v0.10.25).
 
-### 1.0.22
+### 1.0.18
 
-- --html_format=AMP4EMAIL added.
+- Small tweaks to this file and package.json.
 
-### 1.0.23
+### 1.0.17
 
-- The amphtml-validator binary now requires the Node.js binary to be called node.
-  On systems where the Node.js binary is called nodejs, consider installing
-  the nodejs-legacy Debian package or better yet, NVM.
+- If the amphtml-validator command is already patched up for Windows, leave it
+  alone instead of failing. Relevant if the package has been installed globally
+  and now we're performing a local install on top of it.
 
-### 1.0.24
+### 1.0.16
 
-- Introduce node v10 support and remove node 8 support.
+- `npm install amphtml-validator` (local install) should now work on Windows,
+  for `require('amphtml-validator')`.
 
-### 1.0.25
+### 1.0.15
 
-- Broken release, removed.
+- Added support for installing on Windows.
+  `npm install -g amphtml-validator` should now just work.
 
-### 1.0.26
+### 1.0.13
 
-- Introduce node v12 support and remove node v10 support.
+- Added newInstance method, a simple API that's not async.
 
-### 1.0.27
+### 1.0.12
 
-- Removed references to amp.validator.categorizeError.
+- Added support for --user-agent option.
 
-### 1.0.28
+### 1.0.11
 
-- Reintroduce node v10 support and introduce node v14 support.
+- Added support for AMP4ADS (via --html_format command line flag) and
+  argument for validateString function in the API.
 
-### 1.0.29
+### 1.0.10
 
-- Reintroduce node v8 support. Supports node v8, v10, v12 and v14.
+- Fixed [#4246: amphtml-validator CLI fails on Mac OS X](https://github.com/ampproject/amphtml/issues/4246).
diff --git a/validator/validator-main.protoascii b/validator/validator-main.protoascii
index f799fd54fb52..3bb59b114940 100644
--- a/validator/validator-main.protoascii
+++ b/validator/validator-main.protoascii
@@ -26,7 +26,7 @@ min_validator_revision_required: 375
 # newer versions of the spec file. This is currently a Google internal
 # mechanism, validator.js does not use this facility. However, any
 # change to this file (validator-main.js) requires updating this revision id.
-spec_file_revision: 999
+spec_file_revision: 1002
 
 styles_spec_url: "https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages"
 script_spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#html-tags"