Merge branch '2.3.0-wip' into 3.0.0-wip

9 files changed, 9 insertions, 9 deletions

diff --git a/docs/components.html b/docs/components.html
index d264ae91a..e74e6d223 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1918,7 +1918,7 @@ class="clearfix"
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/css.html b/docs/css.html
index 56e1aa8d3..dac1149bc 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -2415,7 +2415,7 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/customize.html b/docs/customize.html
index 4c8ee3fb2..8b91f1d88 100644
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -470,7 +470,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/extend.html b/docs/extend.html
index 4de7b9c4b..592812934 100644
--- a/docs/extend.html
+++ b/docs/extend.html
@@ -245,7 +245,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 0159bff38..231919842 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -344,7 +344,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/index.html b/docs/index.html
index 21323a023..b66f734c9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -172,7 +172,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/javascript.html b/docs/javascript.html
index 0251d2097..6b60cfcd5 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1769,7 +1769,7 @@ $('[data-spy="affix"]').each(function () {
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 6adc11711..87a9bb003 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -565,7 +565,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index b9452430a..8614dea4b 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -114,7 +114,7 @@
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">{{_i}}Changelog{{/i}}</a></li>
         </ul>
       </div>
     </footer>