From b43b8efcffcbeedfebbc154c40c8c0047a7941c0 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 14 Jan 2013 12:24:08 -0800 Subject: kernel-dev: Edits to the SCC reference section. (From yocto-docs rev: 51872ec247e93f9dd7b7c12ee32191565c30ebfa) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/kernel-dev/kernel-dev-advanced.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'documentation') diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml index df3f30141a..43dec92555 100644 --- a/documentation/kernel-dev/kernel-dev-advanced.xml +++ b/documentation/kernel-dev/kernel-dev-advanced.xml @@ -1034,11 +1034,11 @@
- SCC Reference + SCC Description File Reference - This section provides short descriptions for the commands you can - use from an .scc: + This section provides a brief reference for the commands you can use + within an SCC description file (.scc): branch [ref]: Creates a new branch relative to the current branch @@ -1051,13 +1051,15 @@ KTYPE, KARCH, and KFEATURE_DESCRIPTION. include SCC_FILE: - Includes an scc file in the current file. - It will be parsed as if inserted inline. + Includes an SCC file in the current file. + The file is parsed as if you had inserted it inline. + kconf [hardware|non-hardware] CFG_FILE: Queues a configuration fragment for merging into the final Linux .config file. git merge GIT_BRANCH: - Merges the feature branch into the current branch. + Merges the feature branch into the current branch. + patch PATCH_FILE: Applies the patch to the current Git branch. -- cgit v1.2.3-54-g00ecf