Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1

3 files changed, 7 insertions, 2 deletions

diff --git a/docs/_plugins/callout.rb b/docs/_plugins/callout.rb
index 0ed6687db..58453ecb4 100644
--- a/docs/_plugins/callout.rb
+++ b/docs/_plugins/callout.rb
@@ -17,7 +17,7 @@ module Jekyll
 
       def render(context)
         site = context.registers[:site]
-        converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
+        converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
         output = converter.convert(super(context))
         "<div class=\"bd-callout bd-callout-#{@type}\">#{output}</div>"
       end
diff --git a/docs/_plugins/highlight_alt.rb b/docs/_plugins/highlight_alt.rb
index 5b877ee36..1fc9f5d2a 100644
--- a/docs/_plugins/highlight_alt.rb
+++ b/docs/_plugins/highlight_alt.rb
@@ -57,11 +57,16 @@ eos
       def example(output)
         "<div class=\"bd-example\" data-example-id=\"#{@options[:id]}\">\n#{output}\n</div>"
       end
+    
+      def remove_holderjs(code)
+        code = code.gsub(/"holder.js.+?"/, '"..."')
+      end
 
       def render_rouge(code)
         require 'rouge'
         formatter = Rouge::Formatters::HTML.new(line_numbers: @options[:linenos], wrap: false)
         lexer = Rouge::Lexer.find_fancy(@lang, code) || Rouge::Lexers::PlainText
+        code = remove_holderjs(code)
         code = formatter.format(lexer.lex(code))
         "<div class=\"highlight\"><pre>#{code}</pre></div>"
       end
diff --git a/docs/_plugins/markdown-block.rb b/docs/_plugins/markdown-block.rb
index 6aa761585..f9f1531b5 100644
--- a/docs/_plugins/markdown-block.rb
+++ b/docs/_plugins/markdown-block.rb
@@ -11,7 +11,7 @@ module Jekyll
     #
     def render(context)
       site = context.registers[:site]
-      converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
+      converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
       converter.convert(render_block(context))
     end
   end