diff options
| author | Mark Otto <[email protected]> | 2012-12-08 22:45:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-08 22:45:39 -0800 |
| commit | 6649918c7f4df9ad8288728c6cef1ee48dc63b9a (patch) | |
| tree | 62fd4cabecbe6f0d025b927990e55ac59cc6ceee /docs/javascript.html | |
| parent | bc0b94a3fdc8fe480c74f4494073e2c0addb265e (diff) | |
| parent | 070c125ceceb2a164773f51226950350445160ee (diff) | |
| download | bootstrap-6649918c7f4df9ad8288728c6cef1ee48dc63b9a.tar.xz bootstrap-6649918c7f4df9ad8288728c6cef1ee48dc63b9a.zip | |
Merge conflicts
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 6c4fbf7fb..47435bfbf 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -132,7 +132,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 |