summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-08-24 14:55:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:55:00 +0100
commit6b357655fe52604404a5f1cbc0ded743cb124cfd (patch)
tree2554202d819e55ed01357f058caa671b594a7485 /documentation
parent0c69e7be91c503b944800f62638cb986ea97d41d (diff)
downloadpoky-6b357655fe52604404a5f1cbc0ded743cb124cfd.tar.gz
documentation: Section Heading change for pushing commits
Changed the section heading for the part describing how to push changes upstream via the poky scripts. Also had to change one cross-reference to the section in the kernel manual. (From yocto-docs rev: be7712aba044238e8781cdf869c5d14e77eb09a2) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-newbie.xml12
-rw-r--r--documentation/kernel-manual/kernel-how-to.xml4
2 files changed, 8 insertions, 8 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml
index 5ea6194ae0..8b58bb675e 100644
--- a/documentation/dev-manual/dev-manual-newbie.xml
+++ b/documentation/dev-manual/dev-manual-newbie.xml
@@ -987,11 +987,11 @@
987 your detailed description. 987 your detailed description.
988 For example, the Yocto Project uses a specific convention for bug 988 For example, the Yocto Project uses a specific convention for bug
989 references - any commit that addresses a specific bug should include the 989 references - any commit that addresses a specific bug should include the
990 bug ID in the description (typically at the end) as follows: 990 bug ID in the description (typically at the beginning) as follows:
991 <literallayout class='monospaced'> 991 <literallayout class='monospaced'>
992 &lt;detailed description of change&gt;
993
994 [YOCTO #&lt;bug-id&gt;] 992 [YOCTO #&lt;bug-id&gt;]
993
994 &lt;detailed description of change&gt;
995 </literallayout></para></listitem> 995 </literallayout></para></listitem>
996 Where &lt;bug-id&gt; is replaced with the specific bug ID from the 996 Where &lt;bug-id&gt; is replaced with the specific bug ID from the
997 Yocto Project Bugzilla instance. 997 Yocto Project Bugzilla instance.
@@ -1009,7 +1009,7 @@
1009 </para> 1009 </para>
1010 1010
1011 <section id='pushing-a-change-upstream'> 1011 <section id='pushing-a-change-upstream'>
1012 <title>Pushing a Change Upstream and Requesting a Pull</title> 1012 <title>Using Scripts to Push a Change Upstream and Request a Pull</title>
1013 1013
1014 <para> 1014 <para>
1015 The basic flow for pushing a change to an upstream "contrib" Git repository is as follows: 1015 The basic flow for pushing a change to an upstream "contrib" Git repository is as follows:
@@ -1100,8 +1100,8 @@
1100 see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the 1100 see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the
1101 <filename>man git-format-patch</filename> command.</para> 1101 <filename>man git-format-patch</filename> command.</para>
1102 <note>If you have many patches to submit, you might consider using the 1102 <note>If you have many patches to submit, you might consider using the
1103 method described in the "<link linkend='pushing-a-change-upstream'>Pushing 1103 method described in the "<link linkend='pushing-a-change-upstream'>Using Scripts to Push
1104 a change Upstream and Requesting a Pull</link>" section described 1104 a change Upstream and Request a Pull</link>" section described
1105 earlier in the manual. 1105 earlier in the manual.
1106 This method uses the <filename>create-pull-request</filename> and 1106 This method uses the <filename>create-pull-request</filename> and
1107 <filename>send-pull-request</filename> scripts that automate much of the 1107 <filename>send-pull-request</filename> scripts that automate much of the
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 6db88de5f7..a44e5ea51e 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -369,8 +369,8 @@
369 The Yocto Project provides scripts that help you work in a collaborative development 369 The Yocto Project provides scripts that help you work in a collaborative development
370 environment. 370 environment.
371 For information on these scripts, see the 371 For information on these scripts, see the
372 "<ulink url='&YOCTO_DOCS_DEV_URL;#pushing-a-change-upstream'>Pushing a Change 372 "<ulink url='&YOCTO_DOCS_DEV_URL;#pushing-a-change-upstream'>Using Scripts to Push a Change
373 Upstream and Requesting a Pull</ulink>" and 373 Upstream and Request a Pull</ulink>" and
374 "<ulink url='&YOCTO_DOCS_DEV_URL;#submitting-a-patch'>Submitting a Patch Through 374 "<ulink url='&YOCTO_DOCS_DEV_URL;#submitting-a-patch'>Submitting a Patch Through
375 Email</ulink>" sections in the Yocto Project Development Manual. 375 Email</ulink>" sections in the Yocto Project Development Manual.
376 </para> 376 </para>