Improve component guide with additional warnings

In order to avoid launching automated pipelines add a warning to disable the before doing any manual update from Debian.

Signed-off-by: Walter Lozano walter.lozano@collabora.com

content/guides/component_guide.md

@@ -279,6 +279,12 @@ This guide uses tools that are only provided in the package-source-builder
 image. The easiest way to perform this task is to utilise the docker container.
 {{% /notice %}}
 
+{{% notice warning %}}
+The
+[automated pipeline]({{< ref "component_guide.md#updating-components-from-debian" >}})
+should be disabled for this component in order to use the following steps.
+{{% /notice %}}
+
 However, in some cases it may be necessary to manually perform these
 operations.
 
@@ -324,7 +330,7 @@ operations.
 - The upstream changes now need to be merged into the apertis branch. We will
   do this via a development branch that can be pushed for review.
 
-      $ PROPOSED_BRANCH=wip/${GITLAB_GROUP}/${APERTIS_RELEASE}-update
+      $ PROPOSED_BRANCH= proposed-updates/${USERNAME}/${APERTIS_RELEASE}-update
       $ git checkout -b ${PROPOSED_BRANCH} apertis/${APERTIS_RELEASE}
       $ apertis-pkg-merge-updates --upstream=debian/${CURRENT_UPSTREAM} --downstream=${PROPOSED_BRANCH}
 
@@ -402,6 +408,12 @@ This guide uses tools that are only provided in the package-source-builder
 image. The easiest way to perform this task is to utilise the docker container.
 {{% /notice %}}
 
+{{% notice warning %}}
+The
+[automated pipeline]({{< ref "component_guide.md#updating-components-from-debian" >}})
+should be disabled for this component in order to use the following steps.
+{{% /notice %}}
+
 Below are a set of steps which can be adapted to such exception packages. Let
 us assume that for such repository, the package was picked from Debian Bullseye
 instead of Buster
@@ -453,7 +465,7 @@ instead of Buster
 - The upstream changes now need to be merged into the apertis branch. We will
   do this via a development branch that can be pushed for review.
 
-      $ PROPOSED_BRANCH=wip/${GITLAB_GROUP}/${APERTIS_RELEASE}-update-from-${DESIRED_UPSTREAM}
+      $ PROPOSED_BRANCH=proposed-updates/${USERNAME}/${APERTIS_RELEASE}-update-from-${DESIRED_UPSTREAM}
       $ git checkout -b ${PROPOSED_BRANCH} apertis/${APERTIS_RELEASE}
       $ apertis-pkg-merge-updates --upstream=debian/${DESIRED_UPSTREAM} --downstream=${PROPOSED_BRANCH}
 
@@ -518,7 +530,7 @@ packages taken from stable or even testing releases.
   and wish to use the updated package in Bullseye:
 
       $ CURRENT_UPSTREAM=buster
-      $ DESIRED_UPSTREAM=experimental
+      $ DESIRED_UPSTREAM=unreleased
       $ git push origin origin/upstream/${CURRENT_UPSTREAM}:refs/heads/upstream/${DESIRED_UPSTREAM}
       $ git push origin origin/debian/${CURRENT_UPSTREAM}:refs/heads/debian/${DESIRED_UPSTREAM}
 
@@ -548,7 +560,7 @@ packages taken from stable or even testing releases.
   do this via a development branch that can be pushed for review.
 
       $ APERTIS_RELEASE=v2021
-      $ PROPOSED_BRANCH=wip/${GITLAB_GROUP}/${APERTIS_RELEASE}-update-from-${DESIRED_UPSTREAM}
+      $ PROPOSED_BRANCH=proposed-updates/${USERNAME}/${APERTIS_RELEASE}-update-from-${DESIRED_UPSTREAM}
       $ git checkout -b ${PROPOSED_BRANCH} apertis/${APERTIS_RELEASE}
       $ apertis-pkg-merge-updates --upstream=debian/${DESIRED_UPSTREAM} --downstream=${PROPOSED_BRANCH}