5 files changed, 78 insertions, 260 deletions

diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index eae40bdb3166..5065acaa501c 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bugzilla
-PORTVERSION=	4.4.9
-PORTREVISION=	1
+PORTVERSION=	5.0
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/webtools MOZILLA/webtools/archived
 
@@ -18,8 +17,10 @@ RUN_DEPENDS=	\
 		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
 		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
 		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Send>=2.04:${PORTSDIR}/mail/p5-Email-Send \
+		p5-Email-Sender>=1.300011:${PORTSDIR}/mail/p5-Email-Sender \
 		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
+		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
+		p5-JSON-XS>=2.01:${PORTSDIR}/converters/p5-JSON-XS \
 		p5-List-MoreUtils>=0.32:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Math-Random-ISAAC>=1.001:${PORTSDIR}/math/p5-Math-Random-ISAAC \
 		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
@@ -60,7 +61,7 @@ RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
+USES+=		pgsql:91+
 RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
@@ -99,8 +100,7 @@ RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:${PORTSDIR}/mail/p5-Email-MIM
 
 .if ${PORT_OPTIONS:MMAIL_QUEUEING}
 RUN_DEPENDS+=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp
+		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic
 .endif
 
 .if ${PORT_OPTIONS:MMOVE_BUGZ}
@@ -114,7 +114,7 @@ RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
-.if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC}
+.if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
 RUN_DEPENDS+=	p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
 .endif
 
@@ -125,9 +125,8 @@ RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:${PORTSDIR}/net/p5-XMLRPC-Lite
 RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:${PORTSDIR}/net/p5-SOAP-Lite
 .endif
 
-.if ${PORT_OPTIONS:MJSONRPC}
-RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC \
-		p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS
+.if ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
+RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
@@ -165,21 +164,26 @@ RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
 		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy
 .endif
 
+.if ${PORT_OPTIONS:MMEMCACHED}
+RUN_DEPENDS+=	p5-Cache-Memcached>=1.30:${PORTSDIR}/databases/p5-Cache-Memcached
+.endif
+
 post-extract:
+# The docs_urlbase parameter has been removed. If documentation has not been
+# compiled locally, the "Help" links and other documentation links will
+# redirect to bugzilla.readthedocs.org automatically.
+	${RM} -r ${WRKSRC}/docs
 	${RM} -r ${WRKSRC}/.git
 	${RM} ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \
-		${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc \
-		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP \
-		${WRKSRC}/taskgraph.json
+		${WRKSRC}/.travis.yml ${WRKSRC}/Build.PL ${WRKSRC}/MANIFEST.SKIP
 
 post-patch:
 	${REINPLACE_CMD} -e 's/apache/www/' ${WRKSRC}/Bugzilla/Install/Localconfig.pm
-	${REINPLACE_CMD} -e 's|/opt/bugzilla|${WWWDIR}|' ${WRKSRC}/importxml.pl \
-		${WRKSRC}/docs/en/html/api/importxml.html
-	${FIND} ${WRKSRC} -type f \( -name \*.cgi -o -name \*.html -o -name \*.pl -o -name \*.pm -o -name \*.t -o -name \*.txt -o -name \*.xml \) \
+	${REINPLACE_CMD} -e 's|/opt/bugzilla|${WWWDIR}|' ${WRKSRC}/importxml.pl
+	${FIND} ${WRKSRC} -type f \( -name \*.cgi -o -name \*.pl -o -name \*.pm -o -name \*.t \) \
 		-exec ${SED} -i '' -e "s=/usr/bin/perl=${PERL}=g; \
-			s!/usr/lib/sendmail!/usr/sbin/sendmail!g; \
-			s!/var/www/html/bugzilla!${WWWDIR}!" {} \+
+			s!/usr/lib/sendmail!/usr/sbin/sendmail!g;" {} \+
+
 .if ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL}
 	${REINPLACE_CMD} -e "s/'mysql'/'Pg'/" ${WRKSRC}/Bugzilla/Install/Localconfig.pm
 .endif
