merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

1 files changed, 13 insertions, 6 deletions

diff --git a/conf/documentation.conf b/conf/documentation.conf
index eec06daf7c..44a174a01b 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -98,6 +98,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
 
 SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
 
+# insane bbclass
+QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
+
 # palmtop build class
 PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread"
 
@@ -105,6 +108,7 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su
 COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
 
 SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking."
+SOURCE_MIRROR_URL[doc] = "URL to source mirror which will be used before fetching from original SRC_URI."
 
 BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure."
 BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
@@ -114,16 +118,19 @@ BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
 SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild"
 SEPPUKU_USER[doc]     = "The login-name for the bugzilla account"
 SEPPUKU_PASS[doc]     = "The password for this account"
-#SEPPUKU_LOGIN         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi?"
+#SEPPUKU_LOGIN         = "http://bugs.openembedded.org/query.cgi?"
 SEPPUKU_LOGIN[doc]    = "path to the login script of the bugzilla, note the ? at the end"
-#SEPPUKU_QUERY         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/buglist.cgi"
+#SEPPUKU_QUERY         = "http://bugs.openembedded.org/buglist.cgi"
 SEPPUKU_QUERY[doc]    = "The query script of the bugzilla"
-#SEPPUKU_NEWREPORT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&"
+#SEPPUKU_NEWREPORT     = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
-#SEPPUKU_ADDCOMMENT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&target_milestone=Phase+0&"
+#SEPPUKU_ADDCOMMENT     = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
 SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
+#SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi"
+SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
+
 
-#SEPPUKU_PRODUCT       = "OpenMoko"
+#SEPPUKU_PRODUCT       = "Openembedded"
 SEPPUKU_PRODUCT[doc]  = "The product inside the bugtracker"
-#SEPPUKU_COMPONENT     = "autobuilds"
+#SEPPUKU_COMPONENT     = "build"
 SEPPUKU_COMPONENT[doc]= "The component inside the bugtracker"