merged with 2.0

README.md

@@ -20,6 +20,6 @@ If you have questions, open an issue and ask us. We're looking forward to hearin
 
 *	<a href="https://twitter.com/MagentoDevDocs" class="twitter-follow-button" data-show-count="false">Follow @MagentoDevDocs</a>
 
-*	<a href="mailto:DL-Magento-Doc-Feedback@ebay.com">E-mail us</a>
+*	<a href="mailto:DL-Magento-Doc-Feedback@magento.com">E-mail us</a>
 
 *	<a href="http://devdocs.magento.com">Visit our documentation site</a>, built on GitHub using [Jekyll](http://jekyllrb.com/).

_config.yml

@@ -1,7 +1,7 @@
 # Site settings
 encoding: "utf-8"
 title: Magento 2 Developer Documentation
-email: mailto:DL-Magento-Doc-Feedback@ebay.com
+email: mailto:DL-Magento-Doc-Feedback@magento.com
 description: > # this means to ignore newlines until "baseurl:"
   Magento 2 Developer Guide.
 baseurl: "/"

_includes/install/sampledata/sample-data-composer.md

@@ -35,10 +35,10 @@ Before you install sample data, you must update Magento's `composer.json` to get
 ### Install released version sample data {#sample-data-rel-inst}
 To install sample data using the command line, enter the following command as the Magento file system owner:
 
-    php <your Magento install dir>/bin/magento sampledata:deploy [module-list]
-
-where `[module-list]` is an optional space-separated list of <a href="#sample-data-modules">sample data modules</a> to install. Omit this parameter to install all sample data modules.
+    php <your Magento install dir>/bin/magento sampledata:deploy
 
+<!-- where `[module-list]` is an optional space-separated list of <a href="#sample-data-modules">sample data modules</a> to install. Omit this parameter to install all sample data modules.
+ -->
 You are required to <a href="{{ site.gdeurl }}install-gde/prereq/connect-auth.html">authenticate</a> to complete the action.
 
 ### Authentication error
@@ -51,10 +51,10 @@ The following error might display:
 
 If the error displays, change to your Magento installation directory and run `composer update`, which will prompt you for your <a href="{{ site.gdeurl }}install-gde/prereq/connect-auth.html">authentication keys</a>.
 
-<h3 id="sample-data-modules">Complete list of modules</h3>
+<!-- <h3 id="sample-data-modules">Complete list of modules</h3>
 The complete list of sample data modules follows:
 
-{% include install/sampledata/sample-data_list-of-modules.md %}
+{% include install/sampledata/sample-data_list-of-modules.md %} -->
 
 <!-- ABBREVIATIONS -->
 

_includes/install/sampledata/sample-data-other-cmds.md

@@ -12,13 +12,13 @@ This topic discusses how to:
 <h2 id="inst-sample-remove">Remove sample data</h2>
 Enter the following command:
 
-	magento sampledata:remove [module-list]
+	magento sampledata:remove 
 
-where `[module-list]` is an optional space-separated list of sample data modules to install. Omit this parameter to remove all sample data modules.
+<!-- where `[module-list]` is an optional space-separated list of sample data modules to install. Omit this parameter to remove all sample data modules.
 
 The complete list of sample data modules follows:
 
-{% include install/sampledata/sample-data_list-of-modules.md %}
+{% include install/sampledata/sample-data_list-of-modules.md %} -->
 
 Wait while sample data is removed.
 

guides/v2.0/bk-get-started-magento.md

@@ -32,7 +32,7 @@ For more information, see our <a href="{{ site.gdeurl }}extension-dev-guide/Cont
 
 <h2 id="contact-us">Contact us</h2>
 Feel free to contact the documentation team directly at
-<a href="mailto:DL-Magento-Doc-Feedback@ebay.com">DL-Magento-Doc-Feedback@ebay.com</a>
+<a href="mailto:DL-Magento-Doc-Feedback@magento.com">DL-Magento-Doc-Feedback@magento.com</a>
 
 #### Related topics