Merge branch 'v6-stable' into beta

.gitignore

@@ -40,3 +40,18 @@ debug
 core.*
 shave
 shave-libtool
+core*
+vgcore*
+*.tar.gz
+*.new
+*.orig
+*.old
+*.diff
+*.patch
+checklog
+*.bad
+*.rej
+*.log
+logfile*
+*.conf
+log

ChangeLog

@@ -139,6 +139,7 @@ Version 6.5.0  [devel] 2012-08-28
   http://bugzilla.adiscon.com/show_bug.cgi?id=353
 ---------------------------------------------------------------------------
 Version 6.4.3  [V6-STABLE] 2012-??-??
+- bugfix: comments inside objects (e.g. action()) were not properly handled
 - bugfix: sysklogd-emulating standard template was no longer present in v6
   This was obviously lost during the transition to the new config format.
   Thanks to Milan Bartos for alerting us and a patch!

doc/Makefile.am

@@ -130,6 +130,21 @@ html_files = \
 	rsyslog_conf_nomatch.html \
 	queues_analogy.html \
 	multi_ruleset.html \
+	dev_oplugins.html \
+	free_support.html \
+	imudp.html \
+	messageparser.html \
+	omhdfs.html \
+	omprog.html \
+	queue_msg_state.jpeg \
+	rsconf1_abortonuncleanconfig.html \
+	rsconf1_maxopenfiles.html \
+	rsconf1_omfileforcechown.html \
+	rsyslog_conf_file_syntax_differences.html \
+	rsyslog_conf_lines.html \
+	rsyslog_queue_pointers.jpeg \
+	rsyslog_queue_pointers2.jpeg \
+	v6compatibility.html \
 	src/classes.dia
 
 grfx_files = \

grammar/lexer.l

@@ -211,6 +211,7 @@ int fileno(FILE *stream);
 				  /*yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2);
 				  return VALUE; }*/
 "/*"				{ preCommentState = YY_START; BEGIN COMMENT; }
+<INOBJ>"/*"			{ preCommentState = YY_START; BEGIN COMMENT; }
 <EXPR>"/*"			{ preCommentState = YY_START; BEGIN COMMENT; }
 <COMMENT>"*/"			{ BEGIN preCommentState; }
 <COMMENT>([^*]|\n)+|.