From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 24 Mar 2014 07:28:40 +0000 (+0200)
Subject: Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests.
X-Git-Tag: v3.2.0~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f9270cc20c29cd3fbb0664379d620d14bb24a91;p=thirdparty%2Fbootstrap.git

Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests.
---

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index defb549aed..f11ed4baa8 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -28,7 +28,7 @@
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="../assets/ico/favicon.ico">
+                               <link rel="icon" href="../assets/ico/favicon.ico">
 
 <script>
   var _gaq = _gaq || [];
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
index 6fdad417db..6e4eee0b8e 100644
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Blog Template for Bootstrap</title>
 
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 82883c8445..beba7615cd 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Carousel Template for Bootstrap</title>
 
diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
index b8ea5ae0f2..9b6497d001 100644
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Cover Template for Bootstrap</title>
 
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 1d5508878d..75a8cd0023 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Dashboard Template for Bootstrap</title>
 
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 54bdfbe0ad..6bd945de22 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Grid Template for Bootstrap</title>
 
diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html
index 7e5541b990..99782eefe9 100644
--- a/docs/examples/jumbotron-narrow/index.html
+++ b/docs/examples/jumbotron-narrow/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index cde6b398d8..c8d9fb2453 100644
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Jumbotron Template for Bootstrap</title>
 
diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html
index ac20c7dd44..29f75708d7 100644
--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Justified Nav Template for Bootstrap</title>
 
diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html
index 0d14827c4a..1d71b3ac99 100644
--- a/docs/examples/navbar-fixed-top/index.html
+++ b/docs/examples/navbar-fixed-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html
index cd7b3aa76a..d112d35448 100644
--- a/docs/examples/navbar-static-top/index.html
+++ b/docs/examples/navbar-static-top/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Static Top Navbar Example for Bootstrap</title>
 
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index 8624c1eecf..9870c46fb4 100644
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Navbar Template for Bootstrap</title>
 
diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index 3d202d5798..3925d83dfb 100644
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -8,7 +8,7 @@
 
     <!-- Note there is no responsive meta tag here -->
 
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Non-responsive Template for Bootstrap</title>
 
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 439c793608..b0c217e20a 100644
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Off Canvas Template for Bootstrap</title>
 
diff --git a/docs/examples/rtl/index.html b/docs/examples/rtl/index.html
index 8dcdb77284..1248f82dbe 100644
--- a/docs/examples/rtl/index.html
+++ b/docs/examples/rtl/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>RTL Template for Bootstrap</title>
 
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index c04764f950..432e005de3 100644
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Signin Template for Bootstrap</title>
 
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index 6dc26fe876..24c314a4d8 100644
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Starter Template for Bootstrap</title>
 
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 9c7566ed63..fed23d2fdb 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Sticky Footer Navbar Template for Bootstrap</title>
 
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index 5788cd5c91..5c734b5293 100644
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Sticky Footer Template for Bootstrap</title>
 
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index 2d49cc764d..d0d6d2b0cf 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Theme Template for Bootstrap</title>