Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 5afe7ea

Browse files
author
Steve Johnson
committed
Merge pull request #1 from stevjohnson/pull-requests_10-6-14
Pull requests from 10-6-14
2 parents 101692c + 333372f commit 5afe7ea

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

guides/m2devgde/v1.0.0.0/integration/integration-auth.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ title: Understanding Integration Authorization
77

88
<p><a href="{{ site.githuburl }}guides/m2devgde/v1.0.0.0/integration/integration-auth.md" target="_blank"><em>Help us improve this page</em></a>&nbsp;<img src="{{ site.baseurl }}common/images/newWindow.gif"/></p>
99

10+
Hello
11+
1012
There are two ways to authenticate the third-party system with Magento:
1113

1214
* (Preferred) Using a secure, cloud-based OAuth workflow

guides/m2devgde/v1.0.0.0/rest/rest-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ title: Accessing Magento Objects Using REST
99

1010
<h2 id="rest-call">How to Make a REST Call</h2>
1111

12-
All REST calls for the Customer service are contained in ~webapi.xml~; however, inputs and return values are defined in their respective interfaces.
12+
All REST calls for the Customer service are contained in `webapi.xml`; however, inputs and return values are defined in their respective service interfaces.
1313

1414
To make a REST call for the Customer service:
1515

1616
<h3 id="rest-call-step1">Step 1: Look up the call in webapi.xml:</h3>
1717

18-
This section discusses how to make an HTTP GET call to the getCustomer method.
18+
This section uses as an example how to make an HTTP GET call to the getCustomer method.
1919

2020
1. Open `webapi.xml`.
2121

@@ -32,7 +32,7 @@ In this example, `GET /V1/customerAccounts/:customerId/customer`
3232

3333
*Note*: Any value prefixed by a colon character is a required input. In the preceding example, `:customerId` indicates you must provide the customer ID.
3434

35-
*Note*: Some REST calls have no route; for these cases, use the Base URL only.
35+
*Note*: Some REST calls have no route; for these calls, use the Base URL only.
3636

3737
<h3 id="rest-call-step2">Step 2: Find the response object</h3>
3838

guides/m2devgde/v1.0.0.0/svcs-framework/compare_mage1_mage2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: howtom2devgde_chapters
33
title: Services Use Case&mdash;Magento 1 and Magento 2 Side By Side
44
---
55

6-
# Services Use Case&mdash;Magento 1 and Magento 2 Side By Side
6+
<h1 id="svcs-use-case-mage1">Services Use Case&mdash;Magento 1 and Magento 2 Side By Side</h1>
77

88
<p><a href="{{ site.githuburl }}guides/m2devgde/v1.0.0.0/svcs-framework/compare_mage1_mage2.md" target="_blank"><em>Help us improve this page</em></a>&nbsp;<img src="{{ site.baseurl }}common/images/newWindow.gif"/></p>
99

@@ -34,7 +34,7 @@ Magento 2 implementation:
3434

3535
Both implementations:
3636

37-
* Use a template and two blocks
37+
* Use one template and two blocks
3838
* Return the address object as HTML
3939

4040
However, the similarities end there. The following table shows the key differences between the implementations:
@@ -74,7 +74,7 @@ Magento 2 implementation:
7474

7575
<p><img src="{{ site.baseurl }}common/images/services_service-interaction_checkout-reg_mage2.png"/></p>
7676

77-
### Discussion of Register During Checkout Example
77+
### Discussion of the Register During Checkout Example
7878

7979
These two implementations both start with the controller calling the <tt>saveOrder</tt> method on the Onepage class, then Onepage calling <tt>submitOrder</tt> on the Quote class.
8080

0 commit comments

Comments
 (0)