bitbake: Sync with 1.8 branch upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5345 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 8 insertions, 6 deletions

diff --git a/bitbake/doc/bitbake.1 b/bitbake/doc/bitbake.1
index e6cbe7df0e..01172d7412 100644
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -97,12 +97,13 @@ emit the dependency trees of the specified packages in the dot syntax
 .B \-IIGNORED\_DOT\_DEPS, \-\-ignore-deps=IGNORED_DOT_DEPS
 Stop processing at the given list of dependencies when generating dependency
 graphs. This can help to make the graph more appealing
-.\"
-.\" Next option is only in BitBake 1.7.x (trunk)
-.\"
-.\".TP
-.\".B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
-.\"Show debug logging for the specified logging domains
+.TP
+.B \-lDEBUG_DOMAINS, \-\-log-domains=DEBUG_DOMAINS
+Show debug logging for the specified logging domains
+.TP
+.B \-P, \-\-profile
+profile the command and print a report
+.TP
 
 .SH AUTHORS
 BitBake was written by 
diff --git a/bitbake/doc/manual/usermanual.xml b/bitbake/doc/manual/usermanual.xml
index a79716a0aa..a01801e03f 100644
--- a/bitbake/doc/manual/usermanual.xml
+++ b/bitbake/doc/manual/usermanual.xml
@@ -415,6 +415,7 @@ options:
                         the graph more appealing
   -l DEBUG_DOMAINS, --log-domains=DEBUG_DOMAINS
                         Show debug logging for the specified logging domains
+  -P, --profile         profile the command and print a report
 
 </screen>
                 </para>