Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

15 files changed, 217 insertions, 153 deletions

diff --git a/extra/apache/.footprint.i686 b/extra/apache/.footprint.i686
index 9fb5e414e..eb6e75c7a 100644
--- a/extra/apache/.footprint.i686
+++ b/extra/apache/.footprint.i686
@@ -30,9 +30,8 @@ drwxr-xr-x	root/root	etc/apache/original/extra/
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-vhosts.conf
 -rw-r--r--	root/root	etc/apache/original/httpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
--rwxr-xr-x	root/root	etc/rc.d/apache
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/apache
+-rwxr-xr--	root/root	etc/rc.d/init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28apache -> ../init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -342,12 +341,14 @@ drwxr-xr-x	root/root	srv/www/manual/developer/
 -rw-r--r--	root/root	srv/www/manual/developer/debugging.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/documenting.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/index.html
 -rw-r--r--	root/root	srv/www/manual/developer/index.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.ja.utf8
@@ -374,6 +375,7 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/faq/index.html
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.en
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/faq/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/filter.html
 -rw-r--r--	root/root	srv/www/manual/filter.html.en
 -rw-r--r--	root/root	srv/www/manual/filter.html.es
@@ -397,11 +399,13 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/handler.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/handler.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/handler.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/handler.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/access.html
 -rw-r--r--	root/root	srv/www/manual/howto/access.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/auth.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.tr.utf8
@@ -411,6 +415,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/cgi.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.pt-br
@@ -418,6 +423,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/howto/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.ja.utf8
@@ -451,6 +457,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.gif
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.png
 -rw-r--r--	root/root	srv/www/manual/images/pixel.gif
+-rw-r--r--	root/root	srv/www/manual/images/rewrite_rule_flow.png
 -rw-r--r--	root/root	srv/www/manual/images/right.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.png
@@ -459,6 +466,8 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.png
 -rw-r--r--	root/root	srv/www/manual/images/sub.gif
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewritecond.png
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewriterule.png
 -rw-r--r--	root/root	srv/www/manual/images/up.gif
 -rw-r--r--	root/root	srv/www/manual/index.html
 -rw-r--r--	root/root	srv/www/manual/index.html.de
@@ -469,6 +478,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/index.html.pt-br
 -rw-r--r--	root/root	srv/www/manual/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/install.html
 -rw-r--r--	root/root	srv/www/manual/install.html.de
 -rw-r--r--	root/root	srv/www/manual/install.html.en
@@ -498,6 +508,7 @@ drwxr-xr-x	root/root	srv/www/manual/misc/
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/misc/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/perf-tuning.html
@@ -523,6 +534,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/core.html
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/core.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.tr.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/directive-dict.html
@@ -538,6 +550,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/directives.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/event.html
 -rw-r--r--	root/root	srv/www/manual/mod/event.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/index.html
@@ -547,6 +560,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.en
@@ -563,13 +577,16 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_asis.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.ja.utf8
@@ -586,10 +603,12 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_default.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -615,6 +634,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_user.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.tr.utf8
@@ -743,6 +763,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_nw_ssl.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html.en
@@ -757,12 +778,14 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ftp.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.ja.utf8
@@ -788,6 +811,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_substitute.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.tr.utf8
@@ -840,6 +864,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.en
@@ -853,6 +878,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mpm.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mpm.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.de
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.en
@@ -875,6 +901,7 @@ drwxr-xr-x	root/root	srv/www/manual/platform/
 -rw-r--r--	root/root	srv/www/manual/platform/index.html
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/platform/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.ko.euc-kr
@@ -936,6 +963,7 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/programs/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.en
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.ko.euc-kr
@@ -953,19 +981,36 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.tr.utf8
 drwxr-xr-x	root/root	srv/www/manual/rewrite/
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html.en
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.fr
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.tr.utf8
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.zh-cn
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html
 -rw-r--r--	root/root	srv/www/manual/sections.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html.fr
@@ -984,11 +1029,13 @@ drwxr-xr-x	root/root	srv/www/manual/rewrite/
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/sitemap.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/ssl/
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/ssl/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_faq.html
@@ -1029,6 +1076,7 @@ drwxr-xr-x	root/root	srv/www/manual/style/xsl/
 drwxr-xr-x	root/root	srv/www/manual/style/xsl/util/
 -rw-r--r--	root/root	srv/www/manual/suexec.html
 -rw-r--r--	root/root	srv/www/manual/suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.tr.utf8
@@ -1067,6 +1115,7 @@ drwxr-xr-x	root/root	srv/www/manual/vhosts/
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/vhosts/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.en
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.fr
diff --git a/extra/apache/.footprint.x86_64 b/extra/apache/.footprint.x86_64
index 9fb5e414e..eb6e75c7a 100644
--- a/extra/apache/.footprint.x86_64
+++ b/extra/apache/.footprint.x86_64
@@ -30,9 +30,8 @@ drwxr-xr-x	root/root	etc/apache/original/extra/
 -rw-r--r--	root/root	etc/apache/original/extra/httpd-vhosts.conf
 -rw-r--r--	root/root	etc/apache/original/httpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