@@ -197,8 +201,6 @@ do-install:	.SILENT
 .endfor
 	${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
 	@${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .if ${PORT_OPTIONS:MCONTRIB}
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/contrib
diff --git a/devel/bugzilla50/Makefile.common b/devel/bugzilla50/Makefile.common
index 73dd50e0affb..9a10e38b28bb 100644
--- a/devel/bugzilla50/Makefile.common
+++ b/devel/bugzilla50/Makefile.common
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 DIST_SUBDIR=	${PORTNAME}
-PKGNAMESUFFIX=	44
+PKGNAMESUFFIX=	50
 
 CONFLICTS_INSTALL=	\
-		bugzilla4[^4].* \
-		bugzilla5*
+		bugzilla5[^0].* \
+		bugzilla4*
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/bugzilla50/Makefile.options b/devel/bugzilla50/Makefile.options
index f3f2f5e084fe..b52674aa10f9 100644
--- a/devel/bugzilla50/Makefile.options
+++ b/devel/bugzilla50/Makefile.options
@@ -2,7 +2,6 @@
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=		\
-	DOCS		\
 	MODPERL
 
 OPTIONS_GROUP=	UI DBBACKEND REPORTING ATTACHMENT EMAIL WEBSERVICE AUTH ADMIN
@@ -23,7 +22,8 @@ OPTIONS_GROUP_AUTH=	\
 OPTIONS_GROUP_DBBACKEND= \
 	MYSQL		\
 	PGSQL		\
-	SQLITE
+	SQLITE		\
+	MEMCACHED
 
 OPTIONS_GROUP_EMAIL= 	\
 	INBOUND_EMAIL	\
@@ -38,7 +38,8 @@ OPTIONS_GROUP_REPORTING= \
 
 OPTIONS_GROUP_WEBSERVICE= \
 	XMLRPC		\
-	JSONRPC
+	JSONRPC		\
+	REST
 
 OPTIONS_GROUP_UI= 	\
 	PATCH_VIEWER	\
@@ -51,6 +52,8 @@ OPTIONS_DEFAULT=	\
 	MORE_HTML	\
 	PATCH_VIEWER
 
+# Note: XML-RPC and JSON-RPC are deprecated in favor of REST and 
+# will likely be removed in the Bugzilla 7.0 release. 
 BMP2PNG_DESC=		BMP Attachments to PNGs
 CHARTING_MODULES_DESC=	Bug charting support
 CONTRIB_DESC=		Install user-contributed scripts
@@ -63,9 +66,11 @@ MIME_SNIFF_DESC=	Sniff MIME type of attachments
 MORE_HTML_DESC=		More HTML in Product/Group Descriptions
 MOVE_BUGZ_DESC=		Move Bugs Between Installations
 PATCH_VIEWER_DESC=	Patch Viewer
+REST_DESC=		REST Interface
 SMTP_AUTH_DESC=		SMTP Authentication
 SMTP_SSL_DESC=		SSL Support for SMTP
 XMLRPC_DESC=		XML-RPC Interface
+MEMCACHED_DESC=		Memcached Support
 
 # Option group description
 ADMIN_DESC=		Administration
diff --git a/devel/bugzilla50/distinfo b/devel/bugzilla50/distinfo
index 1dfd58c71277..cf35f99218bd 100644
--- a/devel/bugzilla50/distinfo
+++ b/devel/bugzilla50/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bugzilla/bugzilla-4.4.9.tar.gz) = fb08e3c7a3f69fe832073827c5fa313e2290962fbce11bd56c23477fc52e6c65
-SIZE (bugzilla/bugzilla-4.4.9.tar.gz) = 4937291
+SHA256 (bugzilla/bugzilla-5.0.tar.gz) = ee5a26c00c67531ef4ce9bf5eae6f07bd59d8900ebe3139ca8e96562f92c7e06
+SIZE (bugzilla/bugzilla-5.0.tar.gz) = 3996799
diff --git a/devel/bugzilla50/pkg-plist b/devel/bugzilla50/pkg-plist
index 52315c61e807..20011871a615 100644
--- a/devel/bugzilla50/pkg-plist
+++ b/devel/bugzilla50/pkg-plist
@@ -1,220 +1,10 @@
-%%PORTDOCS%%%%DOCSDIR%%/bugzilla.ent
-%%PORTDOCS%%%%DOCSDIR%%/bugzilla.ent.tmpl
-%%PORTDOCS%%%%DOCSDIR%%/en/html/Bugzilla-Guide.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/about.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/administration.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Attachment.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Auth.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Auth/Login.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Auth/Verify.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/CGI.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Classification.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Comment.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Component.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Config.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Config/Common.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB/Mysql.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB/Oracle.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB/Pg.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB/Schema.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/DB/Sqlite.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Error.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Extension.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Field.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Field/Choice.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Field/ChoiceInterface.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Flag.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/FlagType.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Group.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Hook.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/CPAN.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/DB.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/Filesystem.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/Localconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/Requirements.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Install/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/JobQueue.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/JobQueue/Runner.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Keyword.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Migrate.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Milestone.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Object.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Product.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Report.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Search.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Search/Recent.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Search/Saved.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Status.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Template.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Template/Plugin/Bugzilla.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Template/Plugin/Hook.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Token.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Update.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/User.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/User/Setting.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/User/Setting/Lang.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/User/Setting/Skin.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/User/Setting/Timezone.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/UserAgent.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Version.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Bug.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Bugzilla.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Classification.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Group.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Product.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Server/JSONRPC.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Server/XMLRPC.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/User.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/WebService/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Whine.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Whine/Query.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/Bugzilla/Whine/Schedule.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/checksetup.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/collectstats.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/bz_webservice_demo.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/bzdbcopy.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/console.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/extension-convert.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/merge-users.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/contrib/recode.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/email_in.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/extensions/create.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/importxml.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/install-module.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/jobqueue.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/migrate.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/api/sanitycheck.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/attachments.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/bug_page.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/bug_status_workflow.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/bugreports.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/classifications.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/cmdline-bugmail.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/cmdline.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/components.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/conventions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/credits.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/cust-change-permissions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/cust-skins.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/cust-templates.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/custom-fields.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/customization.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/disclaimer.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/edit-values.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/extensions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/extraconfig.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/flags-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/flags.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/general-advice.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-0.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-1.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-10.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-2.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-3.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-4.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-5.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-6.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-7.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-8.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-9.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl-howto.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/gfdl.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/groups.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/hintsandtips.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/install-perlmodules-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/installation.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/installing-bugzilla.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/integration.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/keywords.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/lifecycle.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/milestones.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/modules-manual-download.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/modules-manual-instructions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/modules-manual-optional.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/multiple-bz-dbs.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/myaccount.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/newversions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/nonroot.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/os-specific.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/parameters.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/paranoid-security.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/patches.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/products.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/query.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/quips.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/reporting.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/sanitycheck.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/security-bugzilla.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/security-os.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/security-webserver.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/security.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/timetracking.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-dbdSponge.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-index.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-passwd-encryption.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-perlmodule.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-relogin-everyone.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/trbl-testserver.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/upgrade.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/useradmin.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/userpreferences.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/using-intro.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/using.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/versions.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/voting.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/whining.html
-%%PORTDOCS%%%%DOCSDIR%%/en/images/bzLifecycle.png
-%%PORTDOCS%%%%DOCSDIR%%/en/images/bzLifecycle.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/images/callouts/1.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/callouts/2.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/callouts/3.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/tip.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/en/pdf/Bugzilla-Guide.pdf
-%%PORTDOCS%%%%DOCSDIR%%/en/rel_notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/txt/Bugzilla-Guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/Bugzilla-Guide.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/about.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/administration.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/bugzilla.ent
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/conventions.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/customization.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/gfdl.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/glossary.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/index.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/installation.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/modules.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/patches.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/security.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/troubleshooting.xml
-%%PORTDOCS%%%%DOCSDIR%%/en/xml/using.xml
-%%PORTDOCS%%%%DOCSDIR%%/lib/Pod/Simple/HTML/Bugzilla.pm
-%%PORTDOCS%%%%DOCSDIR%%/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
-%%PORTDOCS%%%%DOCSDIR%%/makedocs.pl
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/xsl/bugzilla-docs.xsl
-%%PORTDOCS%%%%DOCSDIR%%/xsl/chunks.xsl
-%%PORTDOCS%%%%DOCSDIR%%/xsl/nochunks.xsl
-%%PORTDOCS%%%%DOCSDIR%%/xsl/pdf.xsl
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/Bugzilla.pm
 %%WWWDIR%%/Bugzilla/Attachment.pm
 %%WWWDIR%%/Bugzilla/Attachment/PatchReader.pm
 %%WWWDIR%%/Bugzilla/Auth.pm
 %%WWWDIR%%/Bugzilla/Auth/Login.pm
+%%WWWDIR%%/Bugzilla/Auth/Login/APIKey.pm
 %%WWWDIR%%/Bugzilla/Auth/Login/CGI.pm
 %%WWWDIR%%/Bugzilla/Auth/Login/Cookie.pm
 %%WWWDIR%%/Bugzilla/Auth/Login/Env.pm
@@ -238,10 +28,12 @@
 %%WWWDIR%%/Bugzilla/BugUrl/MantisBT.pm
 %%WWWDIR%%/Bugzilla/BugUrl/SourceForge.pm
 %%WWWDIR%%/Bugzilla/BugUrl/Trac.pm
+%%WWWDIR%%/Bugzilla/BugUserLastVisit.pm
 %%WWWDIR%%/Bugzilla/CGI.pm
 %%WWWDIR%%/Bugzilla/Chart.pm
 %%WWWDIR%%/Bugzilla/Classification.pm
 %%WWWDIR%%/Bugzilla/Comment.pm
+%%WWWDIR%%/Bugzilla/Comment/TagWeights.pm
 %%WWWDIR%%/Bugzilla/Component.pm
 %%WWWDIR%%/Bugzilla/Config.pm
 %%WWWDIR%%/Bugzilla/Config/Admin.pm
@@ -257,7 +49,7 @@
 %%WWWDIR%%/Bugzilla/Config/GroupSecurity.pm
 %%WWWDIR%%/Bugzilla/Config/LDAP.pm
 %%WWWDIR%%/Bugzilla/Config/MTA.pm
-%%WWWDIR%%/Bugzilla/Config/PatchViewer.pm
+%%WWWDIR%%/Bugzilla/Config/Memcached.pm
 %%WWWDIR%%/Bugzilla/Config/Query.pm
 %%WWWDIR%%/Bugzilla/Config/RADIUS.pm
 %%WWWDIR%%/Bugzilla/Config/ShadowDB.pm
@@ -289,11 +81,13 @@
 %%WWWDIR%%/Bugzilla/Install/Localconfig.pm
 %%WWWDIR%%/Bugzilla/Install/Requirements.pm
 %%WWWDIR%%/Bugzilla/Install/Util.pm
+%%WWWDIR%%/Bugzilla/Job/BugMail.pm
 %%WWWDIR%%/Bugzilla/Job/Mailer.pm
 %%WWWDIR%%/Bugzilla/JobQueue.pm
 %%WWWDIR%%/Bugzilla/JobQueue/Runner.pm
 %%WWWDIR%%/Bugzilla/Keyword.pm
 %%WWWDIR%%/Bugzilla/Mailer.pm
+%%WWWDIR%%/Bugzilla/Memcached.pm
 %%WWWDIR%%/Bugzilla/Migrate.pm
 %%WWWDIR%%/Bugzilla/Migrate/Gnats.pm
 %%WWWDIR%%/Bugzilla/Milestone.pm
@@ -308,7 +102,7 @@
 %%WWWDIR%%/Bugzilla/Search/Quicksearch.pm
 %%WWWDIR%%/Bugzilla/Search/Recent.pm
 %%WWWDIR%%/Bugzilla/Search/Saved.pm
-%%WWWDIR%%/Bugzilla/Send/Sendmail.pm
+%%WWWDIR%%/Bugzilla/Sender/Transport/Sendmail.pm
 %%WWWDIR%%/Bugzilla/Series.pm
 %%WWWDIR%%/Bugzilla/Status.pm
 %%WWWDIR%%/Bugzilla/Template.pm
@@ -318,6 +112,7 @@
 %%WWWDIR%%/Bugzilla/Token.pm
 %%WWWDIR%%/Bugzilla/Update.pm
 %%WWWDIR%%/Bugzilla/User.pm
+%%WWWDIR%%/Bugzilla/User/APIKey.pm
 %%WWWDIR%%/Bugzilla/User/Setting.pm
 %%WWWDIR%%/Bugzilla/User/Setting/Lang.pm
 %%WWWDIR%%/Bugzilla/User/Setting/Skin.pm
@@ -327,14 +122,27 @@
 %%WWWDIR%%/Bugzilla/Version.pm
 %%WWWDIR%%/Bugzilla/WebService.pm
 %%WWWDIR%%/Bugzilla/WebService/Bug.pm
+%%WWWDIR%%/Bugzilla/WebService/BugUserLastVisit.pm
 %%WWWDIR%%/Bugzilla/WebService/Bugzilla.pm
 %%WWWDIR%%/Bugzilla/WebService/Classification.pm
+%%WWWDIR%%/Bugzilla/WebService/Component.pm
 %%WWWDIR%%/Bugzilla/WebService/Constants.pm
+%%WWWDIR%%/Bugzilla/WebService/FlagType.pm
 %%WWWDIR%%/Bugzilla/WebService/Group.pm
 %%WWWDIR%%/Bugzilla/WebService/Product.pm
 %%WWWDIR%%/Bugzilla/WebService/README
 %%WWWDIR%%/Bugzilla/WebService/Server.pm
 %%WWWDIR%%/Bugzilla/WebService/Server/JSONRPC.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Bug.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/BugUserLastVisit.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Classification.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Component.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Group.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/Product.pm
+%%WWWDIR%%/Bugzilla/WebService/Server/REST/Resources/User.pm
 %%WWWDIR%%/Bugzilla/WebService/Server/XMLRPC.pm
 %%WWWDIR%%/Bugzilla/WebService/User.pm
 %%WWWDIR%%/Bugzilla/WebService/Util.pm
@@ -348,6 +156,7 @@
 %%WWWDIR%%/buglist.cgi
 %%WWWDIR%%/chart.cgi
 %%WWWDIR%%/checksetup.pl
+%%WWWDIR%%/clean-bug-user-last-visit.pl
 %%WWWDIR%%/colchange.cgi
 %%WWWDIR%%/collectstats.pl
 %%WWWDIR%%/config.cgi
@@ -370,7 +179,6 @@
 %%CONTRIB%%%%WWWDIR%%/contrib/cmdline/query.conf
 %%CONTRIB%%%%WWWDIR%%/contrib/console.pl
 %%CONTRIB%%%%WWWDIR%%/contrib/convert-workflow.pl
-%%CONTRIB%%%%WWWDIR%%/contrib/cvs-update.pl
 %%CONTRIB%%%%WWWDIR%%/contrib/extension-convert.pl
 %%CONTRIB%%%%WWWDIR%%/contrib/fixperms.pl
 %%CONTRIB%%%%WWWDIR%%/contrib/jb2bz.py
@@ -402,8 +210,13 @@
 %%WWWDIR%%/editworkflow.cgi
 %%WWWDIR%%/email_in.pl
 %%WWWDIR%%/enter_bug.cgi
+%%WWWDIR%%/images/csv.png
 %%WWWDIR%%/images/favicon.ico
+%%WWWDIR%%/images/ical.png
 %%WWWDIR%%/images/padlock.png
+%%WWWDIR%%/images/rss.png
+%%WWWDIR%%/images/rss_small.png
+%%WWWDIR%%/images/xml.png
 %%WWWDIR%%/importxml.pl
 %%WWWDIR%%/index.cgi
 %%WWWDIR%%/install-module.pl
@@ -412,6 +225,7 @@
 %%WWWDIR%%/js/attachment.js
 %%WWWDIR%%/js/bug.js
 %%WWWDIR%%/js/change-columns.js
+%%WWWDIR%%/js/comment-tagging.js
 %%WWWDIR%%/js/comments.js
 %%WWWDIR%%/js/custom-search.js
 %%WWWDIR%%/js/expanding-tree.js
@@ -560,6 +374,7 @@
 %%WWWDIR%%/report.cgi
 %%WWWDIR%%/reports.cgi
 %%WWWDIR%%/request.cgi
+%%WWWDIR%%/rest.cgi
 %%WWWDIR%%/robots.txt
 %%WWWDIR%%/runtests.pl
 %%WWWDIR%%/sanitycheck.cgi
@@ -572,36 +387,23 @@
 %%WWWDIR%%/skins/README
 %%WWWDIR%%/skins/contrib/Dusk/buglist.css
 %%WWWDIR%%/skins/contrib/Dusk/global.css
-%%WWWDIR%%/skins/contrib/Dusk/index.css
-%%WWWDIR%%/skins/standard/IE-fixes.css
 %%WWWDIR%%/skins/standard/admin.css
-%%WWWDIR%%/skins/standard/attachment.css
+%%WWWDIR%%/skins/standard/bug.css
 %%WWWDIR%%/skins/standard/buglist.css
-%%WWWDIR%%/skins/standard/dependency-tree.css
 %%WWWDIR%%/skins/standard/dependency-tree/bug-item.png
 %%WWWDIR%%/skins/standard/dependency-tree/tree-closed.png
 %%WWWDIR%%/skins/standard/dependency-tree/tree-open.png
 %%WWWDIR%%/skins/standard/dependency-tree/tree.png
-%%WWWDIR%%/skins/standard/duplicates.css
-%%WWWDIR%%/skins/standard/editusers.css
-%%WWWDIR%%/skins/standard/enter_bug.css
 %%WWWDIR%%/skins/standard/global.css
 %%WWWDIR%%/skins/standard/global/body-back.gif
 %%WWWDIR%%/skins/standard/global/calendar.png
 %%WWWDIR%%/skins/standard/global/header.png
-%%WWWDIR%%/skins/standard/index.css
 %%WWWDIR%%/skins/standard/index/file-a-bug.png
 %%WWWDIR%%/skins/standard/index/help.png
 %%WWWDIR%%/skins/standard/index/new-account.png
 %%WWWDIR%%/skins/standard/index/search.png
-%%WWWDIR%%/skins/standard/page.css
-%%WWWDIR%%/skins/standard/params.css
-%%WWWDIR%%/skins/standard/reports.css
-%%WWWDIR%%/skins/standard/search_form.css
-%%WWWDIR%%/skins/standard/show_bug.css
-%%WWWDIR%%/skins/standard/show_multiple.css
-%%WWWDIR%%/skins/standard/summarize-time.css
 %%WWWDIR%%/summarize_time.cgi
+%%WWWDIR%%/taskgraph.json
 %%WWWDIR%%/template/en/default/account/auth/login-small.html.tmpl
 %%WWWDIR%%/template/en/default/account/auth/login.html.tmpl
 %%WWWDIR%%/template/en/default/account/cancel-token.txt.tmpl
@@ -615,6 +417,7 @@
 %%WWWDIR%%/template/en/default/account/password/forgotten-password.txt.tmpl
 %%WWWDIR%%/template/en/default/account/password/set-forgotten-password.html.tmpl
 %%WWWDIR%%/template/en/default/account/prefs/account.html.tmpl
+%%WWWDIR%%/template/en/default/account/prefs/apikey.html.tmpl
 %%WWWDIR%%/template/en/default/account/prefs/email.html.tmpl
 %%WWWDIR%%/template/en/default/account/prefs/permissions.html.tmpl
 %%WWWDIR%%/template/en/default/account/prefs/prefs.html.tmpl
@@ -640,6 +443,7 @@
 %%WWWDIR%%/template/en/default/admin/custom_fields/cf-js.js.tmpl
 %%WWWDIR%%/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
 %%WWWDIR%%/template/en/default/admin/custom_fields/create.html.tmpl
+%%WWWDIR%%/template/en/default/admin/custom_fields/edit-common.html.tmpl
 %%WWWDIR%%/template/en/default/admin/custom_fields/edit.html.tmpl
 %%WWWDIR%%/template/en/default/admin/custom_fields/list.html.tmpl
 %%WWWDIR%%/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
@@ -680,8 +484,8 @@
 %%WWWDIR%%/template/en/default/admin/params/groupsecurity.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/index.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/ldap.html.tmpl
+%%WWWDIR%%/template/en/default/admin/params/memcached.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/mta.html.tmpl
-%%WWWDIR%%/template/en/default/admin/params/patchviewer.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/query.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/radius.html.tmpl
 %%WWWDIR%%/template/en/default/admin/params/shadowdb.html.tmpl
@@ -735,6 +539,7 @@
 %%WWWDIR%%/template/en/default/bug/activity/show.html.tmpl
 %%WWWDIR%%/template/en/default/bug/activity/table.html.tmpl
 %%WWWDIR%%/template/en/default/bug/choose.html.tmpl
+%%WWWDIR%%/template/en/default/bug/comment.html.tmpl
 %%WWWDIR%%/template/en/default/bug/comments.html.tmpl
 %%WWWDIR%%/template/en/default/bug/create/comment-guided.txt.tmpl
 %%WWWDIR%%/template/en/default/bug/create/comment.txt.tmpl
@@ -773,13 +578,18 @@
 %%WWWDIR%%/template/en/default/email/bugmail.html.tmpl
 %%WWWDIR%%/template/en/default/email/bugmail.txt.tmpl
 %%WWWDIR%%/template/en/default/email/flagmail.txt.tmpl
+%%WWWDIR%%/template/en/default/email/header-common.txt.tmpl
 %%WWWDIR%%/template/en/default/email/lockout.txt.tmpl
+%%WWWDIR%%/template/en/default/email/new-api-key.txt.tmpl
+%%WWWDIR%%/template/en/default/email/new-user-details.txt.tmpl
 %%WWWDIR%%/template/en/default/email/sanitycheck.txt.tmpl
 %%WWWDIR%%/template/en/default/email/sudo.txt.tmpl
 %%WWWDIR%%/template/en/default/email/whine.txt.tmpl
 %%WWWDIR%%/template/en/default/extensions/config.pm.tmpl
 %%WWWDIR%%/template/en/default/extensions/extension.pm.tmpl
 %%WWWDIR%%/template/en/default/extensions/hook-readme.txt.tmpl
+%%WWWDIR%%/template/en/default/extensions/index-admin.rst.tmpl
+%%WWWDIR%%/template/en/default/extensions/index-user.rst.tmpl
 %%WWWDIR%%/template/en/default/extensions/license.txt.tmpl
 %%WWWDIR%%/template/en/default/extensions/name-readme.txt.tmpl
 %%WWWDIR%%/template/en/default/extensions/util.pm.tmpl
@@ -803,10 +613,10 @@
 %%WWWDIR%%/template/en/default/global/message.html.tmpl
 %%WWWDIR%%/template/en/default/global/message.txt.tmpl
 %%WWWDIR%%/template/en/default/global/messages.html.tmpl
+%%WWWDIR%%/template/en/default/global/product-select.html.tmpl
 %%WWWDIR%%/template/en/default/global/reason-descs.none.tmpl
 %%WWWDIR%%/template/en/default/global/select-menu.html.tmpl
 %%WWWDIR%%/template/en/default/global/setting-descs.none.tmpl
-%%WWWDIR%%/template/en/default/global/site-navigation.html.tmpl
 %%WWWDIR%%/template/en/default/global/tabs.html.tmpl
 %%WWWDIR%%/template/en/default/global/textarea.html.tmpl
 %%WWWDIR%%/template/en/default/global/useful-links.html.tmpl
@@ -835,7 +645,6 @@
 %%WWWDIR%%/template/en/default/pages/linkify.html.tmpl
 %%WWWDIR%%/template/en/default/pages/quicksearch.html.tmpl
 %%WWWDIR%%/template/en/default/pages/release-notes.html.tmpl
-%%WWWDIR%%/template/en/default/pages/release-notes3.html.tmpl
 %%WWWDIR%%/template/en/default/pages/sudo.html.tmpl
 %%WWWDIR%%/template/en/default/reports/chart.csv.tmpl
 %%WWWDIR%%/template/en/default/reports/chart.html.tmpl
@@ -860,7 +669,9 @@
 %%WWWDIR%%/template/en/default/reports/report.html.tmpl
 %%WWWDIR%%/template/en/default/reports/series-common.html.tmpl
 %%WWWDIR%%/template/en/default/reports/series.html.tmpl
+%%WWWDIR%%/template/en/default/request/queue.csv.tmpl
 %%WWWDIR%%/template/en/default/request/queue.html.tmpl
+%%WWWDIR%%/template/en/default/rest.html.tmpl
 %%WWWDIR%%/template/en/default/search/boolean-charts.html.tmpl
 %%WWWDIR%%/template/en/default/search/field.html.tmpl
 %%WWWDIR%%/template/en/default/search/form.html.tmpl