diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-10-12 20:02:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-15 14:45:15 +0100 |
commit | bd83f6a66fed8bcca69c9982e9d0a65b870034d2 (patch) | |
tree | 70b5b99b7077c46f65f95bb7a776d5f28fd15699 /documentation/dev-manual/dev-manual-model.xml | |
parent | 4c35e5a983f215e83ce80fde1810403d26a3341d (diff) | |
download | poky-bd83f6a66fed8bcca69c9982e9d0a65b870034d2.tar.gz |
documentation: dev-manual - edits to kernel section and compliance
* Edits to get the patching the kernel section more sane.
* A tweak to the opening sentence of the compliance section to
rid it of the split-infinitives.
(From yocto-docs rev: 8e2ff293e85a602efd98aceb20da5a2ea5f2a34d)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-model.xml')
-rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 436ecb6fb7..b61eeb0678 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml | |||
@@ -1688,10 +1688,12 @@ directory.</para></listitem> | |||
1688 | You need to be in the directory that has the temporary source code. | 1688 | You need to be in the directory that has the temporary source code. |
1689 | That directory is defined by the | 1689 | That directory is defined by the |
1690 | <ulink url='&YOCTO_DOCS_REF_URL;#var-S'>S</ulink> | 1690 | <ulink url='&YOCTO_DOCS_REF_URL;#var-S'>S</ulink> |
1691 | variable. | 1691 | variable. |
1692 | For this discussion, assume that directory is <filename>linux</filename>.</para></listitem> | 1692 | If you are working with a kernel, you need to be in the |
1693 | <listitem><para><emphasis>Initialize a Git Repository:</emphasis> | 1693 | <filename>${S}/linux</filename> directory.</para></listitem> |
1694 | Use the <filename>git init</filename> command to initialize a new local repository | 1694 | <listitem><para><emphasis>If needed, initialize a Git Repository:</emphasis> |
1695 | If you are not already in a Git repository, use the | ||
1696 | <filename>git init</filename> command to initialize a new local repository | ||
1695 | that is based on the work directory: | 1697 | that is based on the work directory: |
1696 | <literallayout class='monospaced'> | 1698 | <literallayout class='monospaced'> |
1697 | $ git init | 1699 | $ git init |
@@ -1730,11 +1732,6 @@ directory.</para></listitem> | |||
1730 | "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" | 1732 | "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" |
1731 | section of the Yocto Project Quick Start. | 1733 | section of the Yocto Project Quick Start. |
1732 | </note></para></listitem> | 1734 | </note></para></listitem> |
1733 | <listitem><para><emphasis>Change Your Working Directory:</emphasis> | ||
1734 | After making your edits, move back to the directory from which you | ||
1735 | initialized the Git repository. | ||
1736 | Returning to this directory ensures you are using the correct branch when | ||
1737 | you go to commit your changes.</para></listitem> | ||
1738 | <listitem><para><emphasis>See the List of Files You Changed:</emphasis> | 1735 | <listitem><para><emphasis>See the List of Files You Changed:</emphasis> |
1739 | Use the <filename>git status</filename> command to see what files you have actually edited. | 1736 | Use the <filename>git status</filename> command to see what files you have actually edited. |
1740 | The ability to have Git track the files you have changed is an advantage that this | 1737 | The ability to have Git track the files you have changed is an advantage that this |
@@ -1749,7 +1746,7 @@ directory.</para></listitem> | |||
1749 | Again, for this discussion assume the files changed are in the <filename>linux</filename> | 1746 | Again, for this discussion assume the files changed are in the <filename>linux</filename> |
1750 | directory: | 1747 | directory: |
1751 | <literallayout class='monospaced'> | 1748 | <literallayout class='monospaced'> |
1752 | $ git add linux/file1.c linux/file2.c linux/file3.c | 1749 | $ git add <somepath>/file1.c <somepath>/file2.c <somepath>/file3.c |
1753 | </literallayout></para></listitem> | 1750 | </literallayout></para></listitem> |
1754 | <listitem><para><emphasis>Commit the Staged Files and View Your Changes:</emphasis> | 1751 | <listitem><para><emphasis>Commit the Staged Files and View Your Changes:</emphasis> |
1755 | Use the <filename>git commit</filename> command to commit the changes to the | 1752 | Use the <filename>git commit</filename> command to commit the changes to the |