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

mdo · mdo · commit 5073d07a47b7 · 2015-12-08T00:49:42.000-08:00
diff --git a/docs/components/navbar.md b/docs/components/navbar.md
@@ -92,7 +92,7 @@ Navbar navigation is similar to our regular nav options—use the `.nav` base cl
 </nav>
 {% endexample %}
 
-And because we use classes for our navs, you can omit the list-based approach entirely if you like.
+And because we use classes for our navs, you can avoid the list-based approach entirely if you like.
 
 {% example html %}
 <nav class="navbar navbar-light bg-faded">
