Merge branch 'release-0.8'

content/docs/setup/kubernetes/quick-start.md

@@ -237,10 +237,10 @@ installation directory contains:
     * The `istioctl` client binary in the `bin/` directory. `istioctl` is used when manually injecting Envoy as a sidecar proxy and for creating routing rules and policies.
     * The `istio.VERSION` configuration file
 
-1.  Change directory to istio package. For example, if the package is istio-{{< istio_version >}}
+1.  Change directory to the istio package. For example, if the package is istio-{{< istio_version >}}.0;
 
     ```command
-    $ cd istio-{{< istio_version >}}
+    $ cd istio-{{< istio_version >}}.0
     ```
 
 1.  Add the `istioctl` client to your PATH.

src/js/misc.js

@@ -100,6 +100,18 @@ function scrollToTop() {
     document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
 }
 
+String.prototype.escapeHTML = function() {
+    var tagsToReplace = {
+        '&': '&',
+        '<': '&lt;',
+        '>': '&gt;'
+    };
+
+    return this.replace(/[&<>]/g, function(tag) {
+        return tagsToReplace[tag] || tag;
+    });
+};
+
 // initialized after the DOM has been loaded by getDOMTopology
 var scrollToTopButton;
 var tocLinks;
@@ -284,9 +296,11 @@ function handleDOMLoaded() {
                         if (output !== "") {
                             // apply formatting to the output?
                             var prefix = "language-command-output-as-";
-                            if (cl.length > prefix.length) {
+                            if (cl.startsWith(prefix)) {
                                 var lang = cl.substr(prefix.length);
                                 output = Prism.highlight(output, Prism.languages[lang], lang);
+                            } else {
+                                output = output.escapeHTML();
                             }
 
                             html += "<div class='output'>" + output + "</div>";