Merge pull request #11733 from KostyaTretyak/edit

Fixed some errors in the documentation

2 files changed, 4 insertions, 4 deletions

diff --git a/customize.html b/customize.html
index 5b15a4c5a..13821b533 100644
--- a/customize.html
+++ b/customize.html
@@ -1056,7 +1056,7 @@ base_url: "../"
         <p class="help-block">Hovered dropdown menu entry text color</p>
         <label>@dropdown-link-hover-bg</label>
         <input type="text" class="form-control" placeholder="#f5f5f5" data-var="@dropdown-link-hover-bg">
-        <p class="help-block">Hovered dropdown menu entry text color</p>
+        <p class="help-block">Hovered dropdown menu entry background color</p>
 
         <label>@dropdown-link-active-color</label>
         <input type="text" class="form-control" placeholder="@component-active-color" data-var="@dropdown-link-active-color">
diff --git a/javascript.html b/javascript.html
index dcc2a1e84..f0d50fcdd 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1123,7 +1123,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
             <td>animation</td>
             <td>boolean</td>
             <td>true</td>
-            <td>apply a CSS fade transition to the tooltip</td>
+            <td>apply a CSS fade transition to the popover</td>
           </tr>
           <tr>
             <td>html</td>
@@ -1141,7 +1141,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
             <td>selector</td>
             <td>string</td>
             <td>false</td>
-            <td>if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
+            <td>if a selector is provided, tooltip objects will be delegated to the specified targets. In practice, this is used to enable dynamic HTML content to have popovers added. See <a href="https://github.com/twbs/bootstrap/issues/4215">this</a> and <a href="http://jsfiddle.net/fScua/">an informative example</a>.</td>
           </tr>
           <tr>
             <td>trigger</td>
@@ -1941,7 +1941,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
     <ol>
       <li>To start, the plugin adds <code>.affix-top</code> to indicate the element is in it's top-most position. At this point no CSS positioning is required.</li>
       <li>Scrolling past the element you want affixed should trigger the actual affixing. This is where <code>.affix</code> replaces <code>.affix-top</code> and sets <code>position: fixed;</code> (provided by Bootstrap's code CSS).</li>
-      <li>If a bottom offset is defined, scrolling past that should replace <code>.affix</code> with <code>.affix-bottom</code>. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add <code>position: absolute;</code> when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the elemtn from there.</li>
+      <li>If a bottom offset is defined, scrolling past that should replace <code>.affix</code> with <code>.affix-bottom</code>. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add <code>position: absolute;</code> when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the element from there.</li>
     </ol>
     <p>Follow the above steps to set your CSS for either of the usage options below.</p>