--rwxr-xr-x	root/root	etc/rc.d/apache
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/apache
+-rwxr-xr--	root/root	etc/rc.d/init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K28apache -> ../init.d/apache
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -342,12 +341,14 @@ drwxr-xr-x	root/root	srv/www/manual/developer/
 -rw-r--r--	root/root	srv/www/manual/developer/debugging.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html
 -rw-r--r--	root/root	srv/www/manual/developer/documenting.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/documenting.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html
 -rw-r--r--	root/root	srv/www/manual/developer/filters.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html
 -rw-r--r--	root/root	srv/www/manual/developer/hooks.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/index.html
 -rw-r--r--	root/root	srv/www/manual/developer/index.html.en
+-rw-r--r--	root/root	srv/www/manual/developer/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.en
 -rw-r--r--	root/root	srv/www/manual/developer/modules.html.ja.utf8
@@ -374,6 +375,7 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/faq/index.html
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.en
 -rw-r--r--	root/root	srv/www/manual/faq/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/faq/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/filter.html
 -rw-r--r--	root/root	srv/www/manual/filter.html.en
 -rw-r--r--	root/root	srv/www/manual/filter.html.es
@@ -397,11 +399,13 @@ drwxr-xr-x	root/root	srv/www/manual/faq/
 -rw-r--r--	root/root	srv/www/manual/handler.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/handler.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/handler.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/handler.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/access.html
 -rw-r--r--	root/root	srv/www/manual/howto/access.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/auth.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/auth.html.tr.utf8
@@ -411,6 +415,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/cgi.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.en
+-rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.fr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/howto/htaccess.html.pt-br
@@ -418,6 +423,7 @@ drwxr-xr-x	root/root	srv/www/manual/howto/
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/howto/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/howto/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.en
 -rw-r--r--	root/root	srv/www/manual/howto/public_html.html.ja.utf8
@@ -451,6 +457,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.gif
 -rw-r--r--	root/root	srv/www/manual/images/mod_rewrite_fig2.png
 -rw-r--r--	root/root	srv/www/manual/images/pixel.gif
+-rw-r--r--	root/root	srv/www/manual/images/rewrite_rule_flow.png
 -rw-r--r--	root/root	srv/www/manual/images/right.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig1.png
@@ -459,6 +466,8 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.gif
 -rw-r--r--	root/root	srv/www/manual/images/ssl_intro_fig3.png
 -rw-r--r--	root/root	srv/www/manual/images/sub.gif
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewritecond.png
+-rw-r--r--	root/root	srv/www/manual/images/syntax_rewriterule.png
 -rw-r--r--	root/root	srv/www/manual/images/up.gif
 -rw-r--r--	root/root	srv/www/manual/index.html
 -rw-r--r--	root/root	srv/www/manual/index.html.de
@@ -469,6 +478,7 @@ drwxr-xr-x	root/root	srv/www/manual/images/
 -rw-r--r--	root/root	srv/www/manual/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/index.html.pt-br
 -rw-r--r--	root/root	srv/www/manual/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/install.html
 -rw-r--r--	root/root	srv/www/manual/install.html.de
 -rw-r--r--	root/root	srv/www/manual/install.html.en
@@ -498,6 +508,7 @@ drwxr-xr-x	root/root	srv/www/manual/misc/
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/misc/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/misc/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html
 -rw-r--r--	root/root	srv/www/manual/misc/password_encryptions.html.en
 -rw-r--r--	root/root	srv/www/manual/misc/perf-tuning.html
@@ -523,6 +534,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/core.html
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/core.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/core.html.tr.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/directive-dict.html
@@ -538,6 +550,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/directives.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/directives.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/event.html
 -rw-r--r--	root/root	srv/www/manual/mod/event.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/index.html
@@ -547,6 +560,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/mod_actions.html.en
@@ -563,13 +577,16 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_asis.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_basic.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_auth_digest.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_alias.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_anon.html.ja.utf8
@@ -586,10 +603,12 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_default.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authn_file.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_authnz_ldap.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -615,6 +634,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_authz_user.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_autoindex.html.tr.utf8
@@ -743,6 +763,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_nw_ssl.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ajp.html.en
@@ -757,12 +778,14 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_ftp.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_http.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_proxy_scgi.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_reqtimeout.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_rewrite.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_setenvif.html.ja.utf8
@@ -788,6 +811,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/mod_substitute.html.en
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/mod_suexec.html.tr.utf8
@@ -840,6 +864,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mod/quickreference.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.de
 -rw-r--r--	root/root	srv/www/manual/mod/worker.html.en
@@ -853,6 +878,7 @@ drwxr-xr-x	root/root	srv/www/manual/mod/
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/mpm.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/mpm.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/mpm.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.de
 -rw-r--r--	root/root	srv/www/manual/new_features_2_0.html.en
@@ -875,6 +901,7 @@ drwxr-xr-x	root/root	srv/www/manual/platform/
 -rw-r--r--	root/root	srv/www/manual/platform/index.html
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/index.html.ko.euc-kr
+-rw-r--r--	root/root	srv/www/manual/platform/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.en
 -rw-r--r--	root/root	srv/www/manual/platform/netware.html.ko.euc-kr
