Skip to content

Commit bdecc0d

Browse files
author
Dmytro Aponasenko
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into develop
2 parents 90b3eb0 + 6e74547 commit bdecc0d

File tree

3 files changed

+2947
-5
lines changed

3 files changed

+2947
-5
lines changed

app/code/Magento/Customer/etc/data_source/customer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</constraints>
2020
<tooltip>
2121
<link>http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes</link>
22-
<description>If your Magento Go site has multiple views, you can set the scope to apply to a specific view.</description>
22+
<description>If your Magento site has multiple views, you can set the scope to apply to a specific view.</description>
2323
</tooltip>
2424
</field>
2525
<field name="prefix" source="eav" dataType="text"/>

app/code/Magento/Widget/Model/Config/Converter.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function convert($source)
8484
}
8585

8686
/**
87-
* Convert dom Container node to magneto array
87+
* Convert dom Container node to Magento array
8888
*
8989
* @param \DOMNode $source
9090
* @return array
@@ -240,7 +240,7 @@ protected function _convertDepends($source)
240240
}
241241

242242
/**
243-
* Convert dom Renderer node to magneto array
243+
* Convert dom Renderer node to Magento array
244244
*
245245
* @param \DOMNode $source
246246
* @return array
@@ -265,7 +265,7 @@ protected function _convertBlock($source)
265265
}
266266

267267
/**
268-
* Convert dom Data node to magneto array
268+
* Convert dom Data node to Magento array
269269
*
270270
* @param \DOMElement $source
271271
* @return array
@@ -289,7 +289,7 @@ protected function _convertData($source)
289289
}
290290

291291
/**
292-
* Convert dom Option node to magneto array
292+
* Convert dom Option node to Magento array
293293
*
294294
* @param \DOMNode $source
295295
* @return array

0 commit comments

Comments
 (0)