diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 35327319a..d956ffaf3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -135,7 +135,7 @@ $("#myModal").modal('show') // initializes and invokes show immed <p>Each plugin also exposes its raw constructor on a `Constructor` property: <code>$.fn.popover.Constructor</code>. If you'd like to get a particular plugin instance, retrieve it directly from an element: <code>$('[rel=popover]').data('popover')</code>.</p> <h3>No Conflict</h3> - <p>Sometimes it's neccessary to use bootstrap plugins with other ui frameworks. In these circumstances, occasionally namespace collisions can occur. If this happens, you may call <code>.noCoflict</code> on the plugin you wish to revert the value of.</p> + <p>Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.</p> <pre class="prettyprint linenums"> var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 2fb2020c0..e6b3f812a 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -64,7 +64,7 @@ $("#myModal").modal('show') // initializes and invokes show immed <p>{{_i}}Each plugin also exposes its raw constructor on a `Constructor` property: <code>$.fn.popover.Constructor</code>. If you'd like to get a particular plugin instance, retrieve it directly from an element: <code>$('[rel=popover]').data('popover')</code>.{{/i}}</p> <h3>{{_i}}No Conflict{{/i}}</h3> - <p>{{_i}}Sometimes it's neccessary to use bootstrap plugins with other ui frameworks. In these circumstances, occasionally namespace collisions can occur. If this happens, you may call <code>.noCoflict</code> on the plugin you wish to revert the value of.{{/i}}</p> + <p>{{_i}}Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call <code>.noConflict</code> on the plugin you wish to revert the value of.{{/i}}</p> <pre class="prettyprint linenums"> var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value |