@@ -936,6 +963,7 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/programs/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/programs/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.en
 -rw-r--r--	root/root	srv/www/manual/programs/logresolve.html.ko.euc-kr
@@ -953,19 +981,36 @@ drwxr-xr-x	root/root	srv/www/manual/programs/
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/programs/suexec.html.tr.utf8
 drwxr-xr-x	root/root	srv/www/manual/rewrite/
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/access.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/advanced.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/avoid.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/flags.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/htaccess.html.en
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.fr
 -rw-r--r--	root/root	srv/www/manual/rewrite/index.html.tr.utf8
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_flags.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_guide_advanced.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_intro.html.en
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html
--rw-r--r--	root/root	srv/www/manual/rewrite/rewrite_tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/index.html.zh-cn
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/intro.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/proxy.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/remapping.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/rewritemap.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.en
+-rw-r--r--	root/root	srv/www/manual/rewrite/tech.html.fr
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html
+-rw-r--r--	root/root	srv/www/manual/rewrite/vhosts.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html
 -rw-r--r--	root/root	srv/www/manual/sections.html.en
 -rw-r--r--	root/root	srv/www/manual/sections.html.fr
@@ -984,11 +1029,13 @@ drwxr-xr-x	root/root	srv/www/manual/rewrite/
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/sitemap.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/sitemap.html.zh-cn
 drwxr-xr-x	root/root	srv/www/manual/ssl/
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/ssl/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/ssl/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_compat.html.en
 -rw-r--r--	root/root	srv/www/manual/ssl/ssl_faq.html
@@ -1029,6 +1076,7 @@ drwxr-xr-x	root/root	srv/www/manual/style/xsl/
 drwxr-xr-x	root/root	srv/www/manual/style/xsl/util/
 -rw-r--r--	root/root	srv/www/manual/suexec.html
 -rw-r--r--	root/root	srv/www/manual/suexec.html.en
+-rw-r--r--	root/root	srv/www/manual/suexec.html.fr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ja.utf8
 -rw-r--r--	root/root	srv/www/manual/suexec.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/suexec.html.tr.utf8
@@ -1067,6 +1115,7 @@ drwxr-xr-x	root/root	srv/www/manual/vhosts/
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ko.euc-kr
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.ru.koi8-r
 -rw-r--r--	root/root	srv/www/manual/vhosts/index.html.tr.utf8
+-rw-r--r--	root/root	srv/www/manual/vhosts/index.html.zh-cn
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.en
 -rw-r--r--	root/root	srv/www/manual/vhosts/ip-based.html.fr
diff --git a/extra/apache/.md5sum.i686 b/extra/apache/.md5sum.i686
index 2e2a7dbea..fe5d88154 100644
--- a/extra/apache/.md5sum.i686
+++ b/extra/apache/.md5sum.i686
@@ -1,3 +1,3 @@
-cf00908a82321dabc331c7efdc194a8b  apache
-e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.15-config-1.patch
-16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2
+05dc97589bc4efaa1e83783db924e14e  httpd-2.2.17-bdb51-1.patch
+e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.17-config-1.patch
+1ac251431c8c4285f6b085c1d156bb56  httpd-2.2.20.tar.bz2
diff --git a/extra/apache/.md5sum.x86_64 b/extra/apache/.md5sum.x86_64
index 2e2a7dbea..fe5d88154 100644
--- a/extra/apache/.md5sum.x86_64
+++ b/extra/apache/.md5sum.x86_64
@@ -1,3 +1,3 @@
-cf00908a82321dabc331c7efdc194a8b  apache
-e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.15-config-1.patch
-16eadc59ea6b38af33874d300973202e  httpd-2.2.17.tar.bz2
+05dc97589bc4efaa1e83783db924e14e  httpd-2.2.17-bdb51-1.patch
+e02a3ec5925eb9e111400b9aa229f822  httpd-2.2.17-config-1.patch
+1ac251431c8c4285f6b085c1d156bb56  httpd-2.2.20.tar.bz2
diff --git a/extra/apache/Pkgfile b/extra/apache/Pkgfile
index 7036ce61d..a480203b9 100644
--- a/extra/apache/Pkgfile
+++ b/extra/apache/Pkgfile
@@ -6,24 +6,23 @@
 # Run on: apr,sqlite3,libpostgresql
 
 name=apache
