From bba01e73c08e9f9dc20409dcd7ac1df243f11ae6 Mon Sep 17 00:00:00 2001 From: Michael Telgmann Date: Tue, 31 Jan 2023 16:03:05 +0100 Subject: [PATCH] Rename default branch to main --- README.md | 2 +- app/config/sculpin_site.yml | 2 +- source/developers-guide/rest-api/examples/article/index.md | 2 +- source/developers-guide/rest-api/examples/order/index.md | 4 ++-- source/shopware-enterprise/pricing-engine/rest-api/index.md | 2 +- source/shopware-enterprise/pricing-engine/technical/index.md | 2 +- source/shopware-enterprise/pricing-engine/user-guide/index.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 857f922c8b..578b60fc7f 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ To enable the search, the environment variable `SYMFONY__ALGOLIA_ENABLED` also m SYMFONY__ALGOLIA_ENABLED=1 SYMFONY__ALGOLIA_API_KEY=MYAPIKEY ./vendor/bin/sculpin generate ``` -These variables are automatically exported during the Travis-CI build for every merge/commit on the `master` branch. +These variables are automatically exported during the build for every merge/commit on the `main` branch. ## CSS helper classes diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index e5ba909229..05969ca335 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -1,5 +1,5 @@ title: Shopware Developers -githuburl: https://github.com/shopware5/devdocs/blob/master/source/ +githuburl: https://github.com/shopware5/devdocs/blob/main/source/ github_enabled: true default_date_format: "F jS, Y" diff --git a/source/developers-guide/rest-api/examples/article/index.md b/source/developers-guide/rest-api/examples/article/index.md index faacebf794..f123d3085c 100644 --- a/source/developers-guide/rest-api/examples/article/index.md +++ b/source/developers-guide/rest-api/examples/article/index.md @@ -377,7 +377,7 @@ In this example, we will update the name of the product with the id 3 "success":true, "data":{ "id":3, - "location":"http:\/\/localhost\/master\/api\/articles\/3" + "location":"http:\/\/localhost\/shop\/api\/articles\/3" } } ``` diff --git a/source/developers-guide/rest-api/examples/order/index.md b/source/developers-guide/rest-api/examples/order/index.md index ecb5e06b0a..ca43dd4676 100644 --- a/source/developers-guide/rest-api/examples/order/index.md +++ b/source/developers-guide/rest-api/examples/order/index.md @@ -460,7 +460,7 @@ To load a specific order, you have to provide either the identifier or the numbe "title":null, "position":0, "host":null, - "basePath":"\/master", + "basePath":"\/shop", "baseUrl":null, "hosts":"", "secure":false, @@ -518,7 +518,7 @@ To load a specific order, you have to provide either the identifier or the numbe "title":null, "position":0, "host":null, - "basePath":"\/master", + "basePath":"\/shop", "baseUrl":null, "hosts":"", "secure":false, diff --git a/source/shopware-enterprise/pricing-engine/rest-api/index.md b/source/shopware-enterprise/pricing-engine/rest-api/index.md index 9331aba958..37b0beb61c 100644 --- a/source/shopware-enterprise/pricing-engine/rest-api/index.md +++ b/source/shopware-enterprise/pricing-engine/rest-api/index.md @@ -18,7 +18,7 @@ You can also find a fully comprehensive and up-to-date Swagger documentation git repo. If you don't have access yet, please create a ticket via your shopware account. You will receive an invitation soon. +In order to maintain your custom pricing lists, the Pricing Engine offers a range of RESTful endpoints. In the following examples is http://10.222.222.30/api our local endpoint for the shopware api. You can find examples written with guzzle in the official git repo. If you don't have access yet, please create a ticket via your shopware account. You will receive an invitation soon. ### Price lists diff --git a/source/shopware-enterprise/pricing-engine/technical/index.md b/source/shopware-enterprise/pricing-engine/technical/index.md index a4e1a5b4f4..3d71bd55c5 100644 --- a/source/shopware-enterprise/pricing-engine/technical/index.md +++ b/source/shopware-enterprise/pricing-engine/technical/index.md @@ -162,4 +162,4 @@ At least we have to register our components in the dependency injection containe ``` ## Conclusion -To add a own condition is quite simple. If you need the whole plugin, please have a look into our [example-plugins](https://git.shopware.com/enterprise/PricingEngine/tree/master/example-plugins/) directory. +To add a own condition is quite simple. If you need the whole plugin, please have a look into our [example-plugins](https://gitlab.com/shopware/shopware/enterprise/swagenterprisepricingengine/-/tree/master/example-plugins/) directory. diff --git a/source/shopware-enterprise/pricing-engine/user-guide/index.md b/source/shopware-enterprise/pricing-engine/user-guide/index.md index bed8f5aabb..6f93cb2cb2 100644 --- a/source/shopware-enterprise/pricing-engine/user-guide/index.md +++ b/source/shopware-enterprise/pricing-engine/user-guide/index.md @@ -16,7 +16,7 @@ menu_order: 1 The Pricing Engine stores several prices in price lists which can be assigned to different contexts with conditions. The whole architecture is designed for use cases where an ERP or PIM system is managing the prices. So no backend view is present for adding, inserting or deleting prices. So the backend offers only a view to manage the conditions for the imported price lists. For controlling purposes there is a separate tab added in the product detail view. In this view you can see all configured prices for this product and filter it by the existing price lists. -To import price lists and prices there is a power full REST-Api present. You can find all definitions in our swagger.json [here](https://git.shopware.com/enterprise/PricingEngine/blob/master/swagger.json) +To import price lists and prices there is a powerful REST-Api present. You can find all definitions in our swagger.json [here](https://gitlab.com/shopware/shopware/enterprise/swagenterprisepricingengine/-/blob/master/swagger.json) ## Backend View