Merge branch 'v4-dev' into v4-dev-xmr-svgo-config

twbs · Aug 2, 2018 · adaec84 · adaec84
2 parents 67b29ab + 198091d
commit adaec84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/src/popover.js b/js/src/popover.js
@@ -150,7 +150,7 @@ const Popover = (($) => {
         let data = $(this).data(DATA_KEY)
         const _config = typeof config === 'object' ? config : null
 
-        if (!data && /destroy|hide/.test(config)) {
+        if (!data && /dispose|hide/.test(config)) {
           return
         }
 

diff --git a/site/docs/4.1/components/forms.md b/site/docs/4.1/components/forms.md
@@ -917,7 +917,7 @@ While these feedback styles cannot be styled with CSS, you can still customize t
 
 ### Server side
 
-We recommend using client side validation, but in case you require server side, you can indicate invalid and valid form fields with `.is-invalid` and `.is-valid`. Note that `.invalid-feedback` is also supported with these classes.
+We recommend using client-side validation, but in case you require server-side validation, you can indicate invalid and valid form fields with `.is-invalid` and `.is-valid`. Note that `.invalid-feedback` is also supported with these classes.
 
 {% capture example %}
 <form>