-version=2.2.17
+version=2.2.20
 release=1
 source=(http://archive.apache.org/dist/httpd/httpd-$version.tar.bz2 \
-	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.15-config-1.patch
-        apache )
+	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.17-bdb51-1.patch \
+	http://www.linuxfromscratch.org/patches/blfs/svn/httpd-2.2.17-config-1.patch )
 build(){
 	source /etc/blfs-bootscripts
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
    	cd httpd-$version
-	patch -Np1 -i ../httpd-2.2.15-config-1.patch
+	patch -Np1 -i ../httpd-2.2.17-config-1.patch
 	./configure --enable-layout=FHS --enable-mods-shared=all 
 	make 
 	make DESTDIR=$PKG install
 
 	mkdir -p $PKG/etc/ssl/{keys,certs}
 	# Installation
-	install -D -m 755 $SRC/apache $PKG/etc/rc.d/apache
 	chown -R root:root $PKG
 	sed -i "s/^LoadModule isapi_module/# &/" \
 	$PKG/etc/apache/httpd.conf
@@ -35,6 +34,5 @@ build(){
 	# Installation of the script
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-apache
-	install -m755 ../apache $PKG/etc/rc.d/init.d/
 }
   
diff --git a/extra/apache/apache b/extra/apache/apache
deleted file mode 100644
index 264343c1f..000000000
--- a/extra/apache/apache
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/apache
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2007/11/10 15:52:03 $
-
-. /etc/sysconfig/rc
-. $rc_functions
-newgroup=apache
-newuser=apache
-newid=25
-getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
--u $newid -d /dev/null -s /bin/false -c "Apache Server" $newuser
-
-case "$1" in
-	start)
-		boot_mesg "Starting Apache daemon..."
-		/usr/sbin/apachectl -k start
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Stopping Apache daemon..."
-		/usr/sbin/apachectl -k stop
-		evaluate_retval
-		;;
-
-	restart)
-		boot_mesg "Restarting Apache daemon..."
-		/usr/sbin/apachectl -k restart
-		evaluate_retval
-		;;
-
-	status)
-		statusproc /usr/sbin/httpd
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/apache
diff --git a/extra/firefox/.footprint.i686 b/extra/firefox/.footprint.i686
index 7e0582082..60394a30d 100644
--- a/extra/firefox/.footprint.i686
+++ b/extra/firefox/.footprint.i686
@@ -24,6 +24,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/branding/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about-logo.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about-wordmark.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/aboutDialog.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon128.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon16.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon48.png
@@ -106,6 +107,10 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/places/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/places/tree.xml
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/places/treeView.js
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.css
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.xml
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced-scripts.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced.js
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced.xul
@@ -153,6 +158,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/safebrowsing
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitize.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitizeDialog.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitizeDialog.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/scratchpad.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/scratchpad.xul
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/search/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/search/engineManager.js
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/search/engineManager.xul
@@ -241,6 +248,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/places/
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/Options-sync.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/Options.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/applications.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/mail.png
@@ -259,6 +267,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/prefere
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-bg.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-desktopIcon.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-mobileIcon.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-notification-24.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncCommon.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncQuota.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncSetup.css
@@ -276,7 +285,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/stack-expander.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.png
--rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/urlbar-favicon-glow.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/urlbar-arrow.png
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/communicator/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/communicator/communicator.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US.manifest
@@ -323,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/places.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/places.properties
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/aboutPermissions.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/aboutPermissions.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/advanced-scripts.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/advanced.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/applicationManager.dtd
@@ -349,12 +360,12 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/report-phishing.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sanitize.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/scratchpad.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/scratchpad.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/search.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/searchbar.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/setDesktopBackground.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/shellservice.properties
-drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sidebar/
--rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sidebar/sidebar.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncBrand.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncGenericChange.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncKey.dtd
@@ -1099,6 +1110,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginMissing.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginBlocked.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png
@@ -1138,6 +1150,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/PlacesCategoriesStarter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/PlacesProtocolHandler.js
 -rw-r--r--	root/root	usr/lib/firefox/components/SyncComponents.manifest
+-rw-r--r--	root/root	usr/lib/firefox/components/TelemetryPing.js
+-rw-r--r--	root/root	usr/lib/firefox/components/TelemetryPing.manifest
 -rw-r--r--	root/root	usr/lib/firefox/components/Weave.js
 -rw-r--r--	root/root	usr/lib/firefox/components/WebContentConverter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/accessibility.xpt
@@ -1194,7 +1208,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_svg.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_threads.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_traversal.xpt
--rw-r--r--	root/root	usr/lib/firefox/components/dom_views.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xbl.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xpath.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xul.xpt
@@ -1252,6 +1265,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_socket.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_strconv.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_viewsource.xpt
+-rw-r--r--	root/root	usr/lib/firefox/components/necko_websocket.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_wyciwyg.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/nsBadCertHandler.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsBadCertHandler.manifest
@@ -1281,7 +1295,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginInfo.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginManagerPrompter.js
--rw-r--r--	root/root	usr/lib/firefox/components/nsMicrosummaryService.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesAutoComplete.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesAutoComplete.manifest
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesExpiration.js
@@ -1313,6 +1326,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateServiceStub.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateTimerManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateTimerManager.manifest
+-rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierHashCompleter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierLib.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierListManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsWebHandlerApp.js
@@ -1334,7 +1348,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/satchel.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/saxparser.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/services-crypto-component.xpt
--rw-r--r--	root/root	usr/lib/firefox/components/services-crypto.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/sessionstore.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/shellservice.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/shistory.xpt
@@ -1409,6 +1422,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198
 -rwxr-xr-x	root/root	usr/lib/firefox/firefox
 -rwxr-xr-x	root/root	usr/lib/firefox/firefox-bin
 -rw-r--r--	root/root	usr/lib/firefox/greprefs.js
