2 files changed, 12 insertions, 5 deletions
diff --git a/Master/doc.html b/Master/doc.html
index 04b87ed4d58..54357449ce8 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -3674,7 +3674,9 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/documents/general/manuals/details.pdf">details.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/epub-mkiv-demo.pdf">epub-mkiv-demo.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/epub-mkiv.pdf">epub-mkiv.pdf</a>,
+<a href="texmf-dist/doc/context/documents/general/manuals/graphics.pdf">graphics.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/hybrid.pdf">hybrid.pdf</a>,
+<a href="texmf-dist/doc/context/documents/general/manuals/interaction.pdf">interaction.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/languages-mkiv.pdf">languages-mkiv.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/libraries-mkiv.pdf">libraries-mkiv.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/lua-mkiv.pdf">lua-mkiv.pdf</a>,
@@ -3688,6 +3690,7 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/documents/general/manuals/mmlexamp.pdf">mmlexamp.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/mmlprime.pdf">mmlprime.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/mreadme.pdf">mreadme.pdf</a>,
+<a href="texmf-dist/doc/context/documents/general/manuals/musings.pdf">musings.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/nodes.pdf">nodes.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/notnow.pdf">notnow.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/onandon.pdf">onandon.pdf</a>,
@@ -3700,6 +3703,7 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/documents/general/manuals/still.pdf">still.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/swiglib-mkiv.pdf">swiglib-mkiv.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/templates-mkiv.pdf">templates-mkiv.pdf</a>,
+<a href="texmf-dist/doc/context/documents/general/manuals/texit.pdf">texit.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/tiptrick.pdf">tiptrick.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/tools-mkiv.pdf">tools-mkiv.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/manuals/units-mkiv.pdf">units-mkiv.pdf</a>,
@@ -3720,6 +3724,8 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/documents/general/qrcs/setup-mapping-ro.pdf">setup-mapping-ro.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/qrcs/setup-nl.pdf">setup-nl.pdf</a>,
 <a href="texmf-dist/doc/context/documents/general/qrcs/setup-ro.pdf">setup-ro.pdf</a>,
+<a href="texmf-dist/doc/context/examples/calculator/calculator.pdf">calculator.pdf</a>,
+<a href="texmf-dist/doc/context/examples/clock/clock.pdf">clock.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/bachotex/2010/bachotex-2010-clash.pdf">bachotex-2010-clash.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/bachotex/2010/bachotex-2010-move.pdf">bachotex-2010-move.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/bachotex/2011/bachotex-2011-cld-and-mkvi.pdf">bachotex-2011-cld-and-mkvi.pdf</a>,
@@ -3734,6 +3740,8 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/presentations/bachotex/2017/bachotex-2017-emoji.pdf">bachotex-2017-emoji.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/bachotex/2017/bachotex-2017-variablefonts-demo.pdf">bachotex-2017-variablefonts-demo.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/bachotex/2017/bachotex-2017-variablefonts.pdf">bachotex-2017-variablefonts.pdf</a>,
+<a href="texmf-dist/doc/context/presentations/bachotex/2018/bachotex-2018-fonteffects.pdf">bachotex-2018-fonteffects.pdf</a>,
+<a href="texmf-dist/doc/context/presentations/bachotex/2018/bachotex-2018-mp.pdf">bachotex-2018-mp.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/context/2011/context-2011-ebook-export.pdf">context-2011-ebook-export.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/context/2011/context-2011-mathml-update.pdf">context-2011-mathml-update.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/context/2011/context-2011-metapost-how-we-adapt.pdf">context-2011-metapost-how-we-adapt.pdf</a>,
@@ -3761,10 +3769,13 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/presentations/examples/present-shaded-001.pdf">present-shaded-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/examples/present-split-001.pdf">present-split-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/examples/present-stepper-001.pdf">present-stepper-001.pdf</a>,
+<a href="texmf-dist/doc/context/presentations/examples/present-steps-001.pdf">present-steps-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/examples/present-tiles-001.pdf">present-tiles-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/examples/present-weird-001.pdf">present-weird-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/examples/present-windows-001.pdf">present-windows-001.pdf</a>,
 <a href="texmf-dist/doc/context/presentations/present-readme.pdf">present-readme.pdf</a>,
+<a href="texmf-dist/doc/context/presentations/tug/2001/tug-2001-ideas.pdf">tug-2001-ideas.pdf</a>,
+<a href="texmf-dist/doc/context/presentations/tug/2007/tug-2007-fonts.pdf">tug-2007-fonts.pdf</a>,
 <a href="texmf-dist/doc/context/scripts/mkii/ctxtools.html">ctxtools.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkii/imgtopdf.html">imgtopdf.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkii/mptopdf.html">mptopdf.html</a>,
@@ -3796,10 +3807,8 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-grep.html">mtx-grep.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-interface.html">mtx-interface.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-metapost.html">mtx-metapost.html</a>,
-<a href="texmf-dist/doc/context/scripts/mkiv/mtx-metatex.html">mtx-metatex.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-modules.html">mtx-modules.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-package.html">mtx-package.html</a>,
-<a href="texmf-dist/doc/context/scripts/mkiv/mtx-patterns.html">mtx-patterns.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-pdf.html">mtx-pdf.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-plain.html">mtx-plain.html</a>,
 <a href="texmf-dist/doc/context/scripts/mkiv/mtx-profile.html">mtx-profile.html</a>,
@@ -3851,10 +3860,8 @@ The ConTeXt macro package
 <a href="texmf-dist/doc/man/man1/mtx-grep.man1.pdf">mtx-grep.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-interface.man1.pdf">mtx-interface.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-metapost.man1.pdf">mtx-metapost.man1.pdf</a>,
-<a href="texmf-dist/doc/man/man1/mtx-metatex.man1.pdf">mtx-metatex.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-modules.man1.pdf">mtx-modules.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-package.man1.pdf">mtx-package.man1.pdf</a>,
-<a href="texmf-dist/doc/man/man1/mtx-patterns.man1.pdf">mtx-patterns.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-pdf.man1.pdf">mtx-pdf.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-plain.man1.pdf">mtx-plain.man1.pdf</a>,
 <a href="texmf-dist/doc/man/man1/mtx-profile.man1.pdf">mtx-profile.man1.pdf</a>,
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 5a06170c24c..ad6ba134b71 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -13,6 +13,7 @@ $mirrors = {
   'Asia' => {
     'China' => {
       'http://mirror.lzu.edu.cn/CTAN/' => 1,
+      'http://mirrors.cqu.edu.cn/CTAN/' => 1,
       'http://mirrors.geekpie.club/CTAN/' => 1,
       'http://mirrors.huaweicloud.com/repository/toolkit/CTAN/' => 1,
       'http://mirrors.shu.edu.cn/CTAN/' => 1,
@@ -31,7 +32,6 @@ $mirrors = {
       'http://repo.iut.ac.ir/tex-archive/' => 1
     },
     'Japan' => {
-      'ftp://ftp.kddilabs.jp/CTAN/' => 1,
       'ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/' => 1,
       'http://ftp.jaist.ac.jp/pub/CTAN/' => 1,
       'http://ftp.yz.yamagata-u.ac.jp/pub/CTAN/' => 1