diff --git a/guides/m2devgde/Test/Content/integration/integration-auth.htm b/guides/m2devgde/Test/Content/integration/integration-auth.htm index 386c98aef26..1a27e65b2f6 100644 --- a/guides/m2devgde/Test/Content/integration/integration-auth.htm +++ b/guides/m2devgde/Test/Content/integration/integration-auth.htm @@ -26,7 +26,7 @@
There are two ways to authenticate the third-party system with Magento:
This topic discusses how to code your integration with Magento. Eventually, you will be able to market your integration as an extension on Magento Connect; however, it's not possible to do that now for Magento 2 integrations.
Note: Throughout this guide, the term integration configuration is used to mean the integration's magento-install-dir/app/code/vendor/module/etc/config.xml and the term API configuration is used to mean the integration's magento-install-dir/app/code/vendor/module/etc/integration/api.xml.
diff --git a/guides/m2devgde/Test/Content/integration/integration-create-man.htm b/guides/m2devgde/Test/Content/integration/integration-create-man.htm index e7312e73a7a..9a238dc5e53 100644 --- a/guides/m2devgde/Test/Content/integration/integration-create-man.htm +++ b/guides/m2devgde/Test/Content/integration/integration-create-man.htm @@ -27,7 +27,7 @@Creating a new integration manually implies that the administrative user previously contacted the third-party system's developers and got all necessary information.
To create a new integration:
diff --git a/guides/m2devgde/Test/Content/integration/integration-create.htm b/guides/m2devgde/Test/Content/integration/integration-create.htm index 26f3ccdbcfd..a8e2f98b7e2 100644 --- a/guides/m2devgde/Test/Content/integration/integration-create.htm +++ b/guides/m2devgde/Test/Content/integration/integration-create.htm @@ -26,7 +26,7 @@In Magento 2, eachconnection to your third-party system is referred to as an integrationSet of properties that enable Magento to share authorized objects with a third-party application.. The name of an integration must be unique in each Magento instance. Otherwise, an integration created earlier will be overwritten by an integration with the same name created later. That is, if a new automatically created integration has the same name as an existing manually created integration, the first overwrites the second.
To create the integration, you need:
diff --git a/guides/m2devgde/Test/Content/integration/integration-maintain.htm b/guides/m2devgde/Test/Content/integration/integration-maintain.htm index 5246b66f89c..aa35b23c5d5 100644 --- a/guides/m2devgde/Test/Content/integration/integration-maintain.htm +++ b/guides/m2devgde/Test/Content/integration/integration-maintain.htm @@ -26,7 +26,7 @@Only integrations created manually using the Magento Admin can be edited; integrations created automatically from configuration files are not editable.
To edit or delete an integration:
diff --git a/guides/m2devgde/Test/Content/integration/what-is-integration.htm b/guides/m2devgde/Test/Content/integration/what-is-integration.htm index ebfdb845b93..d7fc601cbb9 100644 --- a/guides/m2devgde/Test/Content/integration/what-is-integration.htm +++ b/guides/m2devgde/Test/Content/integration/what-is-integration.htm @@ -26,7 +26,7 @@All third-party systems integrating with Magento must be authenticated and authorized to access Magento resources securely. To make both procedures easier, we changed the workflow for authorizing the API calls. You can now authorize your third-party system using either secure, cloud-based key exchange or by creating the keys locally on the merchant's Magento system.
Integrating with Magento requires you to define access rights that control what information your third-party system needs from the merchant's Magento instance. If you want to establish more control over the data accessible for the external systems, you can do so using configuration files.
diff --git a/guides/m2devgde/Test/Content/rest/rest-overview.htm b/guides/m2devgde/Test/Content/rest/rest-overview.htm index e7ae4eab911..70e6e6f89e8 100644 --- a/guides/m2devgde/Test/Content/rest/rest-overview.htm +++ b/guides/m2devgde/Test/Content/rest/rest-overview.htm @@ -26,7 +26,7 @@All REST calls for the Customer service are contained in webapi.xml; however, inputs and return values are defined in their respective interfaces.
diff --git a/guides/m2devgde/Test/Content/svcs-framework/svc-how-to-use.htm b/guides/m2devgde/Test/Content/svcs-framework/svc-how-to-use.htm index 855526b65e5..ff00cdbb873 100644 --- a/guides/m2devgde/Test/Content/svcs-framework/svc-how-to-use.htm +++ b/guides/m2devgde/Test/Content/svcs-framework/svc-how-to-use.htm @@ -26,7 +26,7 @@Before interacting with a service, you must be familiar with the service interface, including input/output data structures defined by the corresponding schema. Services are defined by PHP interfaces, so developers can simply acquire an instance of the service and invoke the appropriate method directly. You can also use web services REST and SOAP calls.
Although services are abstractions of business logic, not every such abstraction is a service. Following are examples of properties of a useful service:
Here are the things you can do with services:
Magento 2 uses the service framework to define and expose extensible features.
A service:
diff --git a/guides/m2devgde/Test/Content/webapi/what-is-webapi.htm b/guides/m2devgde/Test/Content/webapi/what-is-webapi.htm index 3ec0969eef3..5962ba8c2f8 100644 --- a/guides/m2devgde/Test/Content/webapi/what-is-webapi.htm +++ b/guides/m2devgde/Test/Content/webapi/what-is-webapi.htm @@ -26,7 +26,7 @@The Web API Framework gives third-party developers access to the service frameworkFunctional abstraction that represents the business features available to other parts of an application or Magento. Represents a boundary that encapsulates the business logic a module exposes without revealing any of the details of how that functionality is implemented. using REST or SOAP calls. Currently, Web API access is limited to Customer objects but we plan to expand access in time to include any Magento object.
Related Topics
diff --git a/guides/m2devgde/Test/Content/welcome.htm b/guides/m2devgde/Test/Content/welcome.htm
index 059758efb2f..17f21f4e775 100644
--- a/guides/m2devgde/Test/Content/welcome.htm
+++ b/guides/m2devgde/Test/Content/welcome.htm
@@ -30,7 +30,7 @@
Please start with What is the Magento 2 Service Framework?
Magento is constantly looking for ways to improve. You can help by providing feedback. Every page on this site has a link that enables you to fork or to open issues. Please use it!
- \ No newline at end of file diff --git a/guides/m2devgde/Test/Data/HelpSystem.js b/guides/m2devgde/Test/Data/HelpSystem.js index 85852cb7f76..cb08586e0d0 100644 --- a/guides/m2devgde/Test/Data/HelpSystem.js +++ b/guides/m2devgde/Test/Data/HelpSystem.js @@ -1,6 +1,6 @@ var xmlHelpSystemData = ""; xmlHelpSystemData += ''; -xmlHelpSystemData += '