Merge branch 'v4-dev' into v4-navbars

2 files changed, 4 insertions, 3 deletions

diff --git a/docs/_plugins/bugify.rb b/docs/_plugins/bugify.rb
index 0c5a0f5f5..5562dd5de 100644
--- a/docs/_plugins/bugify.rb
+++ b/docs/_plugins/bugify.rb
@@ -4,6 +4,7 @@ module Jekyll
       upstream_map = {
         "Bootstrap" => "https://github.com/twbs/bootstrap/issues/",
         "Edge" => ["https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/", "Edge issue"],
+        "UserVoice" => ["https://wpdev.uservoice.com/forums/257854-microsoft-edge-developer/suggestions/", "Edge UserVoice idea"],
         "Mozilla" => ["https://bugzilla.mozilla.org/show_bug.cgi?id=", "Mozilla bug"],
         "Chromium" => ["https://bugs.chromium.org/p/chromium/issues/detail?id=", "Chromium issue"],
         "WebKit" => ["https://bugs.webkit.org/show_bug.cgi?id=", "WebKit bug"],
diff --git a/docs/_plugins/highlight_alt.rb b/docs/_plugins/highlight_alt.rb
index d1ed9ccff..bdcada251 100644
--- a/docs/_plugins/highlight_alt.rb
+++ b/docs/_plugins/highlight_alt.rb
@@ -27,14 +27,14 @@ module Jekyll
               @options[key.to_sym] = value || true
             end
           end
-          @options[:linenos] = "inline" if @options.key?(:linenos) and @options[:linenos] == true
+          @options[:linenos] = false
         else
           raise SyntaxError.new <<-eos
-Syntax Error in tag 'highlight' while parsing the following markup:
+Syntax Error in tag 'example' while parsing the following markup:
 
   #{markup}
 
-Valid syntax: highlight <lang> [linenos]
+Valid syntax: example <lang>
 eos
         end
       end