+drwxr-xr-x	root/root	usr/lib/firefox/hyphenation/
+-rw-r--r--	root/root	usr/lib/firefox/hyphenation/hyph_en_US.dic
 drwxr-xr-x	root/root	usr/lib/firefox/icons/
 -rw-r--r--	root/root	usr/lib/firefox/icons/document.png
 -rw-r--r--	root/root	usr/lib/firefox/icons/mozicon128.png
@@ -1423,6 +1438,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/modules/
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonManager.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonRepository.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonUpdateChecker.jsm
+-rw-r--r--	root/root	usr/lib/firefox/modules/AutocompletePopup.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CSPUtils.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CertUtils.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CommonDialog.jsm
@@ -1555,14 +1571,11 @@ drwxr-xr-x	root/root	usr/lib/firefox/searchplugins/
 -rw-r--r--	root/root	usr/lib/firefox/updater.ini
 -rwxr-xr-x	root/root	usr/lib/firefox/xpcshell
 -rwxr-xr-x	root/root	usr/lib/firefox/xpidl
--rwxr-xr-x	root/root	usr/lib/firefox/xpt_dump
--rwxr-xr-x	root/root	usr/lib/firefox/xpt_link
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/firefox.desktop
 drwxr-xr-x	root/root	usr/share/idl/
 drwxr-xr-x	root/root	usr/share/idl/firefox/
--rw-r--r--	root/root	usr/share/idl/firefox/IWeaveCrypto.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/XPCIDispatch.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/amIInstallTrigger.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/amIWebInstallListener.idl
@@ -1589,6 +1602,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/inISearchObserver.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/inISearchProcess.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/jsdIDebuggerService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/mozIAsyncFavicons.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIAsyncHistory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIJSSubScriptLoader.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIPersonalDictionary.idl
@@ -1628,7 +1642,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIASN1Sequence.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIASN1Tree.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAboutModule.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIAccelerometer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessNode.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessible.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessibleApplication.idl
@@ -1792,12 +1805,10 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDNSRecord.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDNSService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Attr.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3DocumentEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3EventTarget.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Node.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Text.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3TypeInfo.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAbstractView.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAnimationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAttr.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMBarProp.idl
@@ -1833,24 +1844,23 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCounter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCrypto.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCryptoDialogs.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMConfiguration.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCustomEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMImplementation.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMSettableTokenList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMStringList.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMStringMap.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMTokenList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDataContainerEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDataTransfer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDesktopNotification.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDeviceMotionEvent.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDeviceOrientationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocument.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentCSS.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentFragment.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentRange.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentStyle.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentTraversal.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentType.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentView.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentXBL.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDragEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMElement.idl
@@ -1928,6 +1938,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLParagraphElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLParamElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLPreElement.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLProgressElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLQuoteElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLScriptElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLSelectElement.idl
@@ -1944,6 +1955,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLUListElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLUnknownElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLVideoElement.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHashChangeEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHistory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMJSWindow.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMKeyEvent.idl
@@ -1953,6 +1965,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMLocation.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaError.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaList.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaQueryList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMessageEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMimeType.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMimeTypeArray.idl
@@ -1996,7 +2009,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMNotifyAudioAvailableEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMNotifyPaintEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMOfflineResourceList.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMOrientationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPageTransitionEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPaintRequest.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPaintRequestList.idl
@@ -2114,12 +2126,12 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTimeEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTimeRanges.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMToString.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTouchEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTransitionEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTreeWalker.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMUIEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMUserDataHandler.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMValidityState.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMViewCSS.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWebGLRenderingContext.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWindow.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWindow2.idl
@@ -2157,6 +2169,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDataSignatureVerifier.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDebug.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDebug2.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDeviceMotion.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDialogCreator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDialogParamBlock.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDirIndex.idl
@@ -2207,6 +2220,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEnvironment.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIErrorService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEventListenerService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIEventSource.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEventTarget.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIExceptionService.idl
@@ -2255,6 +2269,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIFrameMessageManager.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGConfService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGIOService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIGSettingsService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGenKeypairInfoDlg.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGeolocationProvider.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGfxInfo.idl
@@ -2356,8 +2371,8 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMemory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMemoryReporter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMenuBoxObject.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIMicrosummaryService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIModule.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIMozWebSocket.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMultiPartChannel.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMultiplexInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMutable.idl
@@ -2395,11 +2410,9 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPipe.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPlacesImportExportService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPlaintextEditor.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIPlugin.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginDocument.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginHost.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInputStream.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInstance.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInstanceOwner.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginStreamInfo.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginStreamListener.idl
@@ -2574,6 +2587,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringBundleOverride.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringEnumerator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringStream.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIStructuredCloneContainer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStyleSheetService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsISupports.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsISupportsArray.idl
@@ -2589,6 +2603,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITabParent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITableEditor.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITaggingService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsITelemetry.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextScroll.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextServicesFilter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextToSubURI.idl
@@ -2596,6 +2611,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadInternal.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadManager.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadPool.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsITimedChannel.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITimelineService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITimer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITokenDialogs.idl
@@ -2638,7 +2654,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharLineInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharOutputStream.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharStreamListener.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharStreamLoader.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicodeNormalizer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUpdateService.idl
@@ -2675,7 +2690,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgress.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgressListener.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgressListener2.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIWebSocket.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIWebSocketProtocol.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebappsSupport.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWindowCreator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWindowCreator2.idl
@@ -2703,7 +2718,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXPConnect.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessor.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessorObsolete.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessorPrivate.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXTFAttributeHandler.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXTFElement.idl
diff --git a/extra/firefox/.footprint.x86_64 b/extra/firefox/.footprint.x86_64
index 7e0582082..60394a30d 100644
--- a/extra/firefox/.footprint.x86_64
+++ b/extra/firefox/.footprint.x86_64
@@ -24,6 +24,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/branding/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about-logo.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about-wordmark.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/about.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/aboutDialog.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon128.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon16.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/branding/icon48.png
@@ -106,6 +107,10 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/places/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/places/tree.xml
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/places/treeView.js
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.css
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.xml
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/aboutPermissions.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced-scripts.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced.js
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/preferences/advanced.xul
@@ -153,6 +158,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/safebrowsing
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitize.xul
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitizeDialog.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/sanitizeDialog.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/scratchpad.js
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/scratchpad.xul
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/content/browser/search/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/search/engineManager.js
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/content/browser/search/engineManager.xul
@@ -241,6 +248,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/places/
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/Options-sync.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/Options.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/aboutPermissions.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/applications.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/preferences/mail.png
@@ -259,6 +267,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/prefere
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-bg.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-desktopIcon.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-mobileIcon.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/sync-notification-24.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncCommon.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncQuota.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/syncSetup.css
@@ -276,7 +285,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/stack-expander.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/tabview/tabview.png
--rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/urlbar-favicon-glow.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/browser/urlbar-arrow.png
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/browser/skin/classic/communicator/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/browser/skin/classic/communicator/communicator.css
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US.manifest
@@ -323,6 +332,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/places.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/places/places.properties
 drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/aboutPermissions.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/aboutPermissions.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/advanced-scripts.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/advanced.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/preferences/applicationManager.dtd
