Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less

1 files changed, 3 insertions, 2 deletions

diff --git a/docs/components.html b/docs/components.html
index b88e54b88..aff2088cc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1171,6 +1171,7 @@
   <li><a href="#">2</a></li>
   <li><a href="#">3</a></li>
   <li><a href="#">4</a></li>
+  <li><a href="#">5</a></li>
   <li><a href="#">Next</a></li>
 </ul>
 </pre>
@@ -1196,7 +1197,7 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;a href="#"&gt;&amp;laquo;&lt;/a&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;
@@ -1204,7 +1205,7 @@
           <p>You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;span&gt;Prev&lt;/span&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;span&gt;&amp;laquo;&lt;/span&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;span&gt;1&lt;/span&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;