Merge pull request #4758 from magento/small_changes

Small changes

Author: dobooth

_config.yml

@@ -74,7 +74,7 @@ defaults:
       path: mftf/docs
     values:
       group: mftf
-      github_files: https://github.com/magento/magento2-functional-testing-framework/blob/develop/
+      github_files: https://github.com/magento/magento2-functional-testing-framework/blob/master/
       github_repo: https://github.com/magento/magento2-functional-testing-framework/
       functional_areas:
         - Test

guides/v2.1/cloud/cdn/fastly-vcl-whitelist.md

@@ -111,8 +111,6 @@ Add the custom VCL snippet to your Fastly service configuration from the Magento
 	   ```
 
 1.  Click **Create** to generate the VCL snippet file with the name pattern `type_priority_name.vcl`, for example `recv_5_allowlist.vcl`
-
-	      ![Create VCL Snippet]
 	
 1.  After the page reloads, click **Upload VCL to Fastly** in the *Fastly Configuration* section to add the file to the Fastly service configuration.
 

guides/v2.1/frontend-dev-guide/translations/theme_dictionary.md

@@ -61,6 +61,15 @@ The locale dictionary would use the default values (keys) in the left column fol
 "Card Verification Number",	<translation>
 ```
 
+## Element translations per module
+
+You can translate the same element in different ways for different modules:
+
+```text
+"Add to Cart", "Add to Cart", module, Magento_Review
+"Add to Cart", "Add to Shopping Cart", module, Magento_Catalog
+```
+
 ## Additional information
 
 - [Translations overview]

guides/v2.1/javascript-dev-guide/javascript/js_init.md

@@ -67,9 +67,9 @@ To call a JS component on an HTML element without direct access to the element o
 <script type="text/x-magento-init">
 {
     // components initialized on the element defined by selector
-	"<element_selector>": {
-		"<js_component1>": ...,
-		"<js_component2>": ...
+    "<element_selector>": {
+        "<js_component1>": ...,
+        "<js_component2>": ...
     },
     // components initialized without binding to an element
     "*": {
@@ -139,8 +139,8 @@ $(function () { // to ensure that code evaluates on page load
     $('[data-role=example]')  // we expect that page contains markup <tag data-role="example">..</tag>
         .accordion({ // now we can use "accordion" as jQuery plugin
             header:  '[data-role=header]',
-	    content: '[data-role=content]',
-	    trigger: '[data-role=trigger]',
+            content: '[data-role=content]',
+            trigger: '[data-role=trigger]',
             ajaxUrlElement: 'a'
         });
 });

guides/v2.1/javascript-dev-guide/widgets/widget_prompt.md

@@ -22,7 +22,7 @@ The prompt widget can be initialized with or without binding to a certain elemen
 
 ```javascript
 $('#prompt_init').prompt({
-    title: 'Prompt title',
+    title: $.mage.__('Prompt title'),
     actions: {
         confirm: function(){}, //callback on 'Ok' button click
         cancel: function(){}, //callback on 'Cancel' button click
@@ -39,8 +39,8 @@ require([
 ], function(prompt) { // Variable that represents the `prompt` function
 
     prompt({
-        title: 'Some title',
-        content: 'Some content',
+        title: $.mage.__('Some title'),
+        content: $.mage.__('Some content'),
         actions: {
             confirm: function(){},
             cancel: function(){},