Merge conflicts

diff --cc docs/javascript.html
index 6c4fbf7fbb1ecf1a3cf9b2f220a2cb8746b07372,d956ffaf3526325f874e250ca4df1ee6c70d2fbe..47435bfbfa52690734706d618f73b01f4a7f93fc
--- 1/docs/javascript.html
--- 2/docs/javascript.html
+++ b/docs/javascript.html
@@@ -131,8 -134,8 +131,8 @@@ $("#myModal").modal('show'
  </pre>
            <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 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>
 +          <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 --cc docs/templates/pages/javascript.mustache
index 5ff9fcb82e3b5cdfdaf751575ca4a4d23f2c645b,e6b3f812a76ad4b433a6335918985685b560e57f..47e1ee91ddd096a7634da39098d2bfb939942a60
--- 1/docs/templates/pages/javascript.mustache
--- 2/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@@ -61,10 -61,10 +61,10 @@@ $("#myModal").modal(
  $("#myModal").modal({ keyboard: false })   // initialized with no keyboard
  $("#myModal").modal('show')                // initializes and invokes show immediately</p>
  </pre>
 -          <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>
 +          <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>{{_i}}No Conflict{{/i}}</h3>
 -          <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>
 +          <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