From b35840e48d18c49fdb916e04516d29b534d64875 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 9 Jun 2014 21:00:27 -0700
Subject: simpler and updated docs copy for icon font file paths

---
 docs/_includes/components/glyphicons.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index 301a542b6..f7e09f3a2 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -27,12 +27,13 @@
   </div>
   <div class="bs-callout bs-callout-info">
     <h4>Changing the icon font location</h4>
-    <p>By default, Bootstrap assumes that the icon font files will be located in the <code>../fonts/</code> directory relative to your deployed CSS. For example, if your CSS file is at <code>http://example.com/foobar/css/bootstrap.css</code>, then your font files should be at <code>http://example.com/foobar/fonts/glyphicons-halflings-regular.woff</code>, etc.</p>
-    <p>If you are placing the icon font files elsewhere or changing their filenames, you will need to adjust the <code>@icon-font-path</code> and/or <code>@icon-font-name</code> Less variables accordingly.</p>
-  </div>
-  <div class="bs-callout bs-callout-info">
-    <h4><code>@import</code>ing Bootstrap via Less may require adjusting the icon font location</h4>
-    <p>If you <code>@import</code> Bootstrap's Less source into your own Less file, you may need to adjust the <code>@icon-font-path</code> Less variable due to the way that the relative paths in our <code>url(...)</code>s work.</p>
+    <p>Bootstrap assumes icon font files will be located in the <code>../fonts/</code> directory. Moving or renaming those font files means updating the CSS in one of three ways:</p>
+    <ul>
+      <li>Change the <code>@icon-font-path</code> and/or <code>@icon-font-name</code> variables in the source Less files.</li>
+      <li>Utilize the <a href="http://lesscss.org/usage/#command-line-usage-relative-urls">relative URLs option</a> provided by the Less compiler.</li>
+      <li>Change the <code>url()</code> paths in the compiled CSS.</li>
+    </ul>
+    <p>Use whatever option best suites your specific development setup.</p>
   </div>
 {% highlight html %}
 <span class="glyphicon glyphicon-search"></span>
-- 
cgit v1.2.3


From 24a9b34adde1ae2cff9238853fb3207cfdb57209 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 9 Jun 2014 21:08:24 -0700
Subject: typo

---
 docs/_includes/components/glyphicons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index f7e09f3a2..9a39b12c9 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -33,7 +33,7 @@
       <li>Utilize the <a href="http://lesscss.org/usage/#command-line-usage-relative-urls">relative URLs option</a> provided by the Less compiler.</li>
       <li>Change the <code>url()</code> paths in the compiled CSS.</li>
     </ul>
-    <p>Use whatever option best suites your specific development setup.</p>
+    <p>Use whatever option best suits your specific development setup.</p>
   </div>
 {% highlight html %}
 <span class="glyphicon glyphicon-search"></span>
-- 
cgit v1.2.3


From d2061e8aeb7517d08603fb40cb1a225ebb405576 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 9 Jun 2014 21:26:57 -0700
Subject: relative

---
 docs/_includes/components/glyphicons.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes')

diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html
index 9a39b12c9..e87434137 100644
--- a/docs/_includes/components/glyphicons.html
+++ b/docs/_includes/components/glyphicons.html
@@ -27,7 +27,7 @@
   </div>
   <div class="bs-callout bs-callout-info">
     <h4>Changing the icon font location</h4>
-    <p>Bootstrap assumes icon font files will be located in the <code>../fonts/</code> directory. Moving or renaming those font files means updating the CSS in one of three ways:</p>
+    <p>Bootstrap assumes icon font files will be located in the <code>../fonts/</code> directory, relative to the compiled CSS files. Moving or renaming those font files means updating the CSS in one of three ways:</p>
     <ul>
       <li>Change the <code>@icon-font-path</code> and/or <code>@icon-font-name</code> variables in the source Less files.</li>
       <li>Utilize the <a href="http://lesscss.org/usage/#command-line-usage-relative-urls">relative URLs option</a> provided by the Less compiler.</li>
-- 
cgit v1.2.3