@@ -349,12 +360,12 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/safebrowsing/report-phishing.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sanitize.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/scratchpad.dtd
+-rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/scratchpad.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/search.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/searchbar.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/setDesktopBackground.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/shellservice.properties
-drwxr-xr-x	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sidebar/
--rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/sidebar/sidebar.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncBrand.dtd
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncGenericChange.properties
 -rw-r--r--	root/root	usr/lib/firefox/chrome/en-US/locale/browser/syncKey.dtd
@@ -1099,6 +1110,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
+-rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginMissing.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginBlocked.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png
 -rw-r--r--	root/root	usr/lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png
@@ -1138,6 +1150,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/PlacesCategoriesStarter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/PlacesProtocolHandler.js
 -rw-r--r--	root/root	usr/lib/firefox/components/SyncComponents.manifest
+-rw-r--r--	root/root	usr/lib/firefox/components/TelemetryPing.js
+-rw-r--r--	root/root	usr/lib/firefox/components/TelemetryPing.manifest
 -rw-r--r--	root/root	usr/lib/firefox/components/Weave.js
 -rw-r--r--	root/root	usr/lib/firefox/components/WebContentConverter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/accessibility.xpt
@@ -1194,7 +1208,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_svg.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_threads.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_traversal.xpt
--rw-r--r--	root/root	usr/lib/firefox/components/dom_views.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xbl.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xpath.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/dom_xul.xpt
@@ -1252,6 +1265,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_socket.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_strconv.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_viewsource.xpt
+-rw-r--r--	root/root	usr/lib/firefox/components/necko_websocket.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/necko_wyciwyg.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/nsBadCertHandler.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsBadCertHandler.manifest
@@ -1281,7 +1295,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginInfo.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsLoginManagerPrompter.js
--rw-r--r--	root/root	usr/lib/firefox/components/nsMicrosummaryService.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesAutoComplete.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesAutoComplete.manifest
 -rw-r--r--	root/root	usr/lib/firefox/components/nsPlacesExpiration.js
@@ -1313,6 +1326,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateServiceStub.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateTimerManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUpdateTimerManager.manifest
+-rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierHashCompleter.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierLib.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsUrlClassifierListManager.js
 -rw-r--r--	root/root	usr/lib/firefox/components/nsWebHandlerApp.js
@@ -1334,7 +1348,6 @@ drwxr-xr-x	root/root	usr/lib/firefox/components/
 -rw-r--r--	root/root	usr/lib/firefox/components/satchel.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/saxparser.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/services-crypto-component.xpt
--rw-r--r--	root/root	usr/lib/firefox/components/services-crypto.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/sessionstore.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/shellservice.xpt
 -rw-r--r--	root/root	usr/lib/firefox/components/shistory.xpt
@@ -1409,6 +1422,8 @@ drwxr-xr-x	root/root	usr/lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198
 -rwxr-xr-x	root/root	usr/lib/firefox/firefox
 -rwxr-xr-x	root/root	usr/lib/firefox/firefox-bin
 -rw-r--r--	root/root	usr/lib/firefox/greprefs.js
+drwxr-xr-x	root/root	usr/lib/firefox/hyphenation/
+-rw-r--r--	root/root	usr/lib/firefox/hyphenation/hyph_en_US.dic
 drwxr-xr-x	root/root	usr/lib/firefox/icons/
 -rw-r--r--	root/root	usr/lib/firefox/icons/document.png
 -rw-r--r--	root/root	usr/lib/firefox/icons/mozicon128.png
@@ -1423,6 +1438,7 @@ drwxr-xr-x	root/root	usr/lib/firefox/modules/
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonManager.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonRepository.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/AddonUpdateChecker.jsm
+-rw-r--r--	root/root	usr/lib/firefox/modules/AutocompletePopup.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CSPUtils.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CertUtils.jsm
 -rw-r--r--	root/root	usr/lib/firefox/modules/CommonDialog.jsm
@@ -1555,14 +1571,11 @@ drwxr-xr-x	root/root	usr/lib/firefox/searchplugins/
 -rw-r--r--	root/root	usr/lib/firefox/updater.ini
 -rwxr-xr-x	root/root	usr/lib/firefox/xpcshell
 -rwxr-xr-x	root/root	usr/lib/firefox/xpidl
--rwxr-xr-x	root/root	usr/lib/firefox/xpt_dump
--rwxr-xr-x	root/root	usr/lib/firefox/xpt_link
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/firefox.desktop
 drwxr-xr-x	root/root	usr/share/idl/
 drwxr-xr-x	root/root	usr/share/idl/firefox/
--rw-r--r--	root/root	usr/share/idl/firefox/IWeaveCrypto.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/XPCIDispatch.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/amIInstallTrigger.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/amIWebInstallListener.idl
@@ -1589,6 +1602,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/inISearchObserver.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/inISearchProcess.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/jsdIDebuggerService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/mozIAsyncFavicons.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIAsyncHistory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIJSSubScriptLoader.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/mozIPersonalDictionary.idl
@@ -1628,7 +1642,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIASN1Sequence.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIASN1Tree.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAboutModule.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIAccelerometer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessNode.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessible.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIAccessibleApplication.idl
@@ -1792,12 +1805,10 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDNSRecord.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDNSService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Attr.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3DocumentEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3EventTarget.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Node.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3Text.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOM3TypeInfo.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAbstractView.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAnimationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMAttr.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMBarProp.idl
@@ -1833,24 +1844,23 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCounter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCrypto.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCryptoDialogs.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMConfiguration.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMCustomEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMImplementation.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMSettableTokenList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMStringList.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMStringMap.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDOMTokenList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDataContainerEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDataTransfer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDesktopNotification.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDeviceMotionEvent.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDeviceOrientationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocument.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentCSS.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentFragment.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentRange.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentStyle.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentTraversal.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentType.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentView.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDocumentXBL.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMDragEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMElement.idl
@@ -1928,6 +1938,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLParagraphElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLParamElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLPreElement.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLProgressElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLQuoteElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLScriptElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLSelectElement.idl
@@ -1944,6 +1955,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLUListElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLUnknownElement.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHTMLVideoElement.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHashChangeEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMHistory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMJSWindow.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMKeyEvent.idl
@@ -1953,6 +1965,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMLocation.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaError.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaList.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMediaQueryList.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMessageEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMimeType.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMMimeTypeArray.idl
@@ -1996,7 +2009,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMNotifyAudioAvailableEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMNotifyPaintEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMOfflineResourceList.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMOrientationEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPageTransitionEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPaintRequest.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMPaintRequestList.idl
@@ -2114,12 +2126,12 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTimeEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTimeRanges.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMToString.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTouchEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTransitionEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMTreeWalker.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMUIEvent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMUserDataHandler.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMValidityState.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMViewCSS.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWebGLRenderingContext.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWindow.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDOMWindow2.idl
@@ -2157,6 +2169,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDataSignatureVerifier.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDebug.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDebug2.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIDeviceMotion.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDialogCreator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDialogParamBlock.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIDirIndex.idl
@@ -2207,6 +2220,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEnvironment.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIErrorService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEventListenerService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIEventSource.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIEventTarget.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIExceptionService.idl
@@ -2255,6 +2269,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIFrameMessageManager.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGConfService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGIOService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIGSettingsService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGenKeypairInfoDlg.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGeolocationProvider.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIGfxInfo.idl
@@ -2356,8 +2371,8 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMemory.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMemoryReporter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMenuBoxObject.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIMicrosummaryService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIModule.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIMozWebSocket.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMultiPartChannel.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMultiplexInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIMutable.idl
@@ -2395,11 +2410,9 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPipe.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPlacesImportExportService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPlaintextEditor.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIPlugin.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginDocument.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginHost.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInputStream.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInstance.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginInstanceOwner.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginStreamInfo.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIPluginStreamListener.idl
@@ -2574,6 +2587,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringBundleOverride.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringEnumerator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStringStream.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIStructuredCloneContainer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIStyleSheetService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsISupports.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsISupportsArray.idl
@@ -2589,6 +2603,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITabParent.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITableEditor.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITaggingService.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsITelemetry.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextScroll.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextServicesFilter.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITextToSubURI.idl
@@ -2596,6 +2611,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadInternal.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadManager.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIThreadPool.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsITimedChannel.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITimelineService.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITimer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsITokenDialogs.idl
@@ -2638,7 +2654,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharLineInputStream.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharOutputStream.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharStreamListener.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicharStreamLoader.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUnicodeNormalizer.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIUpdateService.idl
@@ -2675,7 +2690,7 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgress.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgressListener.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebProgressListener2.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIWebSocket.idl
+-rw-r--r--	root/root	usr/share/idl/firefox/nsIWebSocketProtocol.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWebappsSupport.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWindowCreator.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIWindowCreator2.idl
@@ -2703,7 +2718,6 @@ drwxr-xr-x	root/root	usr/share/idl/firefox/
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXPConnect.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTException.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessor.idl
--rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessorObsolete.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXSLTProcessorPrivate.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXTFAttributeHandler.idl
 -rw-r--r--	root/root	usr/share/idl/firefox/nsIXTFElement.idl
diff --git a/extra/firefox/.md5sum.i686 b/extra/firefox/.md5sum.i686
index e5deb595b..66869de14 100644
--- a/extra/firefox/.md5sum.i686
+++ b/extra/firefox/.md5sum.i686
@@ -1,2 +1,2 @@
-6d1f43e402cec84459a3d7f950bd5192  firefox-5.0.1.source.tar.bz2
+1840185865a1a8975df4a3db59080ddc  firefox-6.0.source.tar.bz2
 68cf02788491c6e846729b2f2913bf79  firefox.desktop
diff --git a/extra/firefox/.md5sum.x86_64 b/extra/firefox/.md5sum.x86_64
index e5deb595b..66869de14 100644
--- a/extra/firefox/.md5sum.x86_64
+++ b/extra/firefox/.md5sum.x86_64
@@ -1,2 +1,2 @@
-6d1f43e402cec84459a3d7f950bd5192  firefox-5.0.1.source.tar.bz2
+1840185865a1a8975df4a3db59080ddc  firefox-6.0.source.tar.bz2
 68cf02788491c6e846729b2f2913bf79  firefox.desktop
diff --git a/extra/firefox/Pkgfile b/extra/firefox/Pkgfile
index 4fd7c1738..573a08006 100644
--- a/extra/firefox/Pkgfile
+++ b/extra/firefox/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: desktop-file-utils,alsa-lib,mesa3d,gtk,libidl,pango,curl,nss,libnotify,dbus-glib
 
 name=firefox
-version=5.0.1
+version=6.0
 
 release=1
 
diff --git a/extra/firefox/README b/extra/firefox/README
deleted file mode 100644
index 7cf6cb16e..000000000
--- a/extra/firefox/README
+++ /dev/null
@@ -1,12 +0,0 @@
-AVERTISSEMENT:
-**************
-
-le paquet firefox est constitué des locales francophones dont la version
-(donc le nom) ne change pas. Seul le lien change. Il faut donc être
-prudent si on le compile depuis les sources et s'assurer que le md5sum
-soit identique. En effet si vous avez une ancienne version de firefox
-compilée, il y a de fortes chance que vous aurez une ancienne version de
-fr.xpi . 
-
-Si vous souhaitez compilez une autre langue, il faut remplacer fr.xpi
-par celle que vous souhaitez.
diff --git a/extra/nss/.md5sum.i686 b/extra/nss/.md5sum.i686
index 756170764..415fe0b37 100644
--- a/extra/nss/.md5sum.i686
+++ b/extra/nss/.md5sum.i686
@@ -1,2 +1,2 @@
-bd32f183ca28440c1744650be31a9ccc  nss-3.12.9.tar.gz
+ca0ca058380be200cf247ea2496b5352  nss-3.12.11.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
diff --git a/extra/nss/.md5sum.x86_64 b/extra/nss/.md5sum.x86_64
index 756170764..415fe0b37 100644
--- a/extra/nss/.md5sum.x86_64
+++ b/extra/nss/.md5sum.x86_64
@@ -1,2 +1,2 @@
-bd32f183ca28440c1744650be31a9ccc  nss-3.12.9.tar.gz
+ca0ca058380be200cf247ea2496b5352  nss-3.12.11.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
diff --git a/extra/nss/Pkgfile b/extra/nss/Pkgfile
index bf6edd3d2..724f4546f 100644
--- a/extra/nss/Pkgfile
+++ b/extra/nss/Pkgfile
@@ -6,9 +6,9 @@
 # Run on: nspr,sqlite3
 
 name=nss
-version=3.12.9
+version=3.12.11
 release=1
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/$name-$version.tar.gz \
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_RTM/src/$name-$version.tar.gz \
         nss-config.in)
 
 build() {