diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml index be1b836d64802..cd32d5224ab6a 100644 --- a/app/code/Magento/Backend/etc/adminhtml/system.xml +++ b/app/code/Magento/Backend/etc/adminhtml/system.xml @@ -197,7 +197,7 @@ - + Magento\Config\Model\Config\Source\Image\Adapter Magento\Config\Model\Config\Backend\Image\Adapter @@ -314,11 +314,11 @@ Magento\Config\Model\Config\Source\Yesno - + For Windows server only. - + For Windows server only. @@ -435,7 +435,7 @@ Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]> - + Magento\Config\Model\Config\Source\Web\Redirect I.e. redirect from http://example.com/store/ to http://www.example.com/store/ @@ -448,7 +448,7 @@ Magento\Config\Model\Config\Source\Yesno - + Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/ @@ -456,7 +456,7 @@ Magento\Config\Model\Config\Backend\Baseurl Specify URL or {{base_url}} placeholder. - + Magento\Config\Model\Config\Backend\Baseurl May start with {{unsecure_base_url}} placeholder. @@ -466,13 +466,13 @@ Magento\Config\Model\Config\Backend\Baseurl May be empty or start with {{unsecure_base_url}} placeholder. - + Magento\Config\Model\Config\Backend\Baseurl May be empty or start with {{unsecure_base_url}} placeholder. - + Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/ @@ -480,7 +480,7 @@ Magento\Config\Model\Config\Backend\Baseurl Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder. - + Magento\Config\Model\Config\Backend\Baseurl May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder. @@ -490,24 +490,24 @@ Magento\Config\Model\Config\Backend\Baseurl May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder. - + Magento\Config\Model\Config\Backend\Baseurl May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder. - + Magento\Config\Model\Config\Source\Yesno Magento\Config\Model\Config\Backend\Secure Enter https protocol to use Secure URLs on Storefront. - + Magento\Config\Model\Config\Source\Yesno Magento\Config\Model\Config\Backend\Secure Enter https protocol to use Secure URLs in Admin. - + Magento\Config\Model\Config\Source\Yesno Magento\Config\Model\Config\Backend\Secure @@ -517,7 +517,7 @@ 1 - + Magento\Config\Model\Config\Source\Yesno Magento\Config\Model\Config\Backend\Secure diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml index c49402070f0fd..5215dbc00b7ef 100644 --- a/app/code/Magento/Braintree/etc/adminhtml/system.xml +++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml @@ -84,18 +84,18 @@ payment/braintree_cc_vault/title - + If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account. payment/braintree/merchant_account_id - + Magento\Config\Model\Config\Source\Yesno Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section payment/braintree/fraudprotection - + accounts@braintreepayments.com to setup your Kount account.]]> @@ -108,7 +108,7 @@ Magento\Config\Model\Config\Source\Yesno payment/braintree/debug - + Magento\Config\Model\Config\Source\Yesno Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section. @@ -149,7 +149,7 @@ Magento\Config\Block\System\Config\Form\Fieldset - + payment/braintree_paypal/title It is recommended to set this value to "PayPal" per store views. @@ -187,7 +187,7 @@ 1 payment/braintree_paypal/specificcountry - + Magento\Config\Model\Config\Source\Yesno payment/braintree_paypal/require_billing_address @@ -203,7 +203,7 @@ Magento\Config\Model\Config\Source\Yesno payment/braintree_paypal/debug - + Magento\Config\Model\Config\Source\Yesno payment/braintree_paypal/display_on_shopping_cart @@ -239,14 +239,14 @@ payment/braintree/verify_specific_countries - + Braintree Support.]]> Magento\Config\Block\System\Config\Form\Fieldset - + payment/braintree/descriptor_name @@ -254,14 +254,14 @@ and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters). - + payment/braintree/descriptor_phone The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods. - + payment/braintree/descriptor_url diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml index b9332575c96f7..08ed0a8f49470 100644 --- a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml +++ b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml @@ -41,13 +41,13 @@ - + Magento\Config\Model\Config\Source\Yesno Magento\CatalogInventory\Model\Config\Backend\Managestock Changing can take some time due to processing whole catalog. - + Magento\CatalogInventory\Model\Source\Backorders Magento\CatalogInventory\Model\Config\Backend\Backorders diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml index 39235511eaeec..b8f2863139e9b 100644 --- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml +++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml @@ -27,7 +27,7 @@ validate-digits - + Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time. validate-digits diff --git a/app/code/Magento/Cookie/etc/adminhtml/system.xml b/app/code/Magento/Cookie/etc/adminhtml/system.xml index 26c963ddba76d..9790410969055 100644 --- a/app/code/Magento/Cookie/etc/adminhtml/system.xml +++ b/app/code/Magento/Cookie/etc/adminhtml/system.xml @@ -22,7 +22,7 @@ Magento\Cookie\Model\Config\Backend\Domain - + Warning: Do not set to "No". User security could be compromised.]]> diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml index 31e968de14d99..86e5852d67aeb 100644 --- a/app/code/Magento/Customer/etc/adminhtml/system.xml +++ b/app/code/Magento/Customer/etc/adminhtml/system.xml @@ -26,7 +26,7 @@ - + Magento\Config\Model\Config\Source\Yesno @@ -170,7 +170,7 @@ Use 0 to disable account locking. required-entry validate-digits - + Account will be unlocked after provided time. required-entry validate-digits @@ -272,16 +272,16 @@ - + - + - + - + diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml index aae9913009837..4ebc45f1a2ca2 100644 --- a/app/code/Magento/Developer/etc/adminhtml/system.xml +++ b/app/code/Magento/Developer/etc/adminhtml/system.xml @@ -6,7 +6,7 @@ */--> -
+
@@ -25,7 +25,7 @@ Magento\Developer\Model\Config\Backend\AllowedIps - + Not available in production mode. diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml index c0f7e209ad61b..91ed6c6568a70 100644 --- a/app/code/Magento/Dhl/etc/adminhtml/system.xml +++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml @@ -94,7 +94,7 @@ N - + Package ready time after order submission (in hours) diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml index f0c703b7693c7..3c91c30c5cfa6 100644 --- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml +++ b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml @@ -7,7 +7,7 @@ --> -
+
diff --git a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml index 4b7a6029507b4..76785c023ed0b 100644 --- a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml +++ b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml @@ -10,7 +10,7 @@
- + Magento\Config\Model\Config\Source\Yesno Payment method with vault and instant purchase support should be enabled. diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml index 97aec083e7abb..5abec8efbfdd6 100644 --- a/app/code/Magento/Integration/etc/adminhtml/system.xml +++ b/app/code/Magento/Integration/etc/adminhtml/system.xml @@ -13,48 +13,48 @@ Magento_Integration::config_oauth - + We will disable this feature if the value is empty. - + We will disable this feature if the value is empty. - + Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup - + Cleanup entries older than X minutes. - + Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts. - + Number of maximum redirects for OAuth consumer credentials Post request. - + Timeout for OAuth consumer credentials Post request within X seconds. - + Maximum Number of authentication failures to lock out account. - + Period of time in seconds after which account will be unlocked. diff --git a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml index e9bf7933b94a9..de4637847456e 100644 --- a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml +++ b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml @@ -7,7 +7,7 @@ --> -
+
diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml index 09b6b23744053..d7244a5d4fd01 100644 --- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml +++ b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml @@ -7,7 +7,7 @@ --> -
+
diff --git a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml index b47bd8f749040..89cc4d0986a00 100644 --- a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml +++ b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml @@ -7,7 +7,7 @@ --> -
+
diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml index 306aac1769913..4db5f489aa4a2 100644 --- a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml +++ b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml @@ -7,7 +7,7 @@ --> -
+
diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml index 1d6c0d890737b..5055b17956819 100644 --- a/app/code/Magento/PageCache/etc/adminhtml/system.xml +++ b/app/code/Magento/PageCache/etc/adminhtml/system.xml @@ -49,7 +49,7 @@ 1 - + Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4 diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml index c1ff4c9b1c6ca..26ec9b3152e4b 100644 --- a/app/code/Magento/Paypal/etc/adminhtml/system.xml +++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml @@ -77,7 +77,7 @@ http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html - + 0 payment/paypal_payment_pro/active @@ -90,7 +90,7 @@ - + Accept credit card and PayPal payments securely. payment/wps_express/active @@ -110,7 +110,7 @@ payment/wps_express_bml/active - + @@ -124,7 +124,7 @@
-
+
@@ -158,7 +158,7 @@ - + Accept credit card and PayPal payments securely. payment/wps_express/active @@ -166,7 +166,7 @@ http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html - + @@ -178,7 +178,7 @@ - + @@ -227,7 +227,7 @@ Choose a secure bundled payment solution for your business. https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup other_paypal_payment_solutions - + complex Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment @@ -237,7 +237,7 @@ http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html - + @@ -271,7 +271,7 @@ - + complex paypal-other-section paypal-gateways-section Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml index 9d6d11d56c81f..ccfd9c2ac7bfd 100644 --- a/app/code/Magento/Sales/etc/adminhtml/system.xml +++ b/app/code/Magento/Sales/etc/adminhtml/system.xml @@ -393,7 +393,7 @@
- + @@ -402,7 +402,7 @@
- + diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml index 71f5916ca5325..2dd75d2d91e5b 100644 --- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml +++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml @@ -11,7 +11,7 @@ sales Magento_Sales::fraud_protection - + signifyd-logo-header Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info @@ -52,7 +52,7 @@ Magento\Config\Model\Config\Source\Yesno fraud_protection/signifyd/debug - + configure a guarantee completed webhook in Signifyd. Webhooks are used to sync Signifyd`s guarantee decisions back to Magento.]]> signifyd/webhooks/handler diff --git a/app/code/Magento/Tax/etc/adminhtml/system.xml b/app/code/Magento/Tax/etc/adminhtml/system.xml index c03a8aa44bf7b..7fc1744b8e27e 100644 --- a/app/code/Magento/Tax/etc/adminhtml/system.xml +++ b/app/code/Magento/Tax/etc/adminhtml/system.xml @@ -62,7 +62,7 @@ Magento\Tax\Model\Config\Notification Warning: To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”. - + Magento\Tax\Model\Config\Source\Apply\On diff --git a/app/code/Magento/Translation/etc/adminhtml/system.xml b/app/code/Magento/Translation/etc/adminhtml/system.xml index 8c3cdc5c39916..ab854f8a4db52 100644 --- a/app/code/Magento/Translation/etc/adminhtml/system.xml +++ b/app/code/Magento/Translation/etc/adminhtml/system.xml @@ -9,7 +9,7 @@
- + Magento\Translation\Model\Js\Config\Source\Strategy Please put your store into maintenance mode and redeploy static files after changing strategy diff --git a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml index c38ea402718e3..d6f40f5ac2023 100644 --- a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml +++ b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml @@ -8,7 +8,7 @@
- + Magento\Config\Model\Config\Source\Yesno This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks.