From 0ddcf6bed0e4874cfad0cc96b42ad0eae382f01d Mon Sep 17 00:00:00 2001 From: jcarolinares Date: Tue, 30 May 2023 15:40:07 +0200 Subject: [PATCH 1/4] tag added to avoid edit button problems --- content/software/plc-ide/tutorials/can-setup/content.md | 1 + content/software/plc-ide/tutorials/modbus-setup/content.md | 3 ++- .../software/plc-ide/tutorials/plc-ide-pin-mapping/content.md | 1 + .../plc-ide/tutorials/plc-ide-setup-license/content.md | 1 + .../plc-ide/tutorials/plc-programming-introduction/content.md | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/content/software/plc-ide/tutorials/can-setup/content.md b/content/software/plc-ide/tutorials/can-setup/content.md index 60354d560b..1769af1a97 100644 --- a/content/software/plc-ide/tutorials/can-setup/content.md +++ b/content/software/plc-ide/tutorials/can-setup/content.md @@ -9,6 +9,7 @@ hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-ide +contributeURL: content/software/plc-ide --- ## Overview diff --git a/content/software/plc-ide/tutorials/modbus-setup/content.md b/content/software/plc-ide/tutorials/modbus-setup/content.md index e710568e8a..ed2e2f447e 100644 --- a/content/software/plc-ide/tutorials/modbus-setup/content.md +++ b/content/software/plc-ide/tutorials/modbus-setup/content.md @@ -8,7 +8,8 @@ author: 'Pablo Marquínez' hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - - plc-ide + - plc-id +contributeURL: content/software/plc-ide --- ## Overview diff --git a/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md b/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md index c372b62c39..397bbcacd7 100644 --- a/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md +++ b/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md @@ -10,6 +10,7 @@ hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-ide +contributeURL: content/software/plc-ide --- ## Introduction diff --git a/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md b/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md index 39fb60c363..42190817e1 100644 --- a/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md +++ b/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md @@ -14,6 +14,7 @@ software: - ide-v1 - ide-v2 - plc-ide +contributeURL: content/software/plc-ide --- ## Overview diff --git a/content/software/plc-ide/tutorials/plc-programming-introduction/content.md b/content/software/plc-ide/tutorials/plc-programming-introduction/content.md index 3d5ccd25db..f5cc9f705a 100644 --- a/content/software/plc-ide/tutorials/plc-programming-introduction/content.md +++ b/content/software/plc-ide/tutorials/plc-programming-introduction/content.md @@ -12,6 +12,7 @@ hardware: - content/hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-ide +contributeURL: content/software/plc-ide --- ## Introduction From 4a33bc0003a9545711b4f82bd9c626672c182bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juli=C3=A1n=20Caro=20Linares?= Date: Tue, 30 May 2023 15:41:48 +0200 Subject: [PATCH 2/4] Update content.md small typo --- content/software/plc-ide/tutorials/modbus-setup/content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/software/plc-ide/tutorials/modbus-setup/content.md b/content/software/plc-ide/tutorials/modbus-setup/content.md index ed2e2f447e..82a90c4f4a 100644 --- a/content/software/plc-ide/tutorials/modbus-setup/content.md +++ b/content/software/plc-ide/tutorials/modbus-setup/content.md @@ -8,7 +8,7 @@ author: 'Pablo Marquínez' hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - - plc-id + - plc-ide contributeURL: content/software/plc-ide --- From 8bd332e4dea3f0add0a41a4e474dee52ddf78a5b Mon Sep 17 00:00:00 2001 From: jcarolinares Date: Tue, 30 May 2023 16:40:37 +0200 Subject: [PATCH 3/4] content removed from relative path --- content/software/plc-ide/tutorials/modbus-setup/content.md | 2 +- .../software/plc-ide/tutorials/plc-ide-pin-mapping/content.md | 2 +- .../software/plc-ide/tutorials/plc-ide-setup-license/content.md | 2 +- .../plc-ide/tutorials/plc-programming-introduction/content.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/software/plc-ide/tutorials/modbus-setup/content.md b/content/software/plc-ide/tutorials/modbus-setup/content.md index ed2e2f447e..2b9f541e95 100644 --- a/content/software/plc-ide/tutorials/modbus-setup/content.md +++ b/content/software/plc-ide/tutorials/modbus-setup/content.md @@ -9,7 +9,7 @@ hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-id -contributeURL: content/software/plc-ide +contributeURL: /software/plc-ide --- ## Overview diff --git a/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md b/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md index 397bbcacd7..3ce4ef5e75 100644 --- a/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md +++ b/content/software/plc-ide/tutorials/plc-ide-pin-mapping/content.md @@ -10,7 +10,7 @@ hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-ide -contributeURL: content/software/plc-ide +contributeURL: /software/plc-ide --- ## Introduction diff --git a/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md b/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md index 42190817e1..1ed50f8a14 100644 --- a/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md +++ b/content/software/plc-ide/tutorials/plc-ide-setup-license/content.md @@ -14,7 +14,7 @@ software: - ide-v1 - ide-v2 - plc-ide -contributeURL: content/software/plc-ide +contributeURL: /software/plc-ide --- ## Overview diff --git a/content/software/plc-ide/tutorials/plc-programming-introduction/content.md b/content/software/plc-ide/tutorials/plc-programming-introduction/content.md index f5cc9f705a..45b4cc10cd 100644 --- a/content/software/plc-ide/tutorials/plc-programming-introduction/content.md +++ b/content/software/plc-ide/tutorials/plc-programming-introduction/content.md @@ -12,7 +12,7 @@ hardware: - content/hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: - plc-ide -contributeURL: content/software/plc-ide +contributeURL: /software/plc-ide --- ## Introduction From f8130f38df612a7a901b1e258d8103f279a305ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juli=C3=A1n=20Caro=20Linares?= Date: Tue, 30 May 2023 16:49:14 +0200 Subject: [PATCH 4/4] Update content.md Conflict missed string removed --- content/software/plc-ide/tutorials/modbus-setup/content.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/software/plc-ide/tutorials/modbus-setup/content.md b/content/software/plc-ide/tutorials/modbus-setup/content.md index 36ad21b34a..b88e935af0 100644 --- a/content/software/plc-ide/tutorials/modbus-setup/content.md +++ b/content/software/plc-ide/tutorials/modbus-setup/content.md @@ -8,7 +8,6 @@ author: 'Pablo Marquínez' hardware: - hardware/05.pro-solutions/solutions-and-kits/portenta-machine-control software: -<<<<<<< HEAD - plc-ide contributeURL: /software/plc-ide ---