Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

src/scanner.l

@@ -2269,8 +2269,8 @@ NONLopt [^\n]*
                                           yyextra->delimiter = &yytext[1];
                                           BEGIN(HereDocEnd);
                                         }
-<HereDocEnd>^{ID}                       { // id at start of the line could mark the end of the block
-                                          if (yyextra->delimiter==yytext) // it is the end marker
+<HereDocEnd>^{Bopt}{ID}                 { // id at start of the line could mark the end of the block
+                                          if (yyextra->delimiter==QCString(yytext).stripWhiteSpace()) // it is the end marker
                                           {
                                             BEGIN(yyextra->lastHereDocContext);
                                           }

src/sitemap.cpp

@@ -72,10 +72,10 @@ void Sitemap::finalize()
 void Sitemap::addIndexFile(const QCString & fileName)
 {
   QCString fn = fileName;
-  QCString sidemapUrl = Config_getString(SITEMAP_URL);
+  QCString sitemapUrl = Config_getString(SITEMAP_URL);
   addHtmlExtensionIfMissing(fn);
   p->doc << "  <url>\n";
-  p->doc << "    <loc>" << convertToXML(sidemapUrl + fn) << "</loc>\n";
+  p->doc << "    <loc>" << convertToXML(sitemapUrl + fn) << "</loc>\n";
   p->doc << "  </url>\n";
 }