summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-06-11 00:19:40 +0000
committerKarl Berry <karl@freefriends.org>2009-06-11 00:19:40 +0000
commitb53103d1ed32baf22565a9f6b9f2f1f415ed2288 (patch)
tree6cabe56d945e33edcb4fd1bc34bd3bc3815a8156 /Master
parenta9f41a29daefaf04b27040f25cd0f63f41d290a6 (diff)
faq 3.19 (10jun09)
git-svn-id: svn://tug.org/texlive/trunk@13704 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/CHANGES-3.1967
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/ChangeLog773
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/archive.list4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex137
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/faq.sty30
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/faqbody.tex2466
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/filectan.tex12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfloat.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfltorder.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2letterfontcmd.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-AMSpkg.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-BibTeXing.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-CD.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ECfonts.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-HPdrivers.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX2HTML.html13
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX3.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeXtoPlain.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-MP.html3
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-PSpreview.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-RCS.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-SGML2TeX.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXfuture.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXsystems.html83
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-WYGexpts.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-abspos.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acroantics.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acrobat.html27
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-activechars.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-addtoreset.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-algorithms.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-alreadydef.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-altabcr.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ant.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-appendix.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-archives.html9
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-askquestion.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-atsigns.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-backref.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-balance.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibinline.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-biblatex.html24
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibplain.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibstrtl.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibtocorder.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bold-extras.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-boldgreek.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-books.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-braket.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breakbox.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breaklinks.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buffovl.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buildbib.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cancellation.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-captsty.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-casechange.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changebars.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changemargin.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chapbib.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chngmargonfly.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citeURL.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citesort.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cmdstar.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-codelist.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-commercial.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-compactbib.html11
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-complist.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-concrete.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-conditional.html26
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-context.html5
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-crop.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-custbib.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cv.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dec_comma.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-destable.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-divzero.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-doc-wiki.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docotherdir.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docpictex.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dpfloat.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawFeyn.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawing.html45
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dropping.html30
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dtx.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi-bmp.html11
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipdfmgraphics.html25
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips-pdf.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipsgraphics.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-editors.html43
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-empty.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-endingroup.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-enumerate.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-epigraph.html35
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eplain.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eps.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eqnarray.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-erroradvice.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-euro.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extref.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extsizes.html9
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fancyhdr.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fig.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figetc.html28
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figurehere.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filename.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filesused.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfiles.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfont.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fixwidtab.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-floats.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-flushboth.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fmtconv.html28
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontname.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fonts-pln.html22
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontsize.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontunavail.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footintab.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footnpp.html23
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-formbiblabel.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftncapt.html25
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftnsect.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-getbitmap.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-gethelp.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-graphicspath.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-grffilenames.html50
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-howmanypp.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-htmlbib.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphen.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphoff.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-i18nbib.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ifpdf.html30
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-impgraph.html26
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inclplain.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst-tds-zip.html13
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst1cm.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-install-find.html5
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instprinterfont.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instt1font.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-interruptlist.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-isitanum.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-journalpaper.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-keyval.html157
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelfig.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelformat.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labundef.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-landscape.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latex2e.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexpronounce.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexqual.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterclass.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterspace.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linenos.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespace.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespread.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linmacnames.html147
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lit.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-logos.html32
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lollipop.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-longtab.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ltxcmds.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-luatex.html44
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-make.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makebib.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-latex.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-tex.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-manymathalph.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginparside.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginpkgs.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-matchbrak.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathlips.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathml.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathonlyref.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathsize.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathstext.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcfloat.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcite.html33
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-metrics.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mfptutorials.html7
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-minitoc.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-misssymb.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-moren9.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mpprologues.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-msxy.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multbib.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multfoot.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multidoc.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multind.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multirow.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-music.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nameref.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newans.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newfunction.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newlang.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nocitestar.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nofm.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nohyph.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noline.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonfree.html44
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonpdfsp.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonum.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopagebrk.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopageno.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noroom.html43
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-numbersets.html72
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddhyphen.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddpage.html13
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ol-books.html11
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-omegaleph.html29
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-onecolabs.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-osf.html58
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-otherprinters.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-outszwrng.html30
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overfull.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overstrike.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pagebychap.html3
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papergeom.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papersize.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parallel.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parskip.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-patch.html19
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdf-fig-chars.html41
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdfpagelabels.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdftexgraphics.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkfix.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkgdoc.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-plainvltx.html9
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-poster.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-previewers.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-proof.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-protect.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psatempty.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psfchoice.html49
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ragright.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readML.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readtex.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reallyblank.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-recovertex.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ref-doc.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repeatgrf.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repfootnote.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-replstdcls.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rerun.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-resolns.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reuseq.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rulethk.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-run-fn-nos.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-runheadtoobig.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-running-nos.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-scriptfonts.html26
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-seccntfmt.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secindent.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secnumdep.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secthead.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-setURL.html21
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slashbox.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slidecls.html26
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-spell.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-splitfoot.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-srchpdf.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-struttab.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-subsubsub.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-symbols.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabacc.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabcellalign.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds-zip.html15
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texcad.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texinfo.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texorpdf.html45
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textflow.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texthings.html169
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textrace.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-theoremfmt.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-thesis.html14
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-time.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-titlsty.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tmupfl.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-toascii.html16
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocbibind.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocloft.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tradesyms.html3
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tutbitslatex.html13
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-twooptarg.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-type1T1.html18
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-typo-style.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underline.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underscore.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-unkgrfextn.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uploads.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-upquot.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-useMF.html129
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uselmfonts.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepictex.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepsfont.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usesymb.html40
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidcol.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidth.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbfile.html10
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbwithin.html29
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-virtualfonts.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-watermark.html12
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-webpkgs.html22
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-weirdhyphen.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-what-TDS.html8
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatTeX.html6
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatbst.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatmacros.html65
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatpdftex.html11
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whereFAQ.html19
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wholerow.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-widefigs.html4
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wideflt.html30
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wordcount.html19
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-writecls.html20
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xetex.html33
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xspace.html2
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/html/index.html124
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdfbin2833151 -> 3630335 bytes
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdfbin2721186 -> 3539943 bytes
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
323 files changed, 5297 insertions, 2207 deletions
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/CHANGES-3.19 b/Master/texmf-dist/doc/generic/FAQ-en/CHANGES-3.19
new file mode 100644
index 00000000000..1e429919a29
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/CHANGES-3.19
@@ -0,0 +1,67 @@
+Changes in version 3.19
+
+This file lists changes since its most recent release (with version 3.18
+of the FAQ).
+
+New answers:
+ +Label grffilenames: "modern" file names in graphics
+ +Label keyval: using key-value input in macros and package
+ +Label linmacnames: why non-letters in macro names are a bad idea
+ +Label osf: using fonts with "old-style" numbers
+ +Label pdf-fig-chars: disappearing glyphs in pdfTeX figures (from Thanh)
+ +Label texorpdf: error "not allowed in PDFDocEncoded string"
+ +Label texthings: what all these <thing>TeX names are
+ +Label usesymb: using symbols
+ +Label whatmacros:brief outline of macros for "bits and pieces" section
+ +Label wideflt: centre a float wider than text area
+
+Relabelled answers:
+ +Label xfigetc: discusses xfig and asymptote (so far) (was label xfig)
+
+Revised answers:
+ +Label askquestion: what to do if your minimal example needs a figure
+ +Label acroantics:content of old label outszwrng merged in
+ +Label biblatex: updated, now also mentions biber
+ +Label books: mention Lulu version of TeX by Topic
+ +Label chngmargonfly: mention addlines package
+ +Label compactbib:mention the compactbib package (surprise!)
+ +Label drawing: describe pictex, epic and eepic (all previously skated over)
+ +Label editors: mention texworks
+ +Label figurehere:mention \MakeSorted from perpage package
+ +Label fonts-pln: mention varisize
+ +Label footnpp: mention zref package perpage module
+ +Label ftncapt: clarification (I hope)
+ +Label latex2html:mention plastex
+ +Label latexe: reworked for clarity
+ +Label latexpronounce: following on from latexe
+ +Label linenos: numline package now obsolete
+ +Label luatex: tidied up, now I'm clearer about LuaTeX, myself
+ +Label logos: clarified, in light of changes to printing layout we now use
+ +Label man-latex: added pointer to first-latex-doc
+ +Label marginpkgs:changepage package supplants chngpage
+ +Label mcite: mention mciteplus and collref packages
+ +Label nonfree: explain what went wrong and what is happening
+ +Label ifpdf: mention ifxetex and ifluatex
+ +Label noroom: tidied up e-TeX related part of answer
+ +Label ref-doc: mention latexcheat
+ +Label setURL: mention spaces and hyphens options of url.sty
+ +Label texsystems:mention MikTeX-for-Linux
+ +Label wordcount: mention TeXcount
+ +Label writecls: mention Oberdiek's splendid source2e pdf file
+ +Label wygexpts: preview-latex now part of auctex
+
+Deleted answers:
+ +Label outszwrng
+(remember, as of the previous release, links to "old" labels remain
+valid, pointing to an answer that is as near relevant as possible)
+
+Web interface:
+ The initial list of questions no longer gives a URL containing all
+ the answers -- Google was returning that for every match, which
+ didn't help!
+ All links to CTAN files, directory .zips and directories for
+ browsing are now http, and there's no longer any mention of .tar.gz
+ archives of CTAN directories (since they're no longer available)
+
+Robin Fairbairns
+2009-06-10
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog b/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
index 8d4f3747781..3c437317f15 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
+++ b/Master/texmf-dist/doc/generic/FAQ-en/ChangeLog
@@ -1,9 +1,780 @@
+2009-06-10 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * CHANGES-3.19: final released version
+
+ * faqbody.tex: today's date
+
+ * Makefile.CTAN (CHANGES): muck about with installation of new file
+
+ * locations.mk: add HTMLDIREL, define HTMLDIR in relation to it
+
+ * Makefile (release): new target, generate pdfs and html tar file
+
+2009-06-09 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add collref; bring macros/blu, systems/msdos/e4t,
+ support/et, support/jpeg2ps, macros/scripttex from nonfree; junk
+ oztex-german (now obsolete), patches (nonsense)
+
+ * faqbody.tex (section{References from articles}): rearrange q-mcite a
+ bit, and add collref to it
+
+2009-06-09 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * Makefile.CTAN: don't do .ps files any longer
+
+ * Makefile: don't generate .ps files in "all", just pdf
+
+ * sanitize.pl: up to date with -beta changes
+
+ * texfaq2html: up to date with -beta changes
+
+ * texfaq2html-beta: removed debugging statements (already commented)
+
+2009-06-08 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Background}): micro-editorial in q-latexpron...
+
+2009-06-07 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Background}): untangle logos in re. q-latexe,
+ and modify q-latexpronounce accordingly
+ (subsection{Odds and ends}): adjust q-logos to cope with non-bumpy text
+ such as we now use
+
+ * faq.sty: add \latexe
+
+2009-06-03 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): new
+ q-linmacname from add-general
+
+2009-05-29 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): change
+ name of q-macronames to q-linmacnames, yet more editorial
+
+ * faqbody.tex (section{Format conversions}): editorial in q-recovertex
+ (section{The joy of TeX errors}): new q-texorpdf from add-general
+
+2009-05-29 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): a bit
+ of editorial on q-macronames
+
+2009-05-28 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * sanitize-beta.pl (sanitize_line): translate \c{c}
+
+ * faqbody.tex (section{Current TeX-related projects}): revised q-xetex
+ from francois charette
+ (intro): add francois to list of acknowledgements
+ (first line): today's date
+
+2009-05-27 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Graphics}): minor editorial on q-drawing
+
+ * dirctan.tex: add epic
+
+ * faqbody.tex (section{Graphics}): add brief descriptions of pictex,
+ epic and eepic[emu] to q-drawing
+
+2009-05-25 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add first-latex-doc
+
+ * faqbody.tex: today's date
+ (section{Documentation and Help}): mention first-latex-doc in
+ q-man-latex
+
+2009-05-20 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Symbols, etc.}): new q-osf from add-general
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): refer
+ to q-whatmacros rather than spelling out the rules, in q-macronames
+
+2009-05-19 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{TeX Systems}): update link for textures in
+ q-commercial
+ (various places): minor editorial work
+
+ * add-general.tex (subsection{Odds and ends}): editorial on q-osf
+
+ * faqbody.tex (section{Support Packages for TeX}): correct \href for
+ texcount,in q-wordcount
+
+ * dirctan.tex: add asymptote
+
+ * faqbody.tex (section{Support Packages for TeX}): retitle q-xfig as
+ q-figetc, and mention asymptote in it (now it's on ctan!)
+
+2009-05-18 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Graphics}): q-grffilenames from add-general
+
+ * add-general.tex (subsection{Graphics}): tidy q-grffilenames, correct
+ previous text about knuthian constraints on input file name format
+
+ * faqbody.tex (section{Bits and pieces of (La)TeX}): moved q-whatmacros
+ from add-general *already*
+ (subsection{Floating tables, figures, etc.}): q-wideflt from
+ add-general, too!!
+
+ * add-general.tex (subsection{Bits and pieces of (La)TeX}): new "what
+ are macros" (q-whatmacros)
+ (subsection{Tables, figures and diagrams}): new "wide figures and
+ tables" (q-wideflt)
+ (subsection{Odds and ends}): editorial on q-osf
+
+2009-05-16 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * filectan.tex: add miktex-portable
+
+ * faqbody.tex (section{TeX Systems}): mention miktex-portable in
+ q-texsystems
+
+2009-05-14 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faq.sty: tidy include/exclude comments; make introduction into a real
+ env
+
+ * faqbody.tex (intro): simplify \nothtml code in introduction env
+
+2009-05-13 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (intro): v3.19, today
+
+2009-05-12 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): yet more
+ editorial on q-keyval
+
+ * sanitize-beta.pl (sanitize_line): translate \par{} as <br/>
+
+2009-05-10 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): yet
+ another diddle of q-macronames ... just can't quite satisfy myself
+ about this thing
+
+2009-05-08 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): list macro
+ names for class/package options in xkeyval
+
+2009-05-07 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): mention
+ ifxetex and ifluatex in q-ifpdf
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): yet
+ more diddling with q-macronames
+ (subsection{\LaTeX{} macro tools and techniques}): wrap a terrible wide
+ line in an example in q-keyval
+
+ * dirctan.tex: add texcount
+
+ * faqbody.tex (section{Support Packages for TeX}): add ctan links for
+ (la)texcount and description of texcount in q-wordcount
+
+2009-05-03 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): minor
+ update of q-macronames on internal macros and why they work
+
+2009-05-02 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: psfig back on main tree; xypic link as catalogue, now;
+ xfig, xdvi and usergrps now browse-only;
+ remove arc521, arj, atob, binhex, boo, bsplit, checksum, comm, compact,
+ compress, filehdr, ftpd, ftpmail, hexbin, lharc, machdr, macunpack,
+ macutils, mcvert, mirror, mixed, parc, stuffit, tar, tex88, tex8fmts,
+ transname, unarj, unpack, unstuff, uue, uuencode, vtree, vtree-fix,
+ vvcode, xbin (tools/*);
+ remove two borceux subdirs -- diagram, user-guides
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): add
+ final(?) paragraphs of q-keyval
+
+2009-05-01 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): add
+ pgfkeys to q-keyval, and make a start on scrbase
+
+ * dirctan.tex: add biblatex-contrib
+
+ * faqbody.tex (section{Current TeX-related projects}): update
+ q-biblatex and mention biber therein
+
+2009-04-29 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Typesetting specialities}): mention setspaces
+ spaces and hyphens options of url.sty, in q-setURL
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): don't
+ use |$| in q-catcodes, since it confuses auctex's text colouring --
+ \texttt{\$} instead
+ (subsection{"Generic" macros and techniques}): hack at q-macronames
+ after staring at it a bit
+
+ * faqbody.tex (subsection{Tables, figures and diagrams}): give
+ \textasciicircum a null argument in q-wholerow
+
+2009-04-18 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): add
+ xkeyval to q-keyval
+
+ * faqbody.tex (rogue's gallery): add joseph wright and philipp stephani
+ in recognition of help on q-keyval answer
+
+2009-04-17 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): add
+ kvoptions and kvsetkeys to q-keyval
+
+2009-04-14 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): more
+ work on q-keyval
+
+2009-04-14 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{LaTeX macro tools and techniques}): new
+ q-keyval
+
+ * faqbody.tex (subsection{Why does it do that?}): editorial on
+ q-pdf-fig-chars following thanh's comment
+
+2009-04-13 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Common errors}): new q-pdf-fig-chars from
+ add-general
+
+ * add-general.tex (subsection{Graphics}): flesh out q-grffilenames
+
+2009-04-12 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Page layout}): complete sentence that
+ previously ended "but" (no full stop!) in q-changemargin
+
+ * add-general.tex (subsection{Why does it do that?}): further editorial
+ on q-pdf-fig-chars
+
+ * texfaq2html-beta: remove the "complete set" link at bottom of search
+
+ * faqbody.tex (subsection{Adobe Type 1 (PS) fonts}): editorial on cm
+ bright in T1 (now a bit less pompous, i hope)
+
+2009-04-12 (small hours) Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{Why does it do that?}): new
+ q-pdf-fig-chars at thanh's request
+
+2009-04-11 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Current TeX-related projects}): improvements to
+ q-luatex from manuel pegourie-gonnard
+ (intro): add mpg to list of names
+
+2009-04-09 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Documentation and Help}): editorial on
+ q-mfptutorials
+ (section{Acquiring the Software}): editorial on q-nonfree
+
+ * dirctan.tex: add latex-tds
+
+ * faqbody.tex (section{Documentation and Help}): mention heiko's
+ source2e in q-writecls
+
+ * filectan.tex: add latexcheat
+
+ * faqbody.tex (section{Documentation and Help}): add bullet item about
+ figures in q-askquestion
+ (section{Documentation and Help}): editorial on q-man-latex,
+ q-typo-style
+ (section{Documentation and Help}): correct link for pgf/tikz examples
+ in q-tutbitslatex
+ (section{Documentation and Help}): add cheat sheet in q-ref-doc
+
+2009-04-07 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (paragraph{TeX distributions}): editorial work on
+ q-texthings, q-plainvltx, q-amspkg, q-eplain, q-texfuture
+ (section{Documentation and Help}): editorial work on q-wherefaq,
+ q-gethelp, q-maillists*
+
+2009-04-04 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Bits and pieces of (La)TeX}): add link to
+ liang's thesis in q-hyphen
+
+2009-04-02 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{The Background}): add sentence to the end of
+ first para of q-whattex; hack away at q-whatpdftex
+
+ * dirctan.tex: delete preview-latex & fptex, make auctex browse only
+
+ * faqbody.tex (section{Current TeX-related projects}): preview-latex
+ now part of auctex, in q-wygexpts
+
+ * dirctan.tex: remove ghostview, move plnfss up one and remove *
+
+ * faqbody.tex (subsection{Finding the Files}): further iteration,
+ now checked in all 3 formats
+ (section{Hypertext and PDF}): ghostview now an unprogram in q-acrobat
+ (subsection{Adobe Type 1 fonts}): replace ghostview with gv
+
+ * Makefile (web,web-beta): correct shell syntax of yesterday's patch(!)
+
+2009-04-01 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Finding the Files}): further iteration
+
+ * Makefile (update web files): deal with case that file doesn't exist
+
+2009-03-31 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Finding the Files}): get rid of a link-
+ without-visible-anchor in the pdf, generally tidy
+
+2009-03-27 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * sanitize-beta.pl (sanitize_line): stupid error in sub of \wideonly
+
+ * texfaq2file: various errors thrown up by -w ... so remove -w
+
+2009-03-26 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * sanitize-beta.pl (generate_CTAN_ref):
+
+ * texfaq2file: restore list of protocols and hosts (since they're used)
+ ... but don't overdo it ... this lot is a mess and needs tidying
+
+ * label-to-file.pl: the list of file names corresponding to q labels
+
+ * texfaq2file+texfaq2html-beta: use label-to-file.pl in place of list
+ in file
+
+2009-03-25 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * filectan.tex: add compactbib
+
+ * faqbody.tex (subsection{Creating citations}): mention compactbib in
+ q-compactbib (where else? ;-)
+
+2009-03-21 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: rename bibtex-doc-pdf to bibtex-doc (overwriting old
+ one) so that link takes you to something readable
+
+ * faqbody.tex: 3.18b, today
+ (section{Documentation and Help}): make bibtex docs link just
+ bibtex-doc -- see dirctan change
+ (subsection{Creating bibliographies}): ditto in q-custbib
+
+2009-03-20 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * check-ctan-lists: check status of directory .zip files ...
+
+ * dirctan.tex: bunch of anomalies shown up by latest version of scanner
+
+ * sanitize-beta.pl (generate_CTAN_ref): suppress .tar.gz link
+
+ * texfaq2html-beta: sort lists of matching answers numerically, at last
+ (initialisation): close CTANFILES and CTANDIR after reading them...
+
+ * faqbody.tex (section{Current TeX-related projects}): more twiddling
+ with q-xetex
+ (section{Current TeX-related projects}): ditto q-luatex
+ (section{Current TeX-related projects}): ditto q-omegaleph (more
+ downbeat still than previously :-(
+ (section{Symbols, etc.}): add q-usesymb from add-general
+
+2009-03-19 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{Symbols, etc.}): add initial body for
+ q-usesymb
+
+ * faqbody.tex (section{TeX Systems}): mention miktex-for-linux in
+ q-texsystems
+ (section{Current TeX-related projects}): more hacking at q-luatex
+ (section{Current TeX-related projects}): rearrange q-omegaleph,
+ q-xetex, q-luatex, q-ant, q-extex into that order
+
+2009-03-18 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Current TeX-related projects}): more fiddling
+ with latex project answer
+ (section{Current TeX-related projects}): mimetex now superseded by
+ mathtex
+ (section{Current TeX-related projects}): don't compare ant to nts,
+ since we no longer mention nts ;-)
+ (section{Current \TeX{}-related projects}): hack at q-luatex
+
+ * dirctan.tex: add keys3, numparse3
+
+ * faqbody.tex (section{Format conversions}): reword q-fmtconv as
+ suggested by jose carlos santos
+
+ * dirctan.tex: add yagusylo
+
+ * add-general.tex (subsection{Symbols, etc.}): skeleton q-usesymb
+
+2009-03-12 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Footnotes}): try to clarify text of q-ftncapt
+ in re. complaint on c.t.t
+ (section{The joy of TeX errors}): tidy up talk about etex.sty in
+ q-noroom, and mention \reserveinserts
+
+2009-03-10 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add blackboard
+
+ * faqbody.tex (section{Symbols, etc.}): redo q-numbersets, mention
+ blackboard doc
+
+2009-03-09 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add urw-base35, remove plain urw
+
+ * faqbody.tex (section{Symbols, etc.}): redo refs to urw chancery, add
+ link to URW base35, in q-scriptfonts
+
+2009-03-07 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Documentation and Help}): tidy wording about tbt
+ in q-books
+
+2009-03-06 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{TeX Systems}): typo in q-editors
+
+2009-03-04 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{TeX Systems}): slightly less frivolity, in
+ pursuit of better comprehensibility, among the unix editors
+
+ * sanitize-beta.pl (sanitize_line): translate \texshop{}, \texworks{};
+ reorganise the list of "programs" for ease of editing
+
+ * faq.sty: define \texshop, \texworks
+
+ * faqbody.tex (section{TeX Systems}): add a wildcard entry to the list
+ for texworks, in q-editors
+
+2009-02-12 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): micro-
+ typo in q-patch
+
+2009-02-11 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add expl3, xpackages
+
+ * faqbody.tex (section{Current TeX-related projects}): update q-latex3
+
+2009-02-09 Robin Fairbairns <rf10@hehe.cl.cam.ac.uk>
+
+ * faqbody.tex (section{The Background}): add q-texthings, from
+ add-general
+
+2009-01-29 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{The Joy of TeX errors}): add q-texorpdf
+
+2009-01-22 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Documentation and Help}): revise view of the
+ wiki books (which seem to have improved a lot)
+
+2009-01-21 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * texfaq2html-beta: correct period positioning after previous mod
+
+ * faqbody.tex (subsection{Document structure}): chappg documented
+ "normally" now in q-pagebychap
+ (subsection{Document structure}): remove q-outszwrng
+ (subsection{Document structure}): merge (and condense) list from old
+ q-outszwrng into q-acroantics
+
+
+2009-01-19 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * sanitize-beta.pl (sanitize_line): exptl translation for \paragraph
+
+ * faq.sty: redefine \paragraph, too
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): more
+ minor diddling with q-macronames
+ (subsection{The Background}): similar for q-texthings
+
+2009-01-13 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Document structure}): rewrite warning about
+ programming zoonekynd's stuff, in q-secthead
+
+2009-01-06 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add revised tth ;-)
+
+ * filectan.tex: remove tth
+
+2009-01-05 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Typesetting specialities}): tidy up following
+ obsoleting of numline, in q-linenos
+
+ * dirctan.tex: remove rsfs-type1
+
+ * faqbody.tex (section{Symbols, etc.}): rsfs type 1 now part of base
+ distribution in q-scriptfonts
+
+ * filectan.tex: numline now in obsolete
+
+2008-12-31 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{The Background}): editorial on list of
+ enhanced tex engines
+
+2008-12-28 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{"Generic" macros and techniques}): add
+ q-macronames from scott pakin
+ (subsection{The Background}): add q-texthings from scott pakin
+
+2008-12-14 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Graphics}): typo in q-graphicspath spotted by
+ jim diamond
+
+2008-11-27 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Acquiring the Software}): minor tidy of q-tds-zip
+ (section{Installing (La)TeX files}): clear up gross \qref error in
+ q-inst-tds-zip, and tidy up rest of question
+
+2008-11-26 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{TeX Systems}): mention tl network install, tl
+ and miktex package net update
+
+ * filectan.tex: add texlive-unix, texlive-windows
+
+ * faqbody.tex (section{Current TeX-related projects}): a bit of
+ rewording of the presumed prospects for omega 2
+
+2008-11-26 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * faqbody.tex ([throughout]): minor edits for untidinesses spotted by
+ karl berry
+
+2008-11-07 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Bits and pieces of (La)TeX}): minor ed of q-eps
+
+ * add-general.tex (subsection{Graphics}): added q-grffilenames
+ (initial stab ... not even complete in itself)
+
+2008-09-21 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2html: as -beta
+
+ * texfaq2html-beta: add home link at end of answer, after next/prev
+ links if present
+
+2008-09-19 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Tables, figures and diagrams}): correct
+ invocation of topcapt package in q-destable
+
+2008-09-14 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Graphics}): try to refer to dvipdfmx in parallel
+ in q-dvipdfmgraphics
+
+2008-09-13 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Documentation and Help}): add ptr to emory
+ latex2e ref in q-ref-doc
+
+2008-08-31 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * Makefile (dist): new target for manual pegouri\'e-gonnard
+
+2008-08-28 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Documentation and Help}): mention lulu version
+ of tbt, both in q-ol-books and q-books
+
+2008-08-22 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add varisize
+
+ * faqbody.tex (subsection{Macros for using fonts}): mention varisize in
+ q-fonts-pln
+
+2008-08-18 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Typesetting specialities}): deprecate
+ dropping, rewrite descr of lettrine appropriately
+ (subsection{Floating tables, figures, etc.}): mention perpage's
+ \MakeSorted in q-figurehere
+
+2008-08-13 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * add-general.tex (subsection{Generic macros and techniques}): store
+ a copy of donald a's \moverlay in q-ovwtsym, for future reference
+
+2008-08-10 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add addlines
+
+ * faqbody.tex (section{Graphics}): mention eplain as a plain route to
+ to loading graphics in q-impgraph (per kb's suggestion)
+ (subsection{Page layout}): mention addlines in q-chngmargonfly
+
+2008-07-31 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * sanitize-beta.pl (sanitize_line): add \htmlentity to deal with
+ q-dropping guillemet problem
+
+ * faqbody.tex (subsection{Typesetting specialities}): use \htmlentity
+ in \latexhtml (guillemets) in q-dropping
+
+2008-07-30 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Page layout}): remove chngpage from
+ q-marginpkgs
+
+ * filectan.tex: chngpage->changepage; remove pdftex
+
+ * dirctan.tex: add mciteplus, pdftex, record move of aro-bend
+
+ * faqbody.tex (subsection{Creating citations}): mention mciteplus in
+ q-mcite
+
+2008-07-28 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * texfaq2file: ruthless stamping on problems produces a use full output
+
+2008-07-28 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2file: more minor adjustments
+
+ * faqbody.tex (section{Introduction}): now a real (unnumbered) section
+
+2008-07-25 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * faq.sty: include comment introduction
+
+ * faqbody.tex: put environment introduction around introduction
+
+2008-07-22 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * texfaq2html-gamma: minor tidies, use index.html for intro, pro tem
+
+ * faqbody.tex (subsection{Common errors}): editorial in q-verbwithin
+
+2008-07-21 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2html-gamma: correct repeated-code subroutine from 19th
+ (print_intro_para, etc): attempt to sort out coherent "whole path"
+
+2008-07-19 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2html-gamma: some tidying of repeated code, clarification of
+ logic of the code -- lots more still to do...
+
+2008-07-14 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{"Generic" macros and techniques}): discuss
+ \ifpatchable in the bit about etoolbox in q-patch
+ (section{Current TeX-related projects}): brief scribble about how lua
+ operates inside tex, in q-luatex
+
+2008-07-12 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Footnotes}): mention zref/perpage in
+ q-footnpp
+
+2008-07-09 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{MetaFont fonts}): more modernisation of
+ q-usemf (no longer mentions virmf, for example)
+
+2008-07-08 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2html-gamma: major upheavals: beginning to show signs of
+ working in the various parts separately
+
+ * faqbody.tex (subsection{Alternative document classes}): tidy text of
+ both q-thesis and q-journalpaper
+ (subsection{MetaFont fonts}): tidy up q-usemf (though whether to keep
+ it at all remains a matter of debate)
+
+2008-07-07 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * dirctan.tex: add plastex
+
+ * faqbody.tex (section{Format conversions}): add plastex to
+ q-latex2html
+
+2008-07-02 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (subsection{Alternative document classes}): enumerate the
+ complete set of memoir document sizes in q-extsizes
+
+2008-07-02 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
+
+ * Makefile: add target inst-perl-gamma (just texfaq2html-gamma)
+
+ * texfaq2html-gamma: add description meta element to start_html
+
+ * texfaq2html-beta: added a description meta element
+
+ * texfaq2html-gamma: comment out setting of $seclevel hash, since it's
+ not used and therefore logging errors
+
+2008-07-01 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex (section{Current TeX-related projects}): miktex already
+ has xetex ('cos it's got to 2.7 already)
+
+2008-06-23 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * Makefile: delete FAQ-html.tar.gz in "clean"
+
+2008-06-22 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * faqbody.tex: today's date
+ (section{Documentation and Help}): make clear we're talking about latex
+ packages in re. the comp. list in q-symbols
+
+2008-06-21 Robin Fairbairns <rf10@beret.cl.cam.ac.uk>
+
+ * texfaq2file: add inst-miktex* to label_to_file (per mpg);
+ correct generation of links from index.html (per jonathan k)
+
+ * faqbody.tex: 3.18a, today
+ (subsection{Lists}): add mention of expdlist in q-interruptlist
+
+ **FAQ-html.tar.gz patched on archive**
+
2008-06-20 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
* faqbody.tex: today's date, for release
(section{Bits and pieces of (La)TeX}): correct typo in q-dtx
wideversion
+ **RELEASE**
+
2008-06-19 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
* texfaq2html: carried -beta modifications forward
@@ -13,7 +784,7 @@
2008-06-17 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
* faqbody.tex (subsection{"Generic" macros and techniques}): tidy descr
- of patch.doc in q-patch, and mention ted and etooolbox
+ of patch.doc in q-patch, and mention ted and etoolbox
2008-06-13 Robin Fairbairns <rf10@mole.cl.cam.ac.uk>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/archive.list b/Master/texmf-dist/doc/generic/FAQ-en/archive.list
deleted file mode 100644
index 60945ca30d0..00000000000
--- a/Master/texmf-dist/doc/generic/FAQ-en/archive.list
+++ /dev/null
@@ -1,4 +0,0 @@
-ftp.tex.ac.uk tex-archive
-ftp.dante.de tex-archive
-tug2.cs.umb.edu tex-archive
-ftp.cdrom.com pub/tex/ctan
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex b/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
index 927736d1e15..6c8a31592aa 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/dirctan.tex
@@ -1,4 +1,4 @@
-%
+
% protect ourself against being read twice
\csname readCTANdirs\endcsname
\let\readCTANdirs\endinput
@@ -6,23 +6,25 @@
% declarations of significant directories on CTAN
\CTANdirectory{2etools}{macros/latex/required/tools}
\CTANdirectory{4spell}{support/4spell}
-\CTANdirectory{Catalogue}{help/Catalogue}
-\CTANdirectory{CJK}{language/chinese/CJK}
-\CTANdirectory{MimeTeX}{support/mimetex}
+\CTANdirectory*{Catalogue}{help/Catalogue}
+\CTANdirectory*{CJK}{language/chinese/CJK}
+\CTANdirectory*{MathTeX}{support/mathtex}
+\CTANdirectory*{MimeTeX}{support/mimetex}
\CTANdirectory{Tabbing}{macros/latex/contrib/Tabbing}
-\CTANdirectory{TeXtelmExtel}{systems/msdos/emtex-contrib/TeXtelmExtel}
+\CTANdirectory*{TeXtelmExtel}{systems/msdos/emtex-contrib/TeXtelmExtel}
\CTANdirectory{TftI}{info/impatient}
\CTANdirectory{a0poster}{macros/latex/contrib/a0poster}
\CTANdirectory{a2ping}{graphics/a2ping}
\CTANdirectory{a4}{macros/latex/contrib/a4}
-\CTANdirectory{abc2mtex}{support/abc2mtex}
+\CTANdirectory*{abc2mtex}{support/abc2mtex}
\CTANdirectory{abstract}{macros/latex/contrib/abstract}
\CTANdirectory{abstyles}{biblio/bibtex/contrib/abstyles}
\CTANdirectory{accents}{support/accents}
-\CTANdirectory{acorn}{obsolete/systems/acorn}
+\CTANdirectory*{acorn}{obsolete/systems/acorn}
\CTANdirectory{acronym}{macros/latex/contrib/acronym}
-\CTANdirectory{ada}{web/ada}
+\CTANdirectory*{ada}{web/ada/aweb}
\CTANdirectory{addindex}{indexing/addindex}
+\CTANdirectory{addlines}{macros/latex/contrib/addlines}
\CTANdirectory{adjkerns}{fonts/utilities/adjkerns}
\CTANdirectory{ae}{fonts/ae}
\CTANdirectory{aeguill}{macros/latex/contrib/aeguill}
@@ -33,7 +35,7 @@
\CTANdirectory{algorithm2e}{macros/latex/contrib/algorithm2e}
\CTANdirectory{algorithmicx}{macros/latex/contrib/algorithmicx}
\CTANdirectory{algorithms}{macros/latex/contrib/algorithms}
-\CTANdirectory{alpha}{nonfree/systems/mac/support/alpha}
+\CTANdirectory*{alpha}{nonfree/systems/mac/support/alpha}
\CTANdirectory{amiga}{systems/amiga}
\CTANdirectory*{ams-AMStype1}{fonts/amsfonts/ps-type1}
\CTANdirectory{amsfonts-euler}{fonts/amsfonts/sources/euler}
@@ -52,31 +54,28 @@
\CTANdirectory{appl}{web/reduce/rweb/appl}
\CTANdirectory{appendix}{macros/latex/contrib/appendix}
\CTANdirectory{arabtex}{language/arabic/arabtex}
-\CTANdirectory{arc521}{tools/arc521}
-\CTANdirectory{arj}{tools/arj}
\CTANdirectory{armenian}{fonts/armenian}
-\CTANdirectory{aro-bend}{info/aro-bend}
+\CTANdirectory{aro-bend}{info/challenges/aro-bend}
\CTANdirectory{asc2tex}{systems/msdos/asc2tex}
\CTANdirectory{ascii}{fonts/ascii}
\CTANdirectory*{aspell}{support/aspell}
\CTANdirectory{astro}{fonts/astro}
+\CTANdirectory{asymptote}{graphics/asymptote}
\CTANdirectory{atari}{systems/atari}
-\CTANdirectory{atob}{tools/atob}
\CTANdirectory{atops}{support/atops}
-\CTANdirectory{auctex}{support/auctex}
+\CTANdirectory*{auctex}{support/auctex}
\CTANdirectory{autolatex}{support/autolatex}
\CTANdirectory{auto-pst-pdf}{macros/latex/contrib/auto-pst-pdf}
\CTANdirectory{aweb}{web/ada/aweb}
-\CTANdirectory{awk}{web/spiderweb/src/awk}
+\CTANdirectory*{awk}{web/spiderweb/src/awk}
\CTANdirectory{axodraw}{graphics/axodraw}
\CTANdirectory{babel}{macros/latex/required/babel}
\CTANdirectory{babelbib}{biblio/bibtex/contrib/babelbib}
\CTANdirectory{badge}{macros/plain/contrib/badge}
\CTANdirectory{bakoma}{fonts/cm/ps-type1/bakoma}
-\CTANdirectory{bakoma-tex}{systems/win32/bakoma}
+\CTANdirectory*{bakoma-tex}{systems/win32/bakoma}
\CTANdirectory*{bakoma-texfonts}{systems/win32/bakoma/fonts}
-\CTANdirectory{barcodes}{fonts/barcodes}
-\CTANdirectory{bard}{fonts/bard}
+\CTANdirectory*{bard}{fonts/bard}
\CTANdirectory{barr}{macros/generic/diagrams/barr}
\CTANdirectory{bashkirian}{fonts/cyrillic/bashkirian}
\CTANdirectory{basix}{macros/generic/basix}
@@ -93,31 +92,30 @@
\CTANdirectory{bib-fr}{biblio/bibtex/contrib/bib-fr}
\CTANdirectory{bib2dvi}{biblio/bibtex/utils/bib2dvi}
\CTANdirectory{bib2xhtml}{biblio/bibtex/utils/bib2xhtml}
-\CTANdirectory{bibcard}{biblio/bibtex/utils/bibcard}
-\CTANdirectory{bibclean}{biblio/bibtex/utils/bibclean}
-\CTANdirectory{bibdb}{support/bibdb}
+\CTANdirectory*{bibcard}{biblio/bibtex/utils/bibcard}
+\CTANdirectory*{bibclean}{biblio/bibtex/utils/bibclean}
+\CTANdirectory*{bibdb}{support/bibdb}
\CTANdirectory{bibextract}{biblio/bibtex/utils/bibextract}
\CTANdirectory{bibgerm}{biblio/bibtex/contrib/germbib}
\CTANdirectory{bibindex}{biblio/bibtex/utils/bibindex}
\CTANdirectory{biblatex}{macros/latex/exptl/biblatex}
+\CTANdirectory*{biblatex-contrib}{macros/latex/exptl/biblatex-contrib}
\CTANdirectory{biblio}{info/biblio}
\CTANdirectory{biblist}{macros/latex209/contrib/biblist}
\CTANdirectory{bibsort}{biblio/bibtex/utils/bibsort}
-\CTANdirectory{bibtex}{support/lsedit/bibtex}
-\CTANdirectory{bibtex-doc}{biblio/bibtex/distribs/doc}
-\CTANdirectory{bibtex-doc-pdf}{biblio/bibtex/contrib/doc}
+\CTANdirectory{bibtex-doc}{biblio/bibtex/contrib/doc}
\CTANdirectory{bibtool}{biblio/bibtex/utils/bibtool}
\CTANdirectory{bibtools}{biblio/bibtex/utils/bibtools}
\CTANdirectory{bibtopic}{macros/latex/contrib/bibtopic}
\CTANdirectory{bibunits}{macros/latex/contrib/bibunits}
\CTANdirectory{bibview}{biblio/bibtex/utils/bibview}
\CTANdirectory{bigfoot}{macros/latex/contrib/bigfoot}
-\CTANdirectory{binhex}{tools/binhex}
\CTANdirectory{bit2spr}{graphics/bit2spr}
\CTANdirectory{black}{fonts/cm/utilityfonts/black}
+\CTANdirectory{blackboard}{info/symbols/blackboard}
\CTANdirectory{blackletter}{fonts/blackletter}
\CTANdirectory{blocks}{macros/text1/blocks}
-\CTANdirectory{blu}{nonfree/macros/blu}
+\CTANdirectory{blu}{macros/blu}
\CTANdirectory*{bluesky}{fonts/cm/ps-type1/bluesky}
\CTANdirectory{bluesky-maps}{fonts/cm/ps-type1/bluesky-contrib/dvips}
\CTANdirectory{bm2font}{graphics/bm2font}
@@ -125,13 +123,11 @@
\CTANdirectory{boites}{macros/latex/contrib/boites}
\CTANdirectory{bold}{fonts/cm/mf-extra/bold}
\CTANdirectory{bonus}{systems/msdos/emtex-contrib/bonus}
-\CTANdirectory{boo}{tools/boo}
\CTANdirectory{booktabs}{macros/latex/contrib/booktabs}
\CTANdirectory{borceux}{macros/generic/diagrams/borceux}
\CTANdirectory{breakurl}{macros/latex/contrib/breakurl}
\CTANdirectory{bridge}{macros/plain/contrib/bridge}
\CTANdirectory{brief_t}{support/brief_t}
-\CTANdirectory{bsplit}{tools/bsplit}
\CTANdirectory{bst}{biblio/bibtex/contrib/germbib/bst}
\CTANdirectory{btable}{macros/plain/contrib/btable}
\CTANdirectory{btex8fmt}{macros/generic/cptex/btex8fmt}
@@ -169,7 +165,6 @@
\CTANdirectory{chbar}{macros/plain/contrib/chbar}
\CTANdirectory{chbars}{macros/latex209/contrib/chbars}
\CTANdirectory{check}{support/check}
-\CTANdirectory{checksum}{tools/checksum}
\CTANdirectory{chemstruct}{macros/latex209/contrib/chemstruct}
\CTANdirectory{chemtex}{macros/latex209/contrib/chemtex}
\CTANdirectory{cheq}{fonts/chess/cheq}
@@ -189,7 +184,7 @@
\CTANdirectory*{cm-AMStype1}{fonts/cm/ps-type1/bluesky}
\CTANdirectory{cm-lgc}{fonts/ps-type1/cm-lgc}
\CTANdirectory{cm-super}{fonts/ps-type1/cm-super}
-\CTANdirectory{cmactex}{nonfree/systems/mac/cmactex}
+\CTANdirectory{cmactex}{systems/mac/cmactex}
\CTANdirectory{cmap}{macros/latex/contrib/cmap}
\CTANdirectory{cmastro}{fonts/cmastro}
\CTANdirectory{cmcyralt}{macros/latex/contrib/cmcyralt}
@@ -202,14 +197,12 @@
\CTANdirectory{cms_help_files}{macros/text1/cms_help_files}
\CTANdirectory{cmtest}{fonts/cm/cmtest}
\CTANdirectory{cnoweb}{web/c_cpp/cnoweb}
+\CTANdirectory{collref}{macros/latex/contrib/collref}
\CTANdirectory{combine}{macros/latex/contrib/combine}
-\CTANdirectory{comm}{tools/macutils/comm}
\CTANdirectory{comment}{macros/latex/contrib/comment}
\CTANdirectory{committee}{fonts/unsupported/committee}
\CTANdirectory{comp-fonts-FAQ}{help/comp-fonts-FAQ}
-\CTANdirectory{compact}{tools/compact}
\CTANdirectory{components-of-TeX}{info/components-of-TeX}
-\CTANdirectory{compress}{tools/compress}
\CTANdirectory{compugraphics_8600}{macros/text1/compugraphics_8600}
\CTANdirectory{concmath}{macros/latex/contrib/concmath}
\CTANdirectory{concmath-f}{fonts/concmath}
@@ -249,7 +242,6 @@
\CTANdirectory{dc-nfss}{language/hyphen-accent/dc-nfss}
\CTANdirectory{detex}{support/detex}
\CTANdirectory{devanagari}{language/devanagari}
-\CTANdirectory{diagram}{macros/generic/diagrams/borceux/diagram}
\CTANdirectory{diagrams}{macros/generic/diagrams}
\CTANdirectory{dijkstra}{web/spiderweb/src/dijkstra}
\CTANdirectory{dinbrief}{macros/latex/contrib/dinbrief}
@@ -301,7 +293,7 @@
\CTANdirectory{dvisun}{dviware/dvisun}
\CTANdirectory{dvitty}{dviware/dvitty}
\CTANdirectory{dvivga}{dviware/dvivga}
-\CTANdirectory{e4t}{nonfree/systems/msdos/e4t}
+\CTANdirectory{e4t}{systems/msdos/e4t}
\CTANdirectory*{e-TeX}{systems/e-tex}
\CTANdirectory{easytex}{systems/msdos/easytex}
\CTANdirectory{ebib}{biblio/bibtex/utils/ebib}
@@ -327,6 +319,7 @@
\CTANdirectory{engwar}{fonts/engwar}
\CTANdirectory{enumitem}{macros/latex/contrib/enumitem}
\CTANdirectory{environment}{support/lsedit/environment}
+\CTANdirectory{epic}{macros/latex/contrib/epic}
\CTANdirectory{epigraph}{macros/latex/contrib/epigraph}
\CTANdirectory{eplain}{macros/eplain}
\CTANdirectory{epmtex}{systems/os2/epmtex}
@@ -336,7 +329,7 @@
\CTANdirectory{ergotex}{systems/msdos/ergotex}
\CTANdirectory{errata}{systems/knuth/dist/errata}
\CTANdirectory{eso-pic}{macros/latex/contrib/eso-pic}
-\CTANdirectory{et}{nonfree/support/et}
+\CTANdirectory{et}{support/et}
\CTANdirectory{ethiopia}{language/ethiopia}
\CTANdirectory{ethtex}{language/ethiopia/ethtex}
\CTANdirectory{etoolbox}{macros/latex/contrib/etoolbox}
@@ -353,6 +346,7 @@
\CTANdirectory{excel2latex}{support/excel2latex}
\CTANdirectory{excerpt}{web/spiderweb/tools/excerpt}
\CTANdirectory{expdlist}{macros/latex/contrib/expdlist}
+\CTANdirectory{expl3}{macros/latex/contrib/expl3}
\CTANdirectory{extracm}{fonts/amsfonts/sources/extracm}
\CTANdirectory{extract}{macros/latex/contrib/extract}
\CTANdirectory{extsizes}{macros/latex/contrib/extsizes}
@@ -365,8 +359,8 @@
\CTANdirectory{fig2eng}{graphics/fig2eng}
\CTANdirectory{fig2mf}{graphics/fig2mf}
\CTANdirectory{fig2mfpic}{graphics/fig2mfpic}
-\CTANdirectory{filehdr}{tools/filehdr}
\CTANdirectory{fink}{macros/latex/contrib/fink}
+\CTANdirectory{first-latex-doc}{info/first-latex-doc}
\CTANdirectory{fixfoot}{macros/latex/contrib/fixfoot}
\CTANdirectory{float}{macros/latex/contrib/float}
\CTANdirectory{floatflt}{macros/latex/contrib/floatflt}
@@ -388,8 +382,6 @@
\CTANdirectory{fouriernc}{fonts/fouriernc}
\CTANdirectory{frankenstein}{macros/latex/contrib/frankenstein}
\CTANdirectory{french-faq}{help/LaTeX-FAQ-francaise}
-\CTANdirectory{ftpd}{tools/ftpd}
-\CTANdirectory{ftpmail}{tools/ftpmail}
\CTANdirectory{funnelweb}{web/funnelweb}
\CTANdirectory{futhark}{fonts/futhark}
\CTANdirectory{futhorc}{fonts/futhorc}
@@ -402,7 +394,6 @@
\CTANdirectory{germbib}{biblio/bibtex/contrib/germbib}
\CTANdirectory{gfs}{info/examples/FirstSteps} % gratzer's
\CTANdirectory*{ghostscript}{support/ghostscript}
-\CTANdirectory*{ghostview}{support/ghostscript/gnu/ghostview}
\CTANdirectory{glo+idxtex}{indexing/glo+idxtex}
\CTANdirectory{gnuplot}{graphics/gnuplot}
\CTANdirectory{go}{fonts/go}
@@ -416,7 +407,7 @@
\CTANdirectory{greektex}{fonts/greek/greektex}
\CTANdirectory{gregory}{web/noweb/contrib/gregory}
\CTANdirectory{gsftopk}{fonts/utilities/gsftopk}
-\CTANdirectory*{gsview}{nonfree/support/ghostscript/ghostgum}
+\CTANdirectory*{gsview}{support/ghostscript/ghostgum}
\CTANdirectory{gut}{usergrps/gut}
\CTANdirectory*{gv}{support/gv}
\CTANdirectory{ha-prosper}{macros/latex/contrib/ha-prosper}
@@ -428,7 +419,6 @@
\CTANdirectory{hebrew}{language/hebrew}
\CTANdirectory{help}{help}
\CTANdirectory{hershey}{fonts/hershey}
-\CTANdirectory{hexbin}{tools/macutils/hexbin}
\CTANdirectory{hfbright}{fonts/ps-type1/hfbright}
\CTANdirectory{hge}{fonts/hge}
\CTANdirectory{hieroglyph}{fonts/hieroglyph}
@@ -454,6 +444,7 @@
\CTANdirectory{iching}{fonts/iching}
\CTANdirectory{icons}{support/icons}
\CTANdirectory{ifmslide}{macros/latex/contrib/ifmslide}
+\CTANdirectory{ifxetex}{macros/generic/ifxetex}
\CTANdirectory{imaketex}{support/imaketex}
\CTANdirectory{impact}{web/systems/mac/impact}
\CTANdirectory{index}{macros/latex/contrib/index}
@@ -473,7 +464,7 @@
\CTANdirectory{jemtex2}{systems/msdos/jemtex2}
\CTANdirectory{jknappen-macros}{macros/latex/contrib/jknappen}
\CTANdirectory{jonkrom}{web/noweb/contrib/jonkrom}
-\CTANdirectory{jpeg2ps}{nonfree/support/jpeg2ps}
+\CTANdirectory{jpeg2ps}{support/jpeg2ps}
\CTANdirectory{jspell}{support/jspell}
\CTANdirectory{jurabib}{macros/latex/contrib/jurabib}
\CTANdirectory{kaelin}{web/noweb/contrib/kaelin}
@@ -483,6 +474,7 @@
\CTANdirectory{kd}{fonts/greek/kd}
\CTANdirectory{kelem}{web/spiderweb/src/kelem}
\CTANdirectory{kelly}{fonts/greek/kelly}
+\CTANdirectory{keys3}{macros/latex/exptl/keys3}
\CTANdirectory{klinz}{fonts/klinz}
\CTANdirectory{knit}{web/knit}
\CTANdirectory{knot}{fonts/knot}
@@ -512,6 +504,7 @@
\CTANdirectory{lastpage}{macros/latex/contrib/lastpage}
\CTANdirectory{latex-essential}{info/latex-essential}
\CTANdirectory{latex-help-texinfo}{info/latex-help-texinfo}
+\CTANdirectory*{latex-tds}{macros/latex/contrib/latex-tds}
\CTANdirectory*{latex2html}{support/latex2html}
\CTANdirectory{latex2rtf}{support/latex2rtf}
\CTANdirectory{latexdiff}{support/latexdiff}
@@ -526,7 +519,6 @@
\CTANdirectory{lextex}{macros/plain/contrib/lextex}
\CTANdirectory{lgc}{info/examples/lgc}
\CTANdirectory{lgrind}{support/lgrind}
-\CTANdirectory{lharc}{tools/lharc}
\CTANdirectory{lineno}{macros/latex/contrib/lineno}
\CTANdirectory{listbib}{macros/latex/contrib/listbib}
\CTANdirectory{listings}{macros/latex/contrib/listings}
@@ -542,11 +534,8 @@
\CTANdirectory{luximono}{fonts/LuxiMono}
\CTANdirectory{lwc}{info/examples/lwc}
\CTANdirectory{ly1}{macros/latex/contrib/psnfssx/ly1}
-\CTANdirectory{machdr}{tools/macunpack/machdr}
\CTANdirectory*{mactex}{systems/mac/mactex}
\CTANdirectory{mactotex}{graphics/mactotex}
-\CTANdirectory{macunpack}{tools/macunpack}
-\CTANdirectory{macutils}{tools/macutils}
\CTANdirectory{mailing}{macros/latex/contrib/mailing}
\CTANdirectory{make_latex}{support/make_latex}
\CTANdirectory{makeafm.dir}{fonts/utilities/t1tools/makeafm.dir}
@@ -566,8 +555,8 @@
\CTANdirectory{mathsci2bibtex}{biblio/bibtex/utils/mathsci2bibtex}
\CTANdirectory{mathspic}{graphics/mathspic}
\CTANdirectory{mcite}{macros/latex/contrib/mcite}
+\CTANdirectory{mciteplus}{macros/latex/contrib/mciteplus}
\CTANdirectory{mctex}{support/mctex}
-\CTANdirectory{mcvert}{tools/mcvert}
\CTANdirectory{mdwtools}{macros/latex/contrib/mdwtools}
\CTANdirectory{memoir}{macros/latex/contrib/memoir}
\CTANdirectory{messtex}{support/messtex}
@@ -593,8 +582,6 @@
\CTANdirectory{miktex-AXP}{obsolete/systems/win32/miktex-AXP}
\CTANdirectory{minionpro}{fonts/minionpro}
\CTANdirectory{minitoc}{macros/latex/contrib/minitoc}
-\CTANdirectory{mirror}{tools/mirror}
-\CTANdirectory{mixed}{tools/macutils/mixed}
\CTANdirectory{mma2ltx}{graphics/mma2ltx}
\CTANdirectory{mnsymbol}{fonts/mnsymbol}
\CTANdirectory{mnu}{support/mnu}
@@ -635,6 +622,7 @@
\CTANdirectory{ntheorem}{macros/latex/contrib/ntheorem}
\CTANdirectory{nts-l}{digests/nts-l}
\CTANdirectory{nts}{systems/nts}
+\CTANdirectory{numparse3}{macros/latex/exptl/numparse3}
\CTANdirectory{numprint}{macros/latex/contrib/numprint}
\CTANdirectory{nuweb}{web/nuweb}
\CTANdirectory{nuweb0.87b}{web/nuweb/nuweb0.87b}
@@ -651,23 +639,21 @@
\CTANdirectory{os2}{systems/os2}
\CTANdirectory{osmanian}{fonts/osmanian}
\CTANdirectory{overpic}{macros/latex/contrib/overpic}
-\CTANdirectory{oztex}{nonfree/systems/mac/oztex}
-\CTANdirectory{oztex-german}{nonfree/systems/mac/oztex-german}
+\CTANdirectory{oztex}{systems/mac/oztex}
\CTANdirectory{page}{support/lametex/page}
\CTANdirectory{palladam}{language/tamil/palladam}
\CTANdirectory{pandora}{fonts/pandora}
\CTANdirectory{paralist}{macros/latex/contrib/paralist}
\CTANdirectory{parallel}{macros/latex/contrib/parallel}
-\CTANdirectory{parc}{tools/parc}
\CTANdirectory{passivetex}{macros/xmltex/contrib/passivetex}
\CTANdirectory{patchcmd}{macros/latex/contrib/patchcmd}
-\CTANdirectory{patches}{web/spiderweb/patches}
\CTANdirectory{pbm2tex}{support/pbm2tex}
\CTANdirectory{pbmtopk}{graphics/pbmtopk}
\CTANdirectory{pbox}{macros/latex/contrib/pbox}
\CTANdirectory{pcwritex}{support/pcwritex}
\CTANdirectory{pdcmac}{macros/plain/contrib/pdcmac}
\CTANdirectory{pdfpages}{macros/latex/contrib/pdfpages}
+\CTANdirectory{pdftex}{systems/pdftex}
\CTANdirectory{pdftex-graphics}{macros/pdftex/graphics}
\CTANdirectory{pdftricks}{macros/latex/contrib/pdftricks}
\CTANdirectory{penelope}{web/spiderweb/src/penelope}
@@ -689,7 +675,8 @@
\CTANdirectory{pkfix-helper}{support/pkfix-helper}
\CTANdirectory{placeins}{macros/latex/contrib/placeins}
\CTANdirectory{plain}{macros/plain/base}
-\CTANdirectory*{plnfss}{macros/plain/contrib/plnfss}
+\CTANdirectory*{plastex}{support/plastex}
+\CTANdirectory{plnfss}{macros/plain/plnfss}
\CTANdirectory{plttopic}{support/plttopic}
\CTANdirectory{pmtex}{systems/os2/pmtex}
\CTANdirectory{pmx}{support/pmx}
@@ -701,7 +688,6 @@
\CTANdirectory{pp}{support/pp}
\CTANdirectory{preprint}{macros/latex/contrib/preprint}
\CTANdirectory{preview}{macros/latex/contrib/preview}
-\CTANdirectory*{preview-latex}{support/preview-latex}
\CTANdirectory{print-fine}{support/print-fine}
\CTANdirectory{printbib}{biblio/bibtex/utils/printbib}
\CTANdirectory{printsamples}{fonts/utilities/mf2ps/doc/printsamples}
@@ -718,7 +704,7 @@
\CTANdirectory{psbook}{systems/msdos/dviware/psbook}
\CTANdirectory{psbox}{macros/generic/psbox}
\CTANdirectory{pseudocode}{macros/latex/contrib/pseudocode}
-\CTANdirectory{psfig}{nonfree/graphics/psfig}
+\CTANdirectory{psfig}{graphics/psfig}
\CTANdirectory{psfrag}{macros/latex/contrib/psfrag}
\CTANdirectory{psfragx}{macros/latex/contrib/psfragx}
\CTANdirectory{psizzl}{macros/psizzl}
@@ -761,7 +747,6 @@
\CTANdirectory{rotating}{macros/latex/contrib/rotating}
\CTANdirectory{rotfloat}{macros/latex/contrib/rotfloat}
\CTANdirectory{rsfs}{fonts/rsfs}
-\CTANdirectory{rsfs-type1}{fonts/rsfs/ps-type1/hoekwater}
\CTANdirectory{rtf2tex}{support/rtf2tex}
\CTANdirectory{rtf2html}{support/rtf2html}
\CTANdirectory{rtf2latex}{support/rtf2latex}
@@ -783,7 +768,7 @@
\CTANdirectory{sciposter}{macros/latex/contrib/sciposter}
\CTANdirectory{screenview}{dviware/screenview}
\CTANdirectory{script}{macros/latex/contrib/script}
-\CTANdirectory{scripttex}{nonfree/macros/scripttex}
+\CTANdirectory{scripttex}{macros/scripttex}
\CTANdirectory{sectsty}{macros/latex/contrib/sectsty}
\CTANdirectory{seminar}{macros/latex/contrib/seminar}
\CTANdirectory{sfware}{fonts/softfonts/sfware}
@@ -811,7 +796,6 @@
\CTANdirectory{ssqquote}{macros/latex/contrib/ssqquote}
\CTANdirectory{stmaryrd}{fonts/stmaryrd}
\CTANdirectory{sttools}{macros/latex/contrib/sttools}
-\CTANdirectory{stuffit}{tools/stuffit}
\CTANdirectory{subeqnarray}{macros/latex/contrib/subeqnarray}
\CTANdirectory{subfig}{macros/latex/contrib/subfig}
\CTANdirectory{subfiles}{macros/latex/contrib/subfiles}
@@ -832,7 +816,6 @@
\CTANdirectory{tabulary}{macros/latex/contrib/tabulary}
\CTANdirectory{talk}{macros/latex/contrib/talk}
\CTANdirectory{tamil}{language/tamil}
-\CTANdirectory{tar}{tools/tar}
\CTANdirectory{tbe}{macros/plain/contrib/tbe}
\CTANdirectory{tcdmanual}{info/tcdmanual}
\CTANdirectory{tde-macros}{language/swedish/slatex/tde-macros}
@@ -852,12 +835,11 @@
\CTANdirectory{tex-surface}{support/tex-surface}
\CTANdirectory{tex2mail}{support/tex2mail}
\CTANdirectory{tex2rtf}{support/tex2rtf}
-\CTANdirectory{tex88}{digests/tex88}
-\CTANdirectory{tex8fmts}{macros/generic/cptex/tex8fmts}
\CTANdirectory{texbytopic}{info/texbytopic}
\CTANdirectory{texcalc}{support/texcalc}
\CTANdirectory{texchord}{macros/generic/texchord}
\CTANdirectory{texcnvfaq}{help/wp-conv}
+\CTANdirectory{texcount}{support/texcount}
\CTANdirectory{texdraw}{graphics/texdraw}
\CTANdirectory{texed}{support/texed}
\CTANdirectory{texfilt}{support/texfilt}
@@ -906,12 +888,12 @@
\CTANdirectory{tr2latex}{support/tr2latex}
\CTANdirectory{transfig}{graphics/transfig}
\CTANdirectory{translit}{support/translit}
-\CTANdirectory{transname}{tools/macunpack/transname}
\CTANdirectory{tree}{graphics/tree}
\CTANdirectory{troff}{indexing/makeindex/troff}
\CTANdirectory{tsipa}{fonts/tsipa}
\CTANdirectory{tspell}{support/tspell}
\CTANdirectory{tt2001}{fonts/ps-type1/tt2001}
+\CTANdirectory{tth}{support/tth/dist}
\CTANdirectory{ttn}{digests/ttn}
\CTANdirectory{tug}{usergrps/tug}
\CTANdirectory{tugboat}{digests/tugboat}
@@ -934,24 +916,18 @@
\CTANdirectory{umlaute}{macros/latex/contrib/umlaute}
\CTANdirectory{umrand}{macros/generic/umrand}
\CTANdirectory{unadobe}{fonts/utilities/unadobe}
-\CTANdirectory{unarj}{tools/unarj}
\CTANdirectory{uncompressing}{fonts/utilities/mf2ps/mf2ps/uncompressing}
\CTANdirectory{undump}{obsolete/support/undump}
\CTANdirectory{unix}{systems/unix}
-\CTANdirectory{unpack}{tools/macunpack/unpack}
\CTANdirectory{unpacked}{macros/latex/unpacked}
-\CTANdirectory{unstuff}{tools/unstuff}
\CTANdirectory{untex}{support/untex}
\CTANdirectory{urlbst}{biblio/bibtex/contrib/urlbst}
-\CTANdirectory{urw}{fonts/urw}
-\CTANdirectory{user-guides}{macros/generic/diagrams/borceux/user-guides}
-\CTANdirectory{usergrps}{usergrps}
+\CTANdirectory{urw-base35}{fonts/urw/base35}
\CTANdirectory{usl}{fonts/thai/usl}
\CTANdirectory{utopia}{fonts/utopia}
\CTANdirectory{utthesis}{macros/latex/contrib/utthesis}
-\CTANdirectory{uue}{tools/uue}
-\CTANdirectory{uuencode}{tools/uuencode}
-\CTANdirectory{va}{fonts/va}
+CTANdirectory{va}{fonts/va}
+\CTANdirectory{varisize}{macros/plain/contrib/varisize}
\CTANdirectory{vc}{support/vc}
\CTANdirectory{vector}{macros/latex/contrib/vector}
\CTANdirectory{vertex}{macros/plain/contrib/vertex}
@@ -968,10 +944,7 @@
\CTANdirectory{vtex-common}{systems/vtex/common}
\CTANdirectory{vtex-linux}{systems/vtex/linux}
\CTANdirectory{vtex-os2}{systems/vtex/os2}
-\CTANdirectory{vtree}{tools/vtree}
-\CTANdirectory{vtree-fix}{tools/vtree-fix}
\CTANdirectory{vutex}{dviware/vutex}
-\CTANdirectory{vvcode}{tools/vvcode}
\CTANdirectory{w2latex}{support/w2latex}
\CTANdirectory{wallpaper}{macros/latex/contrib/wallpaper}
\CTANdirectory{was}{macros/latex/contrib/was}
@@ -982,7 +955,6 @@
\CTANdirectory{webtoc}{support/makeprog/webtoc}
\CTANdirectory{whatstex}{info/whatstex}
\CTANdirectory{williams}{macros/latex/contrib/williams}
-\CTANdirectory{fptex}{obsolete/systems/win32/fptex}
\CTANdirectory*{winedt}{systems/win32/winedt}
\CTANdirectory{winw2ltx}{support/winw2ltx}
\CTANdirectory{word2tex}{support/word2tex}
@@ -993,18 +965,19 @@
\CTANdirectory{wsuipa}{fonts/wsuipa}
\CTANdirectory{xargs}{macros/latex/contrib/xargs}
\CTANdirectory{xbibfile}{biblio/bibtex/utils/xbibfile}
-\CTANdirectory{xbin}{tools/xbin}
\CTANdirectory{xcolor}{macros/latex/contrib/xcolor}
-\CTANdirectory{xdvi}{dviware/xdvi}
+\CTANdirectory*{xdvi}{dviware/xdvi}
\CTANdirectory{xetal}{support/xetal}
\CTANdirectory{xettex}{language/xettex}
-\CTANdirectory{xfig}{graphics/xfig}
-\CTANdirectory*{xindy}{support/xindy}
+\CTANdirectory*{xfig}{graphics/xfig}
+\CTANdirectory*{xindy}{indexing/xindy}
\CTANdirectory{xkeyval}{macros/latex/contrib/xkeyval}
\CTANdirectory{xmltex}{macros/xmltex/base}
+\CTANdirectory{xpackages}{macros/latex/contrib/xpackages}
\CTANdirectory*{xpdf}{support/xpdf}
\CTANdirectory{xtab}{macros/latex/contrib/xtab}
-\CTANdirectory{xypic}{macros/generic/diagrams/xypic}
+\CTANdirectory{xypic}{macros/generic/diagrams/xypic/xy}
+\CTANdirectory{yagusylo}{macros/latex/contrib/yagusylo}
\CTANdirectory{yhmath-fonts}{fonts/yhmath}
\CTANdirectory{yhmath-macros}{macros/latex/contrib/yhmath}
\CTANdirectory{zefonts}{fonts/zefonts}
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/faq.sty b/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
index e9acef465a4..111c3f121d6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
+++ b/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
@@ -146,8 +146,6 @@
\DeclareRobustCommand\MP{Meta\-Post}
\let\textlogo\textmd
%
-% get texnames package (as amended)
-%\RequirePackage{stupid_names}
% define substitutes for stupid_names
\newcommand\LaTeXo{\LaTeX\,2.09}
\newcommand\AMSTeX{AMS\TeX}
@@ -155,6 +153,7 @@
\newcommand\BibTeX{Bib\TeX}
\newcommand\PiCTeX{PiC\TeX}
\newcommand\texlive{\TeX{} Live}
+% and...
%
% ifthenelse for the undefined references
\RequirePackage{ifthen}
@@ -167,15 +166,16 @@
\excludecomment{htmlversion}
\ifpdf
\includecomment{pdfversion}
- \excludecomment{dviversion}
\includecomment{wideversion}
+ \excludecomment{dviversion}
\excludecomment{narrowversion}
\else
\excludecomment{pdfversion}
+ \excludecomment{wideversion}
\includecomment{dviversion}
\includecomment{narrowversion}
- \excludecomment{wideversion}
\fi
+\newenvironment{introduction}{}{}
%
% but we also want short versions, like LaTeX2HTML's
\let\htmlonly\@gobble
@@ -200,10 +200,13 @@
\providecommand\DANTE{\acro{DANTE}}
\providecommand\MSDOS{\acro{MS-DOS}}
\providecommand\CDROM{\acro{CD-ROM}}
-\providecommand\elatex{e-LaTeX}
+%
+\providecommand\elatex{e-\LaTeX{}}
+\providecommand\plaintex{Plain \TeX{}}
\providecommand\miktex{MiKTeX}
+\providecommand\texshop{\ProgName{TeXshop}}
+\providecommand\texworks{\ProgName{TeXworks}}
\providecommand\xetex{XeTeX}
-\providecommand\plaintex{Plain \TeX{}}
%
%% \providecommand\TeXXeT{\TeX-{}-X\lower.5ex\hbox{E}\kern-.1667emT\@}
%\providecommand\MLTeX{ML-\TeX}
@@ -309,6 +312,7 @@
\newcommand\PDFLaTeX{PDF\LaTeX}
\renewcommand\LaTeX{La\TeX}
\newcommand\twee{2e}
+\renewcommand\LaTeXe{\LaTeX\twee}
%
% Other odds and ends (appear differently in TeX and http or plain
% text
@@ -835,6 +839,20 @@
}
\newcommand*\questionmark[1]{}
\newcommand*\l@question{\@dottedtocline{2}{2.0em}{2.3em}}
+
+%
+% \paragraph: has appeared in a submission, so let's give it a faq
+% definition...
+\renewcommand\paragraph{\@startsection{paragraph}%
+ 4%
+ \z@
+ {1.25ex \@plus 1ex \@minus.2ex}%
+ {-1em}
+ {%
+ \normalfont
+ \normalsize
+ \bfseries
+ }}
%
% alias questions make a little perl script to set up a hash array
% that takes one from old question to current one.
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/faqbody.tex b/Master/texmf-dist/doc/generic/FAQ-en/faqbody.tex
index 1b35a314993..2fd9eff8f33 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/faqbody.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/faqbody.tex
@@ -1,4 +1,4 @@
-\def\faqfileversion{3.18} \def\faqfiledate{2008-06-20}
+\def\faqfileversion{3.19} \def\faqfiledate{2009-06-10}
%
% The above line defines the file version and date, and must remain
% the first line with any `assignment' in the file, or things will
@@ -16,90 +16,73 @@
% ... files
\input{filectan}
+% this environment is for the benefit of new-style file generation
+\begin{introduction}
+% suppress section numbers until end environment
+\nothtml{\csname c@secnumdepth\endcsname=-1 }
\section{Introduction}
This is a set of Frequently Asked Questions (\acro{FAQ}) for
-English-speaking users of \TeX{}. The questions answered here cover a
-wide range of topics, but the actual typesetting issues are mostly
+English-speaking users of \TeX{}. The questions answered here cover
+a wide range of topics, but the actual typesetting issues are mostly
covered from the viewpoint of a \LaTeX{} user.
You may use the \acro{FAQ}
\begin{itemize}
-\item by reading a printed document,
+\item by reading a printed document,
\item by viewing a \acro{PDF} file, with hyperlinks to assist
browsing: copies are available formatted for printing on
\CTANhref{faq-a4}{A4 paper} or on % ! line break
\CTANhref{faq-letter}{North American ``letter'' paper}, or
\item by using the \acro{FAQ}'s web interface (base \acro{URL}:
- \URL{http://www.tex.ac.uk/faq}); this version provides simple search
- capabilities, as well as a link to Google for a more sophisticated
- search restricted to the \acro{FAQ} itself, or
+ \URL{http://www.tex.ac.uk/faq}); this version provides simple
+ search capabilities, as well as a link to Google for a more
+ sophisticated search restricted to the \acro{FAQ} itself, or
\item via Scott Pakin's \CTANhref{visualFAQ}{Visual FAQ}.
\end{itemize}
-\begin{htmlversion}
-% pseudo-subsection here, because of limitations of latex->html translator
-\textbf{Caveat: Acquiring files}
-
-Most answers in this \acro{FAQ} provide links for downloading
-software; a large proportion of these links direct you to entire
-directories on the \acro{CTAN} archives. Unfortunately, some browsers
-issue a sequence of commands that causes \acro{CTAN} servers to deny
-the existence of compressed archive files of the directory, that the
-server would be happy to create ``on the fly''. The \acro{FAQ}
-therefore offers three possible links for downloading directories
-(that aren't already designated ``browse only''): the links give you
-\extension{zip} and \extension{tar.gz} archives, and a link for browsing
-the directory.
-
-Fortunately, \acro{CTAN} is switching to statically-generated
-directory archive files; many directories mentioned in this \acro{FAQ}
-will also exist as \extension{zip} files on the archives, and won't fall
-foul of the browser problem. Of course, if the \extension{zip} file
-does not exist, and the browser is playing up, you will need to use
-the ``browse'' link.
-\end{htmlversion}
-
-\htmlignore
-\subsection*{Finding the Files}
-
-Unless otherwise specified, all files mentioned in this \acro{FAQ} are
-available from a \acro{CTAN} archive, or from one of their mirrors.
-\Qref[Question]{}{Q-archives} % this one doesn't need anchor text
-gives details of the \acro{CTAN} archives, and how to retrieve files from
-them. If you don't have access to the Internet, the
-\Qref*{\texlive{} distribution}{Q-CD} offers off-line snapshots of
-the archives.
-
-The reader should also note that the first directory name of the path
-name of every file on \acro{CTAN} has been elided from what follows, for the
-simple reason that it's always the same (\path{tex-archive/}).
-
-To avoid confusion, we've also elided the full stop
-from the end of any sentence whose last item is a path name (such
-sentences are rare, and only occur at the end of paragraphs). Though
-the path names are set in a different font from running text, it's not
-easy to distinguish the font of a single dot!
-\endhtmlignore
+\subsection{Finding the Files}
+
+Unless otherwise specified, all files mentioned in this \acro{FAQ}
+are available from a \acro{CTAN} archive, or from a mirror of
+\acro{CTAN}~--- see \Qref[question]{later discussion}{Q-archives}% ! space
+\narrowonly{, which gives details} of the \acro{CTAN}
+archives\wideonly{ and}\narrowonly{, including} how to retrieve files
+from them. If you don't have access to the internet, the
+\Qref*{\texlive{} distribution}{Q-CD} offers off-line snapshots of the
+archives.
+
+The reader should also note that the first directory name of the
+path name of every file on \acro{CTAN} is omitted from what
+follows, for the simple reason that, while it's always the same
+(\path{tex-archive/}) on the main sites, mirror sites often choose
+something else.
+
+To avoid confusion, we also omit the full stop from the end of
+any sentence whose last item is a path name (such sentences are
+rare, and only occur at the end of paragraphs). Though the path
+names are set in a different font from running text, it's not easy
+to distinguish the font of a single dot!
\latexhtml{\subsection*{Origins}}{\textbf{Origins}}
-The \acro{FAQ} was originated by the Committee of the \acro{UK} \TeX{}
-Users' Group (\acro{UK}~\acro{TUG}) as a development of a regular
-posting to the \emph{Usenet} newsgroup \Newsgroup{comp.text.tex} that
-was maintained for some time by Bobby Bodenheimer. The first
-\acro{UK} version was much re-arranged and corrected from the
-original, and little of Bodenheimer's work now remains.
+The \acro{FAQ} was originated by the Committee of the \acro{UK}
+\TeX{} Users' Group (\acro{UK}~\acro{TUG}) as a development of a
+regular posting to the \emph{Usenet} newsgroup
+\Newsgroup{comp.text.tex} that was maintained for some time by Bobby
+Bodenheimer. The first \acro{UK} version was much re-arranged and
+corrected from the original, and little of Bodenheimer's work now
+remains.
The following people (at least~--- there are almost certainly others
whose names weren't correctly recorded) have contributed help or
-advice on the development of the \acro{FAQ}:
-Donald Arseneau,
+advice on the development of the \acro{FAQ}: Donald Arseneau,
Rosemary Bailey, % lots of initial set of maths answers
Barbara Beeton, % one of first reviewers outside cttee
-Karl Berry,
+Karl Berry, % often provides comments & suggestions
Giuseppe Bilotta,
Charles Cameron,
+Fran\c{c}ois Charette, % update of q-xetex
Damian Cugley,
Michael Dewey,
Michael Downes, % (RIP) on (ams)maths stuff
@@ -130,7 +113,8 @@ Oleg Katsitadze, % revision of q-eplain
Isaac Khabaza, % kindersley book
Ulrich Klauer, % pointed out twaddle in TeXpronounce
Markus Kohm, % help with functionality of Koma-script
-David Kraus, % help with tocbibind (spotted embarrassing typo :-} )
+Stefan Kottwitz % picked up text of q-wideflt
+David Kraus, % help with tocbibind (spotted embarrassing typo :-} )
Ryszard Kubiak, % comment about q-driver
Simon Law,
Daniel Luecking,
@@ -140,7 +124,7 @@ Andreas Matthias,
Brooks Moses, % editorial suggestion
Iain Murray, % alternative solution in q-hyperdupdest
Vilar Camara Neto, % explain breakurl pkg, suggest use of numprint
-Dick Nickalls, % now a member of the committee
+Dick Nickalls,
Ted Nieland,
Hans Nordhaug,
Pat Rau,
@@ -148,23 +132,27 @@ Heiko Oberdiek,
Piet van Oostrum,
Scott Pakin,
Oren Patashnik,
+Manuel P\'egouri\'e-Gonnard, % improvement of q-luatex
Steve Peter, % comprehensive review, lots of typos etc
Sebastian Rahtz, % without whom there would be no...
Philip Ratcliffe, % help with a bibtex oddity
Chris Rowley, % founding father
-Jos\'e Carlos Santos, % very assiduous reader of new versions
+Jos\'e Carlos Santos, % assiduous reader of new versions
Walter Schmidt,
Hans-Peter Schr\"ocker,
Joachim Schrod,
Maarten Sneep, % summary of c.t.t thread for outszwrng, inter alia
Axel Sommerfeldt, % suggested rewrite of q-hyperdupdest
+Philipp Stephani, % xlation of komascript keyval stuff
James Szinger, % who responded on c.t.t to request for answer
Ulrik Vieth,
Mike Vulis,
Chris Walker, % revtex alert, ite suggestion (q-labelfig)
Peter Wilson, % several, incl functionality of memoir
+Joseph Wright, % help with keyval
Rick Zaccone and
Reinhard Zierke.
+\end{introduction}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -176,8 +164,12 @@ Reinhard Zierke.
\href{http://sunburn.stanford.edu/~knuth/}{Donald E. Knuth}, who
says in the Preface to his book on \TeX{}
(see \Qref[question]{books about TeX}{Q-books}) that it is
-%% beware line wrap
-``\emph{intended for the creation of beautiful books~--- and especially for books that contain a lot of mathematics}''.
+%% !line wrap avoided by two commands
+``\emph{intended for the creation of beautiful books~---}
+\emph{and especially for books that contain a lot of mathematics}''.
+(If \TeX{} were \emph{only} good for mathematical books, much of its
+use nowadays would not happen: it's actually a pretty good general
+typesetting system.)
Knuth is Emeritus Professor of the Art of Computer Programming at
Stanford University in California, \acro{USA}. Knuth developed the
@@ -279,6 +271,191 @@ A mailing list discussing \MP{} is available;
The \acro{TUG} website also hosts a % ! line break
\href{http://tug.org/metapost.html}{\MP{} summary page}.
+%****
+\Question[Q-texthings]{Things with ``\TeX{}'' in the name}
+
+New \TeX{} users are often baffled by the myriad terms with ``\TeX{}''
+in the name. The goal of this answer is to clarify some of the more
+common \TeX{} terms.
+
+\paragraph{\TeX{} itself}
+\TeX{} proper is a typesetting system based on a set of low-level
+control sequences that instruct \TeX{} how to lay out text on the
+page. For example, \csx{hskip} inserts a given amount of horizontal
+space into the document, and \csx{font} makes a given font available
+to \TeX{}. \TeX{} is fully programmable using an integrated macro
+scripting language that supports variables, scoping, conditional
+execution, control flow, and function (really, macro) definitions.
+See % ! line break
+\Qref[question]{What is \TeX{}?}{Q-whatTeX} for some background
+information on \TeX{} and % ! line break
+\Qref[question]{Reference documents}{Q-ref-doc} for pointers to
+descriptions of \TeX{} control sequences, data types, and other key
+parts of \TeX{}.
+
+\paragraph{\TeX{} macro packages (a.k.a.~\TeX{} formats)}
+\TeX{}'s control sequences are tedious to use directly; they are
+intended primarily as building blocks for higher-level---and therefore
+more user-friendly---abstractions. For example, there is no way in
+base \TeX{} to specify that a piece of text should be typeset in a
+larger font. Instead, one must keep track of the current size and
+typeface, load a new font with the same typeface but a (specified)
+larger size, and tell \TeX{} to use that new font until instructed
+otherwise. Fortunately, because \TeX{} is programmable, it is
+possible to write a macro that hides this complexity behind a simple,
+new control sequence. For example,
+%
+\cmdinvoke{larger}{my text} can be defined to typeset ``my text'' in
+the next larger font).
+
+While some users write their own, perfectly customized set of
+macros---which they then typically reuse across many documents---it is
+far more common to rely upon a \emph{macro package}, a collection of
+\TeX{} macros written by experts. For the user's convenience, these
+macro packages are often combined with the base \TeX{} engine into a
+standalone executable. The following are some of that macro packages
+that you are likely to encounter:
+\begin{description}
+ \item[Plain \TeX{} (executable: \ProgName{tex})]
+ See
+ \Qref[questions]{Books on \TeX{} and its relations}{Q-books},
+ \Qref[]{Online introductions: \TeX{}}{Q-man-tex},
+ \Qref[]{Should I use Plain \TeX{} or \LaTeX{}?}{Q-plainvltx} and
+ \Qref[]{Freely available \AllTeX{} books}{Q-ol-books}.
+ Note that the Plain \TeX{} executable is called \ProgName{tex}; the
+ base \TeX{} engine is generally provided by a separate executable
+ such as \ProgName{initex} or as a \texttt{-ini} flag to
+ \ProgName{tex}.
+
+ \item[\LaTeX{} (executable: \ProgName{latex})]
+ See
+ \Qref[questions]{Books on \TeX{} and its relations}{Q-books},
+ \Qref[]{\AllTeX{} Tutorials, etc.}{Q-tutorials*},
+ \Qref[]{Online introductions: \LaTeX{}}{Q-man-latex},
+ \Qref[]{Specialized \AllTeX{} tutorials}{Q-tutbitslatex} and
+ \Qref[]{Directories of \AllTeX{} information}{Q-doc-dirs}.
+ Note that there have been two major versions of \LaTeX{}: \LaTeXe{}
+ refers to the current version of \LaTeX{} while \LaTeXo{} is the
+ long-since-obsolete (since 1994) version (cf.~%
+ \Qref[question]{What is \LaTeXe{}?}{Q-latex2e} for more information).
+
+ \item[\CONTeXT{} (executable: \ProgName{texexec})]
+ See
+ \Qref[question]{What is \CONTeXT{}?}{Q-context}.
+
+ \item[Texinfo (executables: \ProgName{tex}, \ProgName{makeinfo})]
+ See
+ \Qref[question]{What is Texinfo?}{Q-texinfo}. \ProgName{makeinfo}
+ converts Texinfo documents to \acro{HTML}, DocBook, Emacs info,
+ \acro{XML}, and plain text. \ProgName{Tex} (or wrappers such as
+ \ProgName{texi2pdf} and \ProgName{texi2pdf}) produce one of \TeX{}'s
+ usual output formats such as \acro{DVI} or \acro{PDF}. Because
+ \ProgName{tex} loads the Plain \TeX{} macros, not the Texinfo ones,
+ a Texinfo document must begin with \cmdinvoke{input}{texinfo} to
+ explicitly load the Texinfo macro package.
+
+ \item[\Eplain{}---Extended Plain \TeX{} (executable: \ProgName{eplain})]
+ See
+ \Qref[question]{What is \Eplain{}?}{Q-eplain}.
+\end{description}
+
+\paragraph{Modified \ProgName{tex} executables}
+The original \ProgName{tex} executable was produced in the late 1970s
+(cf.~\Qref[question]{What is \TeX{}?}{Q-whatTeX}) and consequently
+lacked some features that users have come to expect from today's
+software. The following programs address these issues by augmenting
+the \TeX{} engine with some additional useful features:
+
+\begin{description}
+ \item[\PDFTeX{} (executable: \ProgName{pdftex})]
+ \TeX{}, which predates the \acro{PDF} file format by a decade,
+ outputs files in a \TeX{}-specific format called \acro{DVI}
+ (cf.~\Qref[question]{What is a \acro{DVI} file?}{Q-dvi}). In
+ contrast, \PDFTeX{} can output both \acro{DVI} \emph{and} \acro{PDF}
+ files. In \acro{PDF} mode, it lets documents exploit various
+ \acro{PDF} features such as hyperlinks, bookmarks, and annotations,
+ \PDFTeX{} additionally supports two sophisticated micro-typographic
+ features: character protrusion and font expansion. See
+ \Qref[question]{What is \PDFTeX{}?}{Q-whatpdftex}.
+
+ \item[\xetex{} (executable: \ProgName{xetex})]
+ \TeX{} not only predates all major font technologies in use today
+ (e.g.,~TrueType, OpenType, and PostScript Type~1) but also predates
+ the notion that fonts be included with an operating system.
+ Consequently, \TeX{} uses its own font formats, which are
+ incompatible with anything a user is likely to have preinstalled.
+ \xetex{} addresses this issue by enhancing \TeX{}'s \csx{font}
+ control sequence to support all of the fonts made available by the
+ operating system. See
+ \Qref[question]{What is \xetex{}?}{Q-xetex}.
+
+ \item[\LuaTeX{} (executable: \ProgName{luatex})]
+ \TeX{} is programmed in its own, integrated, macro-based programming
+ language. Many users have criticized this language for being
+ needlessly difficult to program. \LuaTeX{} addresses that criticism
+ by integrating a modern scripting language, Lua, into the base
+ \TeX{} engine. See
+ \Qref[question]{What is \LuaTeX{}?}{Q-luatex}.
+
+ \item[\eTeX{} (executable: \ProgName{etex})]
+ \eTeX{} provides a number of features that are only indirectly
+ useful to end users but that can be immensely useful to package
+ developers. Consequently, there is an increasing number of macro
+ packages that require the use of \eTeX{}. (Note: Be careful not to
+ confuse \eTeX{}, which enhances the \TeX{} engine, with \Eplain{},
+ which enhances the Plain \TeX{} macro package.) See
+ \Qref[question]{What is \eTeX{}?}{Q-etex}.
+\end{description}
+
+Because each of the above modifies only the base \TeX{} engine, it is
+possible to combine any of those with any of the \TeX{} macro packages
+listed earlier to produce executables with both sets of features. For
+example, the \ProgName{pdflatex}, \ProgName{xelatex} and
+\ProgName{lualatex} executables each combine
+\LaTeX{} with an enhanced \TeX{} engine. Some executables combine the
+features of multiple enhanced \TeX{} engine: \ProgName{pdfetex}
+combines \PDFTeX{} and \eTeX{} into a single executable.
+
+As combining features is a generally desirable tendency, current
+\TeX{} distributions (see below) incorporate the features of \PDFTeX{}
+and \eTeX{} into a single executable. This executable may be
+offered with a \LaTeX{} format (as \ProgName{latex} or
+\ProgName{pdflatex}) or with a \plaintex{} format (as
+\ProgName{pdftex}). (\ProgName{Tex} remains with an unadorned \TeX{}
+executable using \plaintex{}, for people such as Knuth himself, who
+want the certainty of the ``original''.)
+
+
+\paragraph{\TeX{} distributions}
+A \emph{\TeX{} distribution} is a collection of \TeX{}-related
+software. Generally, a \TeX{} distribution includes a set of core
+\TeX{} executables such as \ProgName{tex} and \ProgName{latex};
+various fonts optimized for use with \TeX{}; helper programs such as
+the \BibTeX{} bibliographic-database formatter, editors, integrated
+development environments, file-format-conversion programs; numerous
+\LaTeX{} packages; configuration tools; and any other goodies the
+distributor chooses to include. Commonly encountered \TeX{}
+distributions include \texlive{}, \miktex{} and Mac\TeX{}; older ones
+include oz\TeX{}, \acro{CM}ac\TeX{} and te\TeX{}. Some \TeX{}
+distributions target a specific operating system and/or processor
+architecture; others run on multiple platforms. Some \TeX{}
+distributions are free; others require payment. See % ! line break
+\Qref[question]{\AllTeX{} for different machines}{Q-TeXsystems} for a
+list of free and shareware \TeX{} distributions and % ! line break
+\Qref[question]{Commercial \TeX{} implementations}{Q-commercial} for a
+list of commercial \TeX{} distributions.
+
+
+\paragraph{Summary}
+If your document begins with \csx{documentclass}, you're using some
+form of the \LaTeX{} macro package. Even if hidden behind a button in
+a \TeX{}-aware GUI, this document is getting compiled by a \TeX{}
+executable---probably \ProgName{latex} or \ProgName{pdflatex}---to
+produce an output file. The executable came bundled as part of a
+\TeX{} distribution such as \miktex{}, which includes various other
+\TeX{}-related components.
+%****
+
\Question[Q-triptrap]{How can I be sure it's really \TeX{}?}
\TeX{} (and \MF{} and \MP{}) are written in a
@@ -399,10 +576,17 @@ individually contributed) may require \eTeX{} for optimum performance.
\Question[Q-whatpdftex]{What is \PDFTeX{}?}
-\PDFTeX{} has entered the main stream of \TeX{} distributions: most
-\LaTeX{} and \CONTeXT{} users nowadays use \PDFTeX{} whether they know
-it or not (more precisely, they use an amalgam of \PDFTeX{} and
-\Qref*{\eTeX{}}{Q-etex}). So what is \PDFTeX{}?
+One can reasonably say that \PDFTeX{} is (today) the main stream of
+\TeX{} distributions: most \LaTeX{} and \CONTeXT{} users nowadays use
+\PDFTeX{} whether they know it or not (more precisely, they use
+\PDFTeX{} extended by
+\begin{wideversion}
+ \Qref*{\eTeX{}}{Q-etex}).
+\end{wideversion}
+\begin{narrowversion}
+ \eTeX{}~--- \Qref{}{Q-etex}).
+\end{narrowversion}
+So what is \PDFTeX{}?
\PDFTeX{} is a development of \TeX{} that is capable of generating
typeset \acro{PDF} output in place of \acro{DVI}. \PDFTeX{} has
@@ -457,14 +641,20 @@ was superseded in 1994 by a new version (\LaTeXe{}) provided by
\Qref*{the \LaTeX{} team}{Q-LaTeX3}.
\LaTeXe{} is now the only readily-available version of
\LaTeX{}, and draws together several threads of \LaTeX{} development
-from the later days of \LaTeXo{}.
+from the later days of \LaTeXo{}. The ``e'' of the name is (in the
+% next (ghastly) line needed to maintain typesetting
+\wideonly{\Qref{official logo}{Q-logos}}\narrowonly{official logo~--- \Qref{\relax}{Q-logos}})
+% the \relax allows sanitize to cope with the line. just don't ask...
+a single-stroke epsilon
+(\latexhtml{\ensuremath{\varepsilon}}{&epsilon;}, supposedly
+indicative of no more than a small change.
\LaTeXe{} has several enhancements over \LaTeXo{}, but they were all
rather minor, with a view to continuity and stability rather than the
``big push'' that some had expected from the team. \LaTeXe{}
continues to this day to offer a compatibility mode in which most
files prepared for use with \LaTeXo{} will run (albeit with somewhat
-reduced performance, and subject to bitter complaints in the log
+reduced performance, and subject to voluminous complaints in the log
file). Differences between \LaTeXe{} and \LaTeXo{} are
outlined in a series of `guide' files that are available in every
\LaTeX{} distribution (the same directory also contains ``news'' about
@@ -473,20 +663,18 @@ each new release of \LaTeXe{}).
\item[\nothtml{\rmfamily}\LaTeX{} guides and news]\CTANref{latexdoc}
\end{ctanrefs}
-
-\nothtml{\begingroup\ifboldmathavail\boldmath\fi}
\Question[Q-latexpronounce]{How should I pronounce ``\LaTeX{}(\twee{})''?}
-\nothtml{\afterquestion}
Lamport never recommended how one should pronounce \LaTeX{}, but a lot
of people pronounce it `Lay \TeX{}' or perhaps `Lah \TeX{}' (with
\TeX{} pronounced as the program itself; see
\Qref[question]{the rules for TeX}{Q-TeXpronounce}). It is definitely
-\emph{not} to be pronounced in the same way as the rubber-tree gum.
+\emph{not} to be pronounced in the same way as the rubber-tree gum
+(which would be `lay teks').
-The `epsilon' in `\LaTeXe{}' is supposed to be suggestive of a small
-improvement over the old \LaTeXo{}. Nevertheless, most people
-pronounce the name as `\LaTeX{}-two-ee'.
+The \LaTeXe{} logo is supposed to end with an
+\latexhtml{\ensuremath{\varepsilon}}{&epsilon;}; nevertheless, most
+people pronounce the name as `\LaTeX{}-two-ee'.
\Question[Q-plainvltx]{Should I use \plaintex{} or \LaTeX{}?}
@@ -495,12 +683,13 @@ by \plaintex{}, and produce highly respectable documents using it
(Knuth is an example of this, of course). But equally, many people
are happy to let someone else take the design decisions for them,
accepting a small loss of flexibility in exchange for a saving of
-brain power.
+(mental) effort.
The arguments around this topic can provoke huge amounts of noise and
-heat, without offering much by way of light; your best bet is to find
-out what those around you are using, and to go with the crowd. Later
-on, you can always switch your allegiance; don't bother about it.
+heat, without offering much by way of light; your best bet may be to
+find out what those around you are using, and to follow them in the
+hope of some support. Later on, you can always switch your
+allegiance; don't bother about it.
If you are preparing a manuscript for a publisher or journal, ask them
what markup they want before you
@@ -583,9 +772,7 @@ prodigious energy. Support is available via a % ! line break
\item[\nothtml{\rmfamily}\CONTeXT{} distribution]\CTANref{context}
\end{ctanrefs}
-\nothtml{\begingroup\ifboldmathavail\boldmath\fi}
\Question[Q-AMSpkg]{What are the \acro{AMS} packages (\AMSTeX{}, \emph{etc}.)?}
-\nothtml{\afterquestion}
\AMSTeX{} is a \TeX{} macro package, originally written by Michael Spivak for
the American Mathematical Society (\acro{AMS}) during 1983--1985 and
@@ -599,14 +786,12 @@ numbering, ellipsis dots, matrices, double accents, multi-line
subscripts, syntax checking (faster processing on initial
error-checking \TeX{} runs), and other things.
-As \LaTeX{} increased in popularity, authors asked to submit papers to
-the \acro{AMS} in \LaTeX{}, and so the \acro{AMS} developed
-\AMSLaTeX{}, which is a
-collection of \LaTeX{} packages and classes that offer authors most of
+As \LaTeX{} increased in popularity, authors sought to submit papers to
+the \acro{AMS} in \LaTeX{}, so \AMSLaTeX{} was developed. \AMSLaTeX{}
+is a collection of \LaTeX{} packages and classes that offer authors most of
the functionality of \AMSTeX{}.
The \acro{AMS} no longer recommends the use of \AMSTeX{}, and urges
-its users to use \AMSLaTeX{} instead.
-\checked{RAB}{1994/11/12} % edited by RF; input from Michael Downes, too
+its authors to use \AMSLaTeX{} instead.
\begin{ctanrefs}
\item[\nothtml{\rmfamily}\AMSTeX{} distribution]\CTANref{amstex}
\item[\nothtml{\rmfamily}\AMSLaTeX{} distribution]\CTANref{amslatex}
@@ -617,9 +802,10 @@ its users to use \AMSLaTeX{} instead.
The \href{http://tug.org/eplain}{\Eplain{}}
macro package expands on and extends the definitions in \plaintex{}.
\Eplain{} is not intended to provide ``generic typesetting
-capabilities'', as do \LaTeX{} or \Qref*{Texinfo}{Q-texinfo}. Instead, it
-defines macro tools that should be useful whatever commands you choose
-to use when you prepare your manuscript.
+capabilities'', as do \CONTeXT{}, \LaTeX{} or
+\Qref*{Texinfo}{Q-texinfo}. Instead, it defines macro tools that
+should be useful whatever commands you choose to use when you prepare
+your manuscript.
For example, \Eplain{} does not have a command \csx{section},
which would format section headings in an ``appropriate'' way, as
@@ -632,9 +818,9 @@ of luck.
On the other hand, almost everyone would like capabilities such as
cross-referencing by labels, so that you don't have to put actual page
-numbers in the manuscript. The authors of \Eplain{} are not aware of
-any generally available macro packages that do not force their
-typographic style on an author, and yet provide such capabilities.
+numbers in the manuscript. The authors of \Eplain{} believe it is the
+only generally available macro package that does not force its
+typographic style on an author, and yet provides these such capabilities.
Another useful feature of \Eplain{} is the ability to create PDF files
with hyperlinks. The cross-referencing macros can implicitly generate
@@ -757,16 +943,18 @@ he will continue to fix any bugs that are reported to him (though
bugs are rare). This decision was made soon after
\TeX{} version~3.0 was released; at each bug-fix release
the version number acquires one more digit, so that it tends to the
-limit~\ensuremath{\pi} (at the time of writing, Knuth's latest release is version
-3.141592). Knuth wants \TeX{} to be frozen at version~\ensuremath{\pi} when he
-dies; thereafter, no further changes may be made to Knuth's source.
-(A similar rule is applied to \MF{}; its version number tends to the
-limit~\ensuremath{e}, and currently stands at 2.71828.)
+limit~\ensuremath{\pi} (at the time of writing, Knuth's latest release
+is version 3.1415926). Knuth wants \TeX{} to be frozen at
+version~\ensuremath{\pi} when he dies; thereafter, no further changes
+may be made to Knuth's source. (A similar rule is applied to \MF{};
+its version number tends to the limit~\ensuremath{e}, and currently
+stands at 2.718281.)
Knuth explains his decision, and exhorts us all to respect it, in a
-paper originally published in \TUGboat{} 11(4) (and reprinted in the
-% ! line break
-\href{http://www.ntg.nl/maps/pdf/5_34.pdf}{NTG journal MAPS}).
+paper originally published in % ! line break
+\href{http://tug.org/TUGboat/Articles/tb11-4/tb30knut.pdf}{\TUGboat{} 11(4)},
+and reprinted in the % ! line break
+\href{http://www.ntg.nl/maps/pdf/5_34.pdf}{NTG journal MAPS}.
There are projects (some of them long-term
projects: see, for example,
@@ -976,7 +1164,9 @@ other books covering \TeX{}:
Krantz (CRC Press, 1994, \ISBN{0-849-37159-7})
\item[\TeX{} by Topic]by Victor Eijkhout (Addison-Wesley, 1992,
\ISBN{0-201-56882-9}~--- now out of print, but see
- \Qref[question]{online books}{Q-ol-books})
+ \Qref[question]{online books}{Q-ol-books}; you can now buy a copy
+ printed, on demand, by Lulu~--- see
+ \url{http://www.lulu.com/content/2555607})
\item[\TeX{} for the Beginner]by Wynter Snow (Addison-Wesley, 1992,
\ISBN{0-201-54799-6})
\item[\TeX{} for the Impatient]by Paul W.~Abrahams, Karl Berry and
@@ -1208,13 +1398,14 @@ Other non-English \acro{FAQ}s are available (off-\acro{CTAN}):
\item[German]Posted regularly to \Newsgroup{de.comp.tex}, and archived
on \acro{CTAN}; the \acro{FAQ} also appears at
\URL{http://www.dante.de/faq/de-tex-faq/}
-\item[French]An interactive (full-screen!) FAQ may be found at
- \URL{http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf}, and a copy
- for printing at \URL{http://frenchle.free.fr/FAQ.pdf};
+\item[French]%
+%% An interactive (full-screen!) FAQ may be found at
+%% \URL{http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf}, and a copy
+%% for printing at \URL{http://frenchle.free.fr/FAQ.pdf};
A FAQ used to be posted regularly to
\Newsgroup{fr.comp.text.tex}, and is archived on \acro{CTAN}~---
sadly, that effort seems to have fallen by the wayside.
-\item[Spanish]See \URL{http://apolo.us.es/CervanTeX/FAQ/}
+%% \item[Spanish]See \URL{http://apolo.us.es/CervanTeX/FAQ/}
\item[Czech]See \URL{http://www.fi.muni.cz/cstug/csfaq/}
\end{booklist}
@@ -1238,8 +1429,8 @@ don't know what to do.
If you are seeking a particular package or program, look on your own
system first: you might already have it~--- the better \TeX{}
distributions contain a wide range of supporting material. The
-\acro{CTAN} Catalogue can also help: you can
-\href{http://www.tex.ac.uk/search}{search it}, or you can browse it
+\acro{CTAN} Catalogue can also identify packages that might help: you
+can \href{http://www.tex.ac.uk/search}{search it}, or you can browse it
% !!!! line break
``\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/bytopic.html}{by topic}''.
A catalogue entry has a brief description of the package, and links to
@@ -1359,6 +1550,12 @@ application of your own common sense.
needs your local \Class{xyzthesis} class, or some other resource
not generally available, be sure to include a pointer to how the
resource can be obtained.
+\item Figures are special, of course. Sometimes the figure itself is
+ \emph{really} needed, but most problems may be demonstrated with a
+ ``figure substitute'' in the form of a
+ \cmdinvoke*{rule}{width}{height} command, for some value of
+ \meta{width} and \meta{height}. If the (real) figure is needed,
+ don't try posting it: far better to put it on the web somewhere.
\item Be as succinct as possible. Your helpers don't usually need to
know \emph{why} you're doing something, just \emph{what} you're
doing and where the problem is.
@@ -1490,12 +1687,17 @@ available on the web at \URL{http://www.ntg.nl/doc/wilkins/pllong.pdf}
\Question[Q-man-latex]{Online introductions: \LaTeX{}}
+A pleasing little document, ``Getting something out of \LaTeX{}'' is
+designed to give a feel of \LaTeX{} to someone who's never used it at
+all. It's not a tutorial, merely helps the user to decide whether to
+go on to a tutorial, and to `real' use of \LaTeX{}.
+
Tobias Oetiker's `(Not so) Short Introduction to \LaTeXe{}', is
regularly updated, as people suggest better ways of explaining things,
etc. The introduction is available on \acro{CTAN}, together with
translations into a rather large set of languages.
-Peter Flynn's ``Beginner's \LaTeX{}'' (which also started as course
+Peter Flynn's ``Beginner's \LaTeX{}'' (which started life as course
material) is a pleasing read. A complete copy may be found on
\acro{CTAN}, but it may also be browsed over the web
(\URL{http://www.tex.ac.uk/tex-archive/info/beginlatex/html/}).
@@ -1543,6 +1745,7 @@ tutorial is available from \acro{CTAN} as a \acro{PDF} file (though
the source is also available).
\begin{ctanrefs}
\item[\nothtml{\rmfamily}Beginner's \LaTeX{}]\CTANref{beginlatex-pdf}
+\item[\nothtml{\rmfamily}First \LaTeX{} document]\CTANref{first-latex-doc}
\item[\nothtml{\rmfamily}Not so Short Introduction]\CTANref{lshort}
(in English, you may browse for sources and other language versions at
\CTANref{lshort-parent})
@@ -1559,8 +1762,9 @@ The \acro{AMS} publishes a ``Short Math Guide for \LaTeX{}'', which is
available (in several formats) via
\URL{http://www.ams.org/tex/short-math-guide.html}
-Herbert Vo\ss{} is developing a parallel document, that is also very
-useful; it's part of his ``\Qref*{tips and tricks}{Q-doc-dirs}'' and
+Herbert Vo\ss{} has written an extensive guide to mathematics in
+\LaTeX{} (a German version of which is published as a book). The
+guide is part of his ``\Qref*{tips and tricks}{Q-doc-dirs}'' and
a copy is maintained on \acro{CTAN}.
%\URL{http://www.perce.de/LaTeX/math/Mathmode-TeX.pdf}
@@ -1594,7 +1798,7 @@ soon'').
Kjell Magne Fauske offers a set of examples of the use of the drawing
packages % ! line break
\Qref*{\acro{PGF} and \acro{T}ik\acro{Z}}{Q-drawing}; the % ! line break
-\href{http://www.fauskes.net/pgftikzexamples/}{examples catalogue}
+\href{http://www.texample.net/tikz/examples/}{examples catalogue}
includes examples (with output) from the package documentation as well
as code written by the author himself.
@@ -1677,14 +1881,26 @@ description, which includes page references to the \TeX{}book.
There doesn't seem to be a reference that takes in \plaintex{} as
well as the primitive commands.
+An interesting \LaTeX{} ``cheat sheet'' is available from \acro{CTAN}:
+it's a list of (more or less) everything you `ought to' remember, for
+basic \LaTeX{} use. (It's laid out very compactly for printing on N.\
+American `letter'; printed on \acro{ISO} \acro{A}4, it strains aged eyes\dots{})
+
Similarly, there's no completely reliable command-organised reference
-to \LaTeX{}, but the NASA % ! line break
+to \LaTeX{}. The page (provided by NASA) % ! line break
\href{http://www.giss.nasa.gov/latex/}{Hypertext Help with LaTeX} is
recently much improved. It still talks in \LaTeXo{}-isms in places,
-but it's been updated for current \LaTeX{}; there are a number of
+but it's been updated for current \LaTeX{}. There are a number of
mirrors of the site, and it may be worth choosing a ``local'' one if
you're going to use it a lot.
+Another \LaTeXe{} reference (provided by the Emerson Center of Emory
+University) is: % ! line break
+\href{http://www.emerson.emory.edu/services/latex/latex2e/latex2e_toc.html}{LaTeXe help}
+\begin{ctanrefs}
+\item[\nothtml{\rmfamily}Cheat sheet]\CTANref{latexcheat}
+\end{ctanrefs}
+
\Question[Q-doc-wiki]{WIKI pages for \TeX{} and friends}
The \emph{WIKI} concept can be a boon to everyone, if used sensibly.
@@ -1694,18 +1910,20 @@ for chaos, there is evidence that a strong user community can keep a
WIKI under control.
Following the encouraging performance of the % ! line break
-\href{http://contextgarden.net/}{\CONTeXT{} WIKI}, both a
-\href{http://en.wikibooks.org/wiki/TeX}{(Plain) \TeX{} WIKI} and a
-\href{http://en.wikibooks.org/wiki/LaTeX}{\LaTeX{} WIKI} have been
-established. Both seem rather sparse, as yet, and the \LaTeX{} WIKI
-contains some suggestions that go counter to established advice (e.g.,
-the \LaTeX{} WIKI has details on the % ! line break
-\Qref*{use of the \environment{eqnarray} environment}{Q-eqnarray});
-however one may hope that both will become useful resources in the
-longer term.
+\href{http://contextgarden.net/}{\CONTeXT{} WIKI}, valiant efforts
+have been made generating ``WIKI books'' for \AllTeX{} users. Thus we
+have \href{http://en.wikibooks.org/wiki/TeX}{(Plain) \TeX{} WIKI} and
+\href{http://en.wikibooks.org/wiki/LaTeX}{\LaTeX{} WIKI} are well
+established. Neither would seem yet to be of publication quality, but
+they both seem useful reference sources.
\Question[Q-typo-style]{Typography tutorials}
+Peter Wilson's manual for his \Class{memoir} class has a lengthy
+introductory section on typographic considerations, which is a fine
+tutorial, written by someone who is aware of the issues as they apply
+to \AllTeX{} users.
+
There's also (at least one) typographic style tutorial available on
the Web, the excellent % ! line break
``\href*{http://www.nbcs.rutgers.edu/~hedrick/typography/typography.janson-syntax.107514.pdf}{Guidelines for Typography in NBCS}''.
@@ -1718,11 +1936,6 @@ ambition to supplant such excellent books as
\Qref*{Bringhurst's}{Q-typebooks}, but the document (though it does
contain its Rutgers-local matter) is a fine introduction to the issues
of producing readable documents.
-
-Peter Wilson's manual for his \Class{memoir} class has a lengthy
-introductory section on typographic considerations, which is a fine
-tutorial, written by someone who is aware of the issues as they apply
-to \AllTeX{} users.
\begin{ctanrefs}
\item[memoir \nothtml{\rmfamily}distribution]\CTANref{memoir}
\end{ctanrefs}
@@ -1746,7 +1959,10 @@ the web, and until relatively recently this demand went un-answered.
The first to appear was Victor Eijkhout's excellent ``\TeX{} by
Topic'' in 2001 (it had been published by Addison-Wesley, but was long
out of print). The book is now available on \acro{CTAN}; it's not a
-beginner's tutorial but it's a fine reference.
+beginner's tutorial but it's a fine reference. It's also available,
+as a printed copy, via the on-line publishers
+\href{http://www.lulu.com/content/2555607/}{Lulu} (not quite free, of
+course, but not a \emph{bad} deal\dots{}).
Addison-Wesley have also released the copyright of ``\TeX{} for the
Impatient'' by Paul W.~Abrahams, Karl Berry and Kathryn A.~Hargreaves,
@@ -1784,9 +2000,9 @@ distributions, the \ProgName{texdoc} command often helps, as in:
texdoc footmisc
\end{verbatim}
\end{quote}
-which opens a \acro{DVI} viewer window showing documentation of the
+which opens a window showing documentation of the
\Package{footmisc} package. According to the type of file
-\ProgName{texdoc} finds, it will launch a \acro{DVI} or \PS{} viewer
+\ProgName{texdoc} finds, it will launch a \acro{DVI} viewer
or a \acro{PDF} reader.
If \ProgName{texdoc} can't find any documentation, it may launch a Web
@@ -1862,9 +2078,12 @@ knowledge it is possible to use the documented source of \LaTeX{} as
reference material (dedicated authors will acquaint themselves with the
source as a matter of course). A complete set of the documented
source of \LaTeX{} may be prepared by processing the file
-\File{source2e.tex} in the \LaTeX{} distribution, but individual files
-in the distribution may be processed separately with \LaTeX{}, like
-any well-constructed \Qref*{\extension{dtx} file}{Q-dtx}.
+\File{source2e.tex} in the \LaTeX{} distribution. Such processing is
+noticeably tedious, but Heiko Oberdiek has prepared a well-linked
+\acro{PDF} version, which is in the file \File{base.tds.zip} of his
+\ProgName{latex-tds} distribution. Individual files in the \LaTeX{}
+distribution may be processed separately with \LaTeX{}, like any
+well-constructed \Qref*{\extension{dtx} file}{Q-dtx}.
Writing good classes is not easy; it's a good idea to read some
established ones (\File{classes.dtx}, for example, is the documented
@@ -1882,6 +2101,7 @@ understanding \File{classes.dtx}
\begin{ctanrefs}
\item[classes.dtx]\CTANref{latex-classes}
\item[clsguide.pdf]\CTANref{clsguide}
+\item[latex-tds \nothtml{rmfamily}collection]\CTANref{latex-tds}
\item[ltxguide.cls]\CTANref{ltxguide}
\item[\nothtml{\rmfamily}\LaTeX{} documentation]\CTANref{latexdoc}
\item[source2e.tex]\CTANref{latex-source}
@@ -1934,7 +2154,6 @@ written more as a document, and presented in \acro{PDF}.
\begin{ctanrefs}
\item[\nothtml{\rmfamily}Beginners' guide]\CTANref{mf-beginners}
\item[\nothtml{\rmfamily}Peter Wilson's ``experiences'']\CTANref{metafp-pdf}
- (\acro{PDF} format)
\item[\nothtml{\rmfamily}Vincent Zoonekynd's examples]\CTANref{zoon-mp-eg}
\end{ctanrefs}
@@ -1964,8 +2183,6 @@ may also be found on \acro{CTAN}. A summary and \acro{FAQ}
recommended.
\begin{ctanrefs}
\item[\nothtml{\rmfamily}\BibTeX{} documentation]\CTANref{bibtex-doc}
-\item[\nothtml{\rmfamily}\BibTeX{} documentation, in \acro{PDF}]%
- \CTANref{bibtex-doc-pdf}
\item[btxFAQ.pdf]\CTANref{bibtex-faq}
\item[\nothtml{\rmfamily}Tame the BeaST]\CTANref{ttb-pdf}
\end{ctanrefs}
@@ -1980,7 +2197,7 @@ of which are not shown (or even mentioned) in \AllTeX{} books.
\emph{The Comprehensive \LaTeX{} Symbol List} (by Scott Pakin
% beware line wrap
\emph{et al.}\@) illustrates over 2000 symbols, and details the
-commands and packages needed to produce them.
+commands and the \LaTeX{} packages needed to produce them.
Other questions in this \acro{FAQ} offer specific help on kinds of
symbols:
@@ -2164,6 +2381,71 @@ fonts (it uses \TeX{} to parse a description of the virtual font, and
\item[qdtexvpl]\CTANref{qdtexvpl}
\end{ctanrefs}
+\Question[Q-whatmacros]{What are (\TeX{}) macros}
+
+\TeX{} is a \emph{macro processor}: this is a computer-science-y term
+meaning ``text expander'' (more or less); \TeX{} typesets text as it
+goes along, but \emph{expands} each macro it finds. \TeX{}'s macros
+may include instructions to \TeX{} itself, on top of the simple text
+generation one might expect.
+
+Macros are a \emph{good thing}, since they allow the user to
+manipulate documents according to context. For example, the macro
+\csx{TeX} is usually defined to produce ``TEX'' with the `E' lowered,
+but in these \acro{FAQ}s the default definition of the macro is
+overridden, and it simply expands to the letters ``TeX''. (\emph{You}
+may not think this a good thing, but the author of the macros has his
+reasons~-- see \Qref[question]{\TeX{}-related logos}{Q-logos}.)
+
+Macro names are conventionally built from a \texttt{\textbackslash }
+followed by a sequence of letters, which may be upper or lower case
+(as in \csx{TeX}, mentioned above). They may also be % ! line break
+\texttt{\textbackslash \meta{any single character}}, which allows all
+sorts of oddities (many built in to most \TeX{} macro sets, all the
+way up from the apparently simple `\csx{ }' meaning ``insert a space
+here'').
+
+Macro programming can be a complicated business, but at their very
+simplest they need little introduction~--- you'll hardly need to be
+told that:
+\begin{quote}
+\begin{verbatim}
+\def\foo{bar}
+\end{verbatim}
+\end{quote}
+replaces each instance of \csx{foo} with the text ``bar''. The
+command \csx{def} is \plaintex{} syntax for defining commands;
+\LaTeX{} offers a macro \csx{newcommand} that goes some way towards
+protecting users from themselves, but basically does the same thing:
+\begin{quote}
+\begin{verbatim}
+\newcommand{\foo}{bar}
+\end{verbatim}
+\end{quote}
+Macros may have ``arguments'', which are used to substitute for marked
+bits of the macro expansion:
+\begin{quote}
+\begin{verbatim}
+\def\foo#1{This is a #1 bar}
+...
+\foo{2/4}
+\end{verbatim}
+\end{quote}
+or, in \LaTeX{} speak:
+\begin{quote}
+\begin{verbatim}
+\newcommand{\foo}[1]{This is a #1 bar}
+...
+\foo{3/4}
+\end{verbatim}
+\end{quote}
+Macro writing can get very complicated, very quickly. If you are a
+beginner \AllTeX{} programmer, you are well advised to read something
+along the lines of the \Qref*{\TeX{}book}{Q-books}; once you're under
+way, \Qref*{\TeX{} by Topic}{Q-ol-books} is possibly a more satisfactory
+choice. Rather a lot of the answers in these \acro{FAQ}s tell you
+about various issues of how to write macros.
+
\Question[Q-specials]{\csx{special} commands}
\TeX{} provides the means to express things that device drivers can
@@ -2213,8 +2495,10 @@ to a single language at a single locale needs to be able to change its
hyphenation rules from time to time.
\TeX{} uses a pretty good system for hyphenation (originally designed
-by Frank Liang), and while it's capable of missing ``sensible''
-hyphenation points, it seldom selects grossly wrong ones. The
+by Frank Liang~--- you may view his % ! line break
+\href{http://tug.org/docs/liang/}{Ph.D.\ thesis online}), and while
+it's capable of missing ``sensible'' hyphenation points, it seldom
+selects grossly wrong ones. The
algorithm matches candidates for hyphenation against a set of
``hyphenation patterns''. The candidates for hyphenation must be
sequences of letters (or other single characters that \TeX{} may be
@@ -2526,10 +2810,10 @@ available on \acro{CTAN}.
\item[\nothtml{\rmfamily}\acro{TDS} specification]\CTANref{tds}
\end{ctanrefs}
-\Question[Q-eps]{What is ``Encapsulated \PS{}'' (``\acro{EPS}'')}
+\Question[Q-eps]{What is ``Encapsulated \PS{}'' (``\acro{EPS}'')?}
\PS{} has been for many years a \emph{lingua franca} of powerful
-printers (modern high-quality printers now tend to require some
+printers (though modern high-quality printers now tend to require some
constrained form of Adobe Acrobat, instead); since \PS{} is also a
powerful graphical programming language, it is commonly used as an
output medium for drawing (and other) packages.
@@ -2617,7 +2901,7 @@ change colour within a Type~1 font glyph, but there's no such
restriction on a Type~3 font, which opens opportunities for some
startling effects.
-\Question[Q-resolns]{What are ``resolutions''}
+\Question[Q-resolns]{What are ``resolutions''?}
``Resolution'' is a word that is used with little concern for its
multiple meanings, in computer equipment marketing. The word suggests
@@ -2671,7 +2955,7 @@ One commonly-used approach is to declare a resolution of 8000 (``better
than any device''), and this is reasonably successful though it does
have its \Qref*{problems}{Q-8000}.
-\Question[Q-fontname]{What is the ``Berry naming scheme''}
+\Question[Q-fontname]{What is the ``Berry naming scheme''?}
In the olden days, \AllTeX{} distributions were limited by the
feebleness of file systems' ability to represent long names. (The
@@ -2757,8 +3041,9 @@ To access a particular thing through the \texttt{mirror.ctan.org}
mechanism, simply place the \acro{CTAN} path after the base
\acro{URL}; so
\URL{http://mirror.ctan.org/macros/latex/contrib/footmisc/} will
-connect you to the \Package{footmisc} directory~--- note that the
-\File{tex-archive} part of the \acro{CTAN} path isn't needed.
+connect you to the \Package{footmisc} directory at some \acro{CTAN}
+site~--- note that the \File{tex-archive} part of the \acro{CTAN} path
+isn't needed.
For details of how to find files at \acro{CTAN} sites, see
``\Qref*{finding \AllTeX{} files}{Q-findfiles}''.
@@ -2767,25 +3052,31 @@ The \TeX{} user who has no access to any sort of
network may buy a copy of the archive as part of the
\Qref*{\texlive{} distribution}{Q-CD}.
-\Question[Q-tds-zip]{Prebuilt installation files on the archive}
+\Question[Q-tds-zip]{Ready-built installation files on the archive}
The \Qref*{\acro{TDS}}{Q-tds} is a simple structure, and almost all
files can be installed simply by putting them in the ``right'' place,
and updating a single index. (Note, this simple idea typically
doesn't work for fonts, unless they're distributed as \MF{} source.)
-The CTAN network is therefore acquiring ``\acro{TDS-ZIP}'' files,
+The CTAN network is therefore acquiring ``\acro{TDS}-\acro{ZIP}'' files,
which have a built-in directory structure that matches the \acro{TDS}.
These files have to be built, and the \acro{CTAN} team has asked that
package authors supply them (the team will advise, of course, if the
-author has trouble). Everyone hopes that the extra work involved will
-contrinute to happier lives for package users, which in turn must
-surely help keep the TeX community lively and active.
+author has trouble). The \acro{CTAN} team hopes that the extra work
+involved will contribute to happier lives for package users, which in
+turn must surely help keep the TeX community lively and active.
+
+At the time of writing, there are rather few \extension{tds.zip}
+files (by comparison with the huge number of packages that are
+available). As packages are updated, the number of files is
+steadily increasing, but it will be a long time before the whole set
+is covered.
Use of the files is discussed in % ! line break
-``\Qref*{installing using preformatted \acro{ZIP} files}{Q-inst-tds-zip}''.
+``\Qref*{installing using ready-built \acro{ZIP} files}{Q-inst-tds-zip}''.
-\Question[Q-nonfree]{What's the \acro{CTAN} \texttt{nonfree} tree?}
+\Question[Q-nonfree]{What is the \acro{CTAN} \texttt{nonfree} tree?}
When \acro{CTAN} was founded, in the 1990s, it was unusual to publish
the terms under which a \TeX{}-related package was distributed (or, at
@@ -2806,7 +3097,7 @@ From the start, the \texttt{nonfree} tree was controversial: the terms
under which a package would be placed on the tree were hotly
contested, and the \acro{CTAN} team were only able slowly to populate
the tree. It is now obvious to the team that the project would never
-be completed.
+have been completed.
The \acro{CTAN} catalogue now records the nature of the licences of a
good proportion of the packages it describes (though there remain
@@ -2819,44 +3110,24 @@ the general rule for distributors has become
whether you should distribute; if the package is not listed in the
catalogue, don't think of distributing it''.
\end{quote}
-
(The catalogue only has a modest % ! line break
\CTANhref{cat-licences}{list of licences}, but it covers the set used
by packages on \acro{CTAN}, with a wild-card ``\texttt{other-free}''
which covers packages that the \acro{CTAN} administrators believe to
be free even though the authors haven't used a standard licence.)
+There is a corollary to the `general rule': if you notice something
+that ought to be in the distributions, for which there is no catalogue
+entry, please let the \acro{CTAN} team (\mailto{ctan@dante.de}) know.
+It may well be that the package has simply been missed, but some aren't
+catalogued because there's no documentation and the team just doesn't
+understand the package.
+
In the light of the above, the \texttt{nonfree} tree is being
-dismantled, and its contents moved to the main \acro{CTAN} tree. So
-the answer to the question is, now, ``the nonfree tree is a part of
-\acro{CTAN}, and is now being merged with the main tree''.
-
-
-% The \acro{CTAN} archives are currently restructuring their holdings
-% so that files that are `not free' are held in a separate tree. The
-% definition of what is `free' (for this purpose) is influenced by, but
-% not exactly the same as the
-% \begin{narrowversion} % really non-hyper version
-% Debian Free Software Guidelines (\acro{DFSG}: see
-% \URL{http://www.debian.org/social_contract#guidelines}).
-% \end{narrowversion}
-% \begin{wideversion}
-% % don't let the line wrap...
-% \href{http://www.debian.org/social_contract#guidelines}{Debian Free Software Guidelines (\acro{DFSG})}.
-% \end{wideversion}
-
-% Material is placed on the \texttt{nonfree} tree if it is not
-% freely-usable (e.g., if the material is shareware, commercial, or if
-% its usage is not permitted in certain domains at all, or without
-% payment). Users of the archive should check that they are entitled to
-% use material they have retrieved from the \texttt{nonfree} tree.
-
-% The Catalogue (one of the prime sources for finding \TeX{}-related
-% material via \nothtml{web search~--- }%
-% \Qref{web search}{Q-findfiles}) lists the licence details in each
-% entry in its lists.
-% For details of the licence categories, see its % !line break
-% \href{http://www.tex.ac.uk/tex-archive/help/Catalogue/licenses.html}{list of licences}.
+dismantled, and its contents moved (or moved \emph{back}) to the main
+\acro{CTAN} tree. So the answer to the question is, now, ``the
+nonfree tree is a part of \acro{CTAN}, and is now being merged with
+the main tree''.
\Question[Q-uploads]{Contributing a file to the archives}
@@ -3089,13 +3360,19 @@ see \Qref{}{Q-commercial} for details of commercial packages.
\Qref*{\TeX{} collection}{Q-CD}.
Members of many \TeX{} user groups receive copies of the collection
- (on \acro{CD} and \acro{DVD}), as part of their membership of the
- groups.
+ (on \acro{DVD}), as part of their membership of the groups.
MacOS/X is also a Unix-based system; however users should refer to
the information below, under item ``Mac''.
+
+ \texlive{} may also be installed ``over the network''; a network
+ installer is provided, and once you have a system, a manager
+ (\ProgName{tlmgr}) can both keep your installation up-to-date and
+ add packages you didn't install at first.
+
\begin{ctanrefs}
\item[texlive]Browse \CTANref{texlive}
+ \item[texlive installer (Unix)]\CTANref{texlive-unix}
\end{ctanrefs}
\item[Linux] GNU/Linux users are supported by \texlive{} (as noted
above).
@@ -3106,19 +3383,37 @@ see \Qref{}{Q-commercial} for details of commercial packages.
production of \acro{PDF} from \AllTeX{} input. Sadly, it's no
longer supported, and the ready-built images are made for use with a
rather ancient Linux kernel.
+
+ For the future, the \miktex{} developer intends to release a version
+ of that excellent (Windows) system for use on Linux; a beta version
+ is available via \href{http://miktex.org/unx/}{the \miktex{} site}.
\begin{ctanrefs}
\item[texlive]Browse \CTANref{texlive}
\item[vtex]\CTANref{vtex-linux}
\item[vtex \nothtml{\rmfamily}required common files]\CTANref{vtex-common}
\end{ctanrefs}
-\item[\acro{PC}: Windows post-95]
+\item[\acro{PC}: Windows]
\miktex{}, by Christian Schenk, is a comprehensive distribution. It has
its own previewer, \acro{YAP}, which is itself capable of printing,
though the distribution also includes a port of \ProgName{dvips}.
The current version is available for file-by-file download (the
- \acro{HTML} files in the directory offer hints
- on what you need to get going). The \miktex{} developers provide a
- ready-to-run copy of the distribution, on \acro{CD} (for purchase) via the
+ \acro{HTML} files in the directory offer hints on what you need to
+ get going). \miktex{} can automatically install packages that it
+ ``knows about'', but that aren't in your system (it gets them over
+ the network). Furthermore, users may keep their installation
+ up-to-date, over the network: the distribution contains a ``package
+ manager'', through which the user may select individual packages, or
+ request that every extant update be retrieved.
+
+ \miktex{} may also be used in a configuration which involves no
+ installation at all: its ``portable'' distribution may be unpacked
+ on a memory stick, and used on any windows computer without making
+ any direct use of the hard drive. This is the first ``official''
+ release of such a setup, though a similar object has been available
+ on the net for some time.
+
+ The \miktex{} developers also provide a ready-to-run copy of the
+ distribution, on \acro{CD} (for purchase) via the % ! line break
\href{http://www.miktex.org/cd/}{\miktex{} web site}; otherwise the
\File{setup} executable is available on \acro{CTAN}, together with
all the optional packages.
@@ -3132,8 +3427,8 @@ see \Qref{}{Q-commercial} for details of commercial packages.
Windows users are also supported directly by the \texlive{}
distribution; a system is provided on the installation disc of the
- \TeX{} collection (and it can, with some difficulty, be run ``from
- the disc'' without installing \emph{anything}).
+ \TeX{} collection. The system may also be installed over the
+ network, using an installer application tailored for use with Windows.
\href{http://foundry.supelec.fr/projects/xemtex/}{XEm\TeX{}}, by
Fabrice Popineau (he who created the excellent, but now defunct,
@@ -3174,9 +3469,11 @@ see \Qref{}{Q-commercial} for details of commercial packages.
\item[miktex]Acquire \CTANref{miktex-setup} (also available from the
\miktex{} web site), and read installation instructions from %
% ! line break
- \href{http://www.miktex.org/2.5/Setup.aspx}{the \miktex{} installation page}
+ \href{http://www.miktex.org/2.7/setup}{the \miktex{} installation page}
+ \item[\nothtml{\bgroup\rmfamily}Portable\nothtml{\egroup} miktex]\CTANref{miktex-portable}
\item[protext.exe]\CTANref{protext}
- \item[tetex]\CTANref{tetex}
+ \item[texlive]Browse \CTANref{texlive}
+ \item[texlive installer (Windows)]\CTANref{texlive-windows}
\end{ctanrefs}
\item[\acro{PC}: \MSDOS{} or \acro{OS/}2] Em\TeX{}, by Eberhard Mattes,
includes \LaTeX{}, \BibTeX{}, previewers, and drivers, and is
@@ -3303,20 +3600,21 @@ There are good \TeX{}-writing environments and editors for most
operating systems; some are described below, but this is only a
personal selection:
\begin{description}
-\item[Unix] Try
+\item[Unix] The commonest choices are \ProgName{[X]Emacs} or
+ \ProgName{vim}, though several others are available.
+
\href{http://www.gnu.org/software/emacs/emacs.html}{\acro{GNU}\nobreakspace\ProgName{emacs}}
- or \href{http://www.xemacs.org/}{\ProgName{XEmacs}}, and
- the \acro{AUC}-\TeX{}
+ and \href{http://www.xemacs.org/}{\ProgName{XEmacs}} are supported
+ by the \acro{AUC}-\TeX{}
bundle (available from \acro{CTAN}). \acro{AUC}-\TeX{} provides menu
items and control sequences for common constructs, checks syntax,
lays out markup nicely, lets you call \TeX{} and drivers from
within the editor, and everything else like this that you can think
of. Complex, but very powerful.
- Many who consider the versions of \ProgName{emacs} spawn of the devil, prefer
- \href{http://vim.sourceforge.net}{\ProgName{vim}}, a highly configurable
- editor (also available for Windows and Macintosh systems). Many
- plugins are available to support the needs of the \AllTeX{} user,
+ \href{http://vim.sourceforge.net}{\ProgName{Vim}} is also highly
+ configurable (also available for Windows and Macintosh systems).
+ Many plugins are available to support the needs of the \AllTeX{} user,
including syntax highlighting, calling \TeX{} programs,
auto-insertion and -completion of common \AllTeX{} structures, and
browsing \LaTeX{} help. The scripts \File{auctex.vim} and
@@ -3371,13 +3669,20 @@ personal selection:
works with MacOS~X.
For MacOS~X users, the free tool of choice appears to be
- \href{http://www.uoregon.edu/~koch/texshop/texshop.html}{TeXShop}, which
+ \href{http://www.uoregon.edu/~koch/texshop/texshop.html}{\texshop{}}, which
combines an editor and a shell with a coherent philosophy of dealing
with \AllTeX{} in the OS~X environment. TeXShop is distributed as
part of the MacTeX system, and will therefore be available out of
the box on machines on which MacTeX has been installed.
\ProgName{Vim} is also available for use on Macintosh systems.
+\item[Wildcard] \acro{TUG} is sponsoring the development of a
+ cross-platform editor and shell, modelled on the excellent
+ \texshop{} for the Macintosh. While this program,
+ \href{http://www.tug.org/texworks/}{\texworks{}}, is still under
+ development, it is already quite usable: if you're looking for a
+ \AllTeX{} development environment, and are willing to step beyond
+ the boundaries, it may be for you.
\end{description}
Atari, Amiga and \acro{N}e\acro{XT} users also have nice
environments. \LaTeX{} users looking for \ProgName{make}-like
@@ -3508,7 +3813,7 @@ also have email, and normal telephone and fax support.
Source: Mail from Christopher Mabb, August 2007
\item[Macintosh; Textures] ``A \TeX{} system `for the rest of
us'\,''. A beta release of Textures for MacOS/X is
- available \URL{http://www.bluesky.com/news/220b.html}
+ available~--- see \URL{http://www.bluesky.com/news/news_frames.html}
(Blue Sky also gives away a \MF{} implementation and some
font manipulation tools for Macs.)
@@ -3653,9 +3958,10 @@ source~--- not everything that you can write in \AllTeX{} can be
translated to \acro{HTML} (at least, portable \acro{HTML} that may be
viewed in `most' browsers), so the commonest avoiding action is to
generate a bitmap of the missing bit. Examples are maths (a maths
-extension to the |*|\acro{ML} family is available but not widely
-used), and `exotic' typescripts (ones that you cannot guarantee your
-readers will have available). Other common examples are generation of
+extension to the `|*|\acro{ML}' family is available but not
+universally supported by browsers), and `exotic' typescripts (ones
+that you cannot guarantee your readers will have available). Other
+common examples are generation of
sample bitmaps, and generation for insertion into some other
application's display~--- to insert equations into Microsoft
PowerPoint, or to support the enhanced-\ProgName{emacs} setup called
@@ -3691,21 +3997,30 @@ for speed.
\section{Support Packages for \TeX{}}
-\Question[Q-fig]{Fig, a \AllTeX{}-friendly drawing package}
+\Question[Q-figetc]{\AllTeX{}-friendly drawing packages}
+\AliasQuestion{Q-xfig}
\ProgName{(X)Fig} is a menu driven tool that allows you to
draw objects on the screen of an \acro{X} workstation; \ProgName{transfig}
is a set of tools which translate the code \ProgName{fig}. The list
of export formats is very long, and includes \MF{} and \MP{},
Encapsulated \PS{} and \acro{PDF}, as well as combinations that wrap
-a graphics format in a \LaTeX{} import file.
+a graphics format in a \LaTeX{} import file, which may include
+\LaTeX{} commands to place text (compiled by \LaTeX{} itself) as
+labels, etc., in the figures.
There's no explicit port of \ProgName{xfig} to windows (although it is
believed to work under \ProgName{cygwin} with their X-windows system).
However, the program % ! line break
\href{http://tech-www.informatik.uni-hamburg.de/applets/javafig/}{\ProgName{jfig}}
is thought by many to be an acceptable substitute, written in Java.
+
+\ProgName{Asymptote} is a widely-praised development of the \MP{}
+language, which can draw 2D or 3D diagrams, and can also label
+diagrams with \LaTeX{} text; copious documentation is available via
+\href{http://asymptote.sourceforge.net}{\ProgName{asymptote}'s web site}.
\begin{ctanrefs}
+\item[asymptote]\CTANref{asymptote}
\item[xfig]\CTANref{xfig}
\item[transfig]\CTANref{transfig}
\end{ctanrefs}
@@ -3799,15 +4114,27 @@ easily configured (see documentation inside the script).
\ProgName{Winedt} (see \Qref[question]{editors and shells}{Q-editors})
provides this functionality direct in the Windows environment.
-Simply stripping \AllTeX{} markup isn't entirely reliable, however:
-that markup itself may contribute typeset words, and this could be a
-problem. The \Package{wordcount} package
+\ProgName{TeXcount} also goes a long way with heuristics for counting,
+starting from a \LaTeX{} file; the documentation is comprehensive, and
+you may try the script on-line via the % ! line break
+\begin{wideversion}
+ \href{http://folk.uio.no/einarro/Comp/texwordcount.html}{package home page}.
+\end{wideversion}
+\begin{narrowversion}
+ package home page~(see
+ \URL{http://folk.uio.no/einarro/Comp/texwordcount.html}).
+\end{narrowversion}
+Even quite sophisticated stripping of \AllTeX{} markup can never be
+entirely reliable, however: that markup itself may contribute typeset
+words, and this could be a problem. The \Package{wordcount} package
contains a Bourne shell (i.e., typically Unix) script for running a
\LaTeX{} file with a special piece of supporting \TeX{} code, and then
counting word indications in the log file. This is probably as
-accurate automatic counting as you can get.
+accurate automatic counting as you can get, if it works for you.
\begin{ctanrefs}
\item[detex]\CTANref{detex}
+\item[latexcount.pl]\CTANref{latexcount}
+\item[TeXcount]\CTANref{texcount}
\item[wordcount]\CTANref{wordcount}
\end{ctanrefs}
@@ -4086,7 +4413,11 @@ For today, possible packages are:
\ProgName{tex4ht}'s macros included. As a result, it's pretty
robust against the macros you include in your document, and it's
also pretty fast.
-\item[\ProgName{TeXpider}] a commercial program from
+\item[\ProgName{plasTeX}]a Python-based \LaTeX{} document processing
+ framework. It gives DOM-like access to a \LaTeX{} document, as
+ well as the ability to generate mulitple output formats
+ (e.g. HTML, DocBook, tBook, etc.).
+\item[\ProgName{TeXpider}]a commercial program from
\Qref*{Micropress}{Q-commercial}, which is
described on \URL{http://www.micropress-inc.com/webb/wbstart.htm};
it uses bitmaps for equations.
@@ -4107,6 +4438,7 @@ The World Wide Web Consortium maintains a list of ``filters'' to
\URL{http://www.w3.org/Tools/Word_proc_filters.html}
\begin{ctanrefs}
\item[latex2html]Browse \CTANref{latex2html}
+\item[plasTeX]Browse \CTANref{plastex}
\item[tex4ht]\CTANref{tex4ht}
\item[tth]\CTANref{tth}
\end{ctanrefs}
@@ -4139,8 +4471,8 @@ The World Wide Web Consortium maintains a list of ``filters'' to
converting Microsoft's Rich Text Format to \TeX{}. There is also a
converter to \LaTeX{} by Erwin Wechtl, called \ProgName{rtf2latex}.
The latest converter, by Ujwal Sathyam and Scott Prahl, is
- \ProgName{rtf2latex2e}; this system seems rather good already, and
- is still being improved.
+ \ProgName{rtf2latex2e} which seems rather good, though development
+ of it seems to have stalled.
Translation \emph{to} \acro{RTF} may be done (for a somewhat
constrained set of \LaTeX{} documents) by \TeX{}2\acro{RTF}, which
@@ -4269,7 +4601,7 @@ thence to well-formed \acro{XHTML}, and import the results into
Microsoft \ProgName{Word} (2000 or later). From there, one may
convert to \AllTeX{} using one of the techniques discussed in
% beware line break
-\htmlonly{``}\Qref[question]{converting to and from \AllTeX{}}{Q-fmtconv}\htmlonly{''}.
+\wideonly{``}\Qref[question]{converting to and from \AllTeX{}}{Q-fmtconv}\wideonly{''}.
The result will typically (at best) be poorly marked-up. Problems may
also arise from the oddity of typical \TeX{} font encodings (notably
@@ -4342,12 +4674,16 @@ How did you learn about the package?
If the information came from these \acro{FAQ}s, you should already
have a link to the file (there are lists at the end of each answer):
\begin{narrowversion}
- copy that link into a browser,
+ make a browser link from \URL{http://mirror.ctan.org/} and the text
+ in the list; if the link returns a directory listing, you can
+ generally retrieve the whole directory by appending the link with
+ \extension{zip}
\end{narrowversion}
\begin{wideversion}
- click on that link,
+ click on one of the links associated with the package, and you can
+ get the package (which may be one file or several).
+% need searate wording for pdfversion and htmlversion, here
\end{wideversion}
-and you can get the file, one way or another.
If you heard about the file somewhere else, it's possible that the
source told you where to look; if not, try the \acro{CTAN} searching
@@ -4539,7 +4875,7 @@ The % ! line break
suggests that you should create % ! line break
``\texttt{C:\textbackslash Local TeX Files}'', which is good if you
manage your own machine, but often not even possible in corporate, or
-similar, environments~­-- in such situations, the user may have no
+similar, environments~--- in such situations, the user may have no
control over the hard disc of the computer, at all.
So the real criterion is that your local tree should be somewhere that
@@ -4547,7 +4883,7 @@ So the real criterion is that your local tree should be somewhere that
provide a ``home directory'' for each user, mounted as a network
drive; this is a natural home for the user's local tree. Other (often
academic) environments assume the user is going to provide a memory
-stick, and will assign it a defined drive letter~­-- another good
+stick, and will assign it a defined drive letter~--- another good
candidate location. Note that the semantics of such a tree are
indistinguishable from those of a % ! line break
\Qref*{``home'' \acro{TEXMF} tree}{Q-privinst}.
@@ -4556,7 +4892,7 @@ There are circumstances when you might not wish to use the `local' tree:
\begin{itemize}
\item if the package, or whatever, is ``personal'' (for example,
something commercial that has been licensed to you alone, or
- something you're developing yourself), the package should go in your
+ something you're developing yourself), it should go in your
\Qref*{``home'' \acro{TEXMF} tree}{Q-privinst};
\item if you \emph{know} that the package you are installing is a
replacement for the copy on the \acro{TEXMF} tree of your \AllTeX{}
@@ -4573,7 +4909,7 @@ have an effect like:
\begin{itemize}
\item distribution comes with package version \ensuremath{n};
\item you install package version \ensuremath{n+1} on the local tree; and
-\item the updated distribution comes with package version \ensuremath{n+2}.
+\item the updated distribution provides package version \ensuremath{n+2}.
\end{itemize}
In such a situation, you will find yourself using version
\ensuremath{n+1} (from the local tree) \emph{after} the new
@@ -4743,7 +5079,7 @@ mpm --install=<package>
(which of course assumes you know the name by which \miktex{} refers to
your package).
-\Question[Q-inst-tds-zip]{Installing using preformatted \acro{ZIP} files}
+\Question[Q-inst-tds-zip]{Installing using ready-built \acro{ZIP} files}
Installing packages, as they (``traditionally'') appear on
\acro{CTAN}, involves:
@@ -4756,15 +5092,15 @@ Installing packages, as they (``traditionally'') appear on
Most people, for most packages, find the first two steps onerous, the
last being easy (unless it is forgotten!).
-Preformatted \acro{ZIP} files (also known as % ! line break
-\Qref{\acro{TDS} \acro{ZIP} files}{Q-tds-zip}) are designed to lighten
+Ready-built \acro{ZIP} files~--- also known as % ! line break
+\Qref*{\acro{TDS}-\acro{ZIP} files}{Q-tds-zip}~--- are designed to lighten
the load of performing the first two steps of installation: they
contain all the files that are that's to be installed for a given
package, in their ``correct'' locations in a % ! line break
\Qref*{\acro{TDS} tree}{Q-tds}.
To install such a file on a Unix system (we assume that you'll install
-into the local \acro{TEXMF} tree):
+into the local \acro{TEXMF} tree, at \texttt{\$TEXMFLOCAL}):
\begin{quote}
\begin{verbatim}
cd $TEXMFLOCAL
@@ -4785,12 +5121,6 @@ the package provides a font, you also need to enable the font's map,
which is discussed in % ! line break
``\Qref*{Installing a Type~1 font}{Q-instt1font}''
-At the time of writing, there are rather few \extension{tds.zip}
-files (by comparison with the huge number of packages that are
-available). As packages are updated, the number of files is
-steadily increasing, but it will be a long time before the whole set
-is covered.
-
\Question[Q-tempinst]{``Temporary'' installation of \AllTeX{} files}
Operating systems and applications need to know where to find files:
@@ -5295,49 +5625,45 @@ which may be found on \acro{CTAN}.
\Question[Q-useMF]{Getting \MF{} to do what you want}
\MF{} allows you to create your own fonts, and most \TeX{} users
-will never need to use it. \MF{}, unlike \TeX{}, requires some
-customisation: each output device for which you will be generating
-fonts needs a mode associated with it. Modes are defined using the
-|mode_def| convention described on page~94 of \emph{The \MF{}book}
+will never need to use it~--- modern \AllTeX{} systems contain
+rather few \MF{} fonts of any significance, and when \MF{} output is
+needed the font generation is done, automatically, ``on the fly''.
+
+If you find you have some special requirement that the system doesn't
+satisfy, you need to know about \MF{} in rather more detail. \MF{},
+unlike \TeX{}, requires customisation for each output device: such
+customisation is conventionally held in a ``mode'' associated with the
+device. Modes are commonly defined using the \texttt{mode\_def}
+convention described on page~94 of \emph{The \MF{}book} % ! line break
(see \Qref[question]{\TeX{}-related books}{Q-books}). You will need
-a file, which conventionally called \File{local.mf}, containing all the
-|mode_def|s you will be using. If \File{local.mf} doesn't already
-exist, Karl Berry's collection of modes (\File{modes.mf})
-is a good starting point
-(it can be used as a `\File{local.mf}' without modification in a `big
-enough' implementation of \MF{}). Lists of
+a file, conventionally called \File{local.mf}, containing all the
+\texttt{mode\_def}s you will be using. In the unlikely event that
+\File{local.mf} doesn't already exist, Karl Berry's collection of
+modes (\File{modes.mf}) is a good starting point
+(it can be used as a `\File{local.mf}' without modification in a
+typical modern implementation of \MF{}). Lists of
settings for various output devices are also published periodically in
\textsl{TUGboat} (see \Qref[question]{\acro{TUG}}{Q-TUG*}). Now create
-a \texttt{plain} base
-file using \ProgName{inimf}, \texttt{plain.mf}, and \texttt{local.mf}:
+a \texttt{plain} base file using \ProgName{mf} (in ``initialisation''
+mode), \texttt{plain.mf}, and \texttt{local.mf}:
\begin{htmlversion}
+\begin{quote}
\begin{verbatim}
- % inimf
- This is METAFONT...
- **plain # you type plain
- (output)
- *input local # you type this
- (output)
- *dump # you type this
- Beginning to dump on file plain...
- (output)
+% mf -ini
+This is METAFONT...
+**plain # you type plain
+(output)
+*input local # you type this
+(output)
+*dump # you type this
+Beginning to dump on file plain...
+(output)
\end{verbatim}
+\end{quote}
\end{htmlversion}
\htmlignore
-\par\vspace{\topsep}
-%\begin{tabular}{@{}l@{}l@{}}
-%|% inimf|\\
-%This is METAFONT\dots{}\\{}
-%**|plain|& you type `|plain|'\\{}
-%(output)\\{}
-%*|input local|& you type this\\{}
-%(output)\\{}
-%*|dump|& you type this\\{}
-%Beginning to dump on file plain\dots{}\\{}
-%(output)\\{}
-%\end{tabular}\par
\begin{list}{}{}\item\relax
- |% inimf|\\
+ \texttt{\% mf -ini}\\
This is METAFONT\dots{}\\{}
\fullline{**\texttt{plain}\hss you type `\texttt{plain}'}
(\emph{output})\\{}
@@ -5348,32 +5674,26 @@ file using \ProgName{inimf}, \texttt{plain.mf}, and \texttt{local.mf}:
(\emph{output})
\end{list}\par
\endhtmlignore
-This will create a base file named \File{plain.base} (or something
-similar; for example, it will be
-\htmlignore
-\acro{\File{PLAIN.BAS}}
-\endhtmlignore
-\begin{htmlversion}
- \File{PLAIN.BAS}
-\end{htmlversion}
-on \MSDOS{} systems) which should be moved to the directory containing
-the base files on your system (note that some systems have two or more
-such directories, one for each `size' of \MF{} used).
+This will create a base file named \File{plain.base}
+(or something similar; for example, it will be \File{PLAIN.BAS}
+on \MSDOS{} systems). Move the file to the directory containing
+the base files on your system.
Now you need to make sure \MF{} loads this new base when it starts up. If
\MF{} loads the \texttt{plain} base by default on your system, then you're
-ready to go. Under Unix (using the default \ProgName{web2c}
-distribution%
+ready to go. Under Unix (using the default \texlive{} (and earlier)
+distributions this does indeed happen, but we could for instance
+define a command \ProgName{plainmf}%
\begin{footnoteenv}
- The \ProgName{command_name} is symbolically linked to
- \ProgName{virmf}, and \ProgName{virmf} loads \File{command_name.base}
-\end{footnoteenv})
-this does indeed happen, but we could for instance define a command
-\ProgName{mf} which executes \texttt{virmf \&plain} loading the
-\texttt{plain} base file.
-
-The usual way to create a font with \texttt{plain} \MF{} is to start
-it with the
+ On the grounds that a command \ProgName{plain} could be misconstrued
+ as a reference to \plaintex{}
+\end{footnoteenv}
+which executes `\texttt{mf -base=plain}' (or, in more traditional
+style `\texttt{mf \&plain}') which loads the \texttt{plain} base
+file.
+
+The usual way to create a font with \MF{} (with an appropriate base
+file loaded) is to start \MF{}'s input with the
\begin{narrowversion}
lines
\begin{quote}
@@ -5389,55 +5709,60 @@ line
\end{verbatim}
\end{wideversion}
in response to the `\texttt{**}' prompt or on the \MF{} command line. (If
-\texttt{<mode name>} is unknown or omitted, the mode defaults to `proof' and
-\MF{} will produce an output file called
-% beware!! -- argument of \File naturally breaks across line end
+\texttt{<mode name>} is unknown or omitted, the mode defaults to
+`proof' mode and \MF{} will produce an output file called % ! line break
\File{<font file name>.2602gf})
The \texttt{<magnification>} is a floating point number or
`magstep' (magsteps are defined in \emph{The \MF{}book} and
\emph{The \TeX{}book}).
If \texttt{mag=<magnification>} is omitted, then the default
-is 1 (magstep 0). For example, to generate cmr10 at 12pt for an epson
-printer you would type
+is 1~(magstep 0). For example, to generate cmr10 at 12pt for an Epson
+printer you might type
+\begin{quote}
\begin{verbatim}
- mf \mode=epson; mag=magstep 1; input cmr10
+mf \mode=epson; mag=magstep 1; input cmr10
\end{verbatim}
+\end{quote}
Note that under Unix the \texttt{\textbackslash } and \texttt{;}
characters must usually be quoted or escaped, so this would typically
look something like
+\begin{quote}
\begin{verbatim}
mf '\mode=epson; mag=magstep 1; input cmr10'
\end{verbatim}
-
-If you don't have \ProgName{inimf} or need a special mode that isn't
-in the base, you can put its commands in a file (\emph{e.g.},
-\File{ln03.mf}) and invoke it on the fly with the \csx{smode} command.
-For example, to create \File{cmr10.300gf} for an \acro{LN}03 printer, using
-the file
+\end{quote}
+If you need a special mode that isn't in the base, you can put its
+commands in a file (\emph{e.g.}, \File{ln03.mf}) and invoke it on the
+fly with the \csx{smode} command. For example, to create
+\File{cmr10.300gf} for an \acro{LN}03 printer, using the file
+\begin{quote}
\begin{verbatim}
- % This is ln03.mf as of 1990/02/27
- % mode_def courtesy of John Sauter
- proofing:=0;
- fontmaking:=1;
- tracingtitles:=0;
- pixels_per_inch:=300;
- blacker:=0.65;
- fillin:=-0.1;
- o_correction:=.5;
+% This is ln03.mf as of 1990/02/27
+% mode_def courtesy of John Sauter
+proofing:=0;
+fontmaking:=1;
+tracingtitles:=0;
+pixels_per_inch:=300;
+blacker:=0.65;
+fillin:=-0.1;
+o_correction:=.5;
\end{verbatim}
+\end{quote}
(note the absence of the \texttt{mode\_def} and \texttt{enddef}
commands), you would type
+\begin{quote}
\begin{verbatim}
- mf \smode="ln03"; input cmr10
+mf \smode="ln03"; input cmr10
\end{verbatim}
+\end{quote}
This technique isn't one you should regularly use, but it may
prove useful if you acquire a new printer and want to experiment with
parameters, or for some other reason are regularly editing the
parameters you're using. Once you've settled on an appropriate set of
parameters, you should use them to rebuild the base file that you use.
-Other sources of help are mentioned in % beware line break
-\Qref[question]{\MF{} and \MP{} Tutorials}{Q-mfptutorials}.
+Other sources of help are discussed in our list of % ! line break
+\Qref*{\MF{} and \MP{} Tutorials}{Q-mfptutorials}.
\begin{ctanrefs}
\item[modes.mf]\CTANref{modes-file}
\end{ctanrefs}
@@ -5602,7 +5927,7 @@ this, you have three options:
\PS{} previewer. Some systems offer this capability as
standard, but most people will need to use a separate previewer such
as \ProgName{ghostscript} or \ProgName{ghostscript}-based viewers
- such as \ProgName{ghostview} or shareware offering \ProgName{GSview}.
+ such as \ProgName{gv} or shareware offering \ProgName{GSview}.
\item Under Windows on a \acro{PC}, or on a Macintosh, let Adobe Type Manager
display the fonts (textures, on the Macintosh, works like this).
%% , and under
@@ -5627,9 +5952,9 @@ this, you have three options:
\end{itemize}
\begin{ctanrefs}
\item[ghostscript]Browse \CTANref{ghostscript}
-\item[ghostview]Browse \CTANref{ghostview}
\item[gsftopk]\CTANref{gsftopk}
\item[GSview]Browse \CTANref{gsview}
+\item[gv]Browse \CTANref{gv}
\item[ps2pk]\CTANref{ps2pk}
\item[xdvi]\CTANref{xdvi}
\end{ctanrefs}
@@ -5899,8 +6224,9 @@ commercially, include:
set of files for use with \LaTeX{}. The \acro{CM} Bright fonts are
supplied in Type~1 format by MicroPress, Inc. The
\Package{hfbright} bundle offers free Type~1 fonts for text using
- the \acro{OT}1 encoding~--- the \Package{cm-super} set for
- use with \acro{T}1 texts doesn't (yet) offer support for mathematics.
+ the \acro{OT}1 encoding~--- the \Package{cm-super} fonts provide the
+ fonts in \acro{T}1 text encoding but don't support \acro{CM} bright
+ mathematics.
\nothtml{\bgroup\raggedwithindent}
For further details of Micropress' offering (including samples) see\\
@@ -6220,7 +6546,6 @@ If you want to use an italic version of \csx{foo}, you need to use
Text set using nonstdfont italic...
\end{verbatim}
\end{quote}
-
This is all very elementary stuff, and serves for simple use of fonts.
However, there are wrinkles, the most important of which is the matter
of \Qref*{font encodings}{Q-whatenc}. Unfortunately, many fonts that
@@ -6285,6 +6610,14 @@ document is going to use, and the package provides commands to select
fonts as they're needed. The distribution includes a configuration to
use Adobe `standard' fonts for typesetting text. (\Eplain{} itself
seems not to offer a font selection scheme.)
+
+Simply to change font \emph{size} in a document (i.e., not changing
+the default font itself), may be done using the rather straightforward
+\Package{varisize}, which offers font sizes ranging from 7~points to
+20~points (nominal sizes, all). Font size commands are generated when
+any of the package files is loaded, so the \File{11pt.tex} defines a
+command \csx{elevenpoint}; each of the files ensures there's a ``way
+back'', by defining a \csx{tenpoint} command.
\begin{ctanrefs}
\item[ec-plain]\CTANref{ec-plain}
\item[fontch]\CTANref{fontch}
@@ -6292,6 +6625,7 @@ seems not to offer a font selection scheme.)
\item[ofs]\CTANref{ofs}
\item[pdcmac]\CTANref{pdcmac}
\item[plnfss]\CTANref{plnfss}
+\item[varisize]\CTANref{varisize}
\end{ctanrefs}
\subsection{Particular font families}
@@ -6385,8 +6719,8 @@ files), but copy the other three into your existing Local
\Qref*{update the filename database}{Q-inst-wlcf}.
Now, incorporate the fonts in the set searched by \PDFLaTeX{},
-\ProgName{dvips}, \ProgName{dvipdfm}, your previewers and
-Type~1-to-\acro{PK} conversion programs, by
+\ProgName{dvips}, \ProgName{dvipdfm}/\ProgName{dvipdfmx}, your
+previewers and Type~1-to-\acro{PK} conversion programs, by
\begin{itemize}
\item On a te\TeX{} system earlier than version~2.0, edit the file
\File{$TEXMF/dvips/config/updmap} and insert an absolute path for
@@ -6519,13 +6853,14 @@ can operate using \PDFTeX{} primitives, the hyper\TeX{}
\csx{special}s, or \acro{DVI} driver-specific \csx{special} commands.
Both \ProgName{dvips} and \YandY{}'s \acro{\ProgName{DVIPSONE}} can
translate the \acro{DVI} with these \csx{special} commands into
-\PS{} acceptable to Distiller, and \ProgName{dvipdfm} has \csx{special}
-commands of its own.
+\PS{} acceptable to Distiller, and
+\ProgName{dvipdfm} and \ProgName{dvipdfmx} have \csx{special} commands of
+its own.
If you use \plaintex{}, the \Qref*{\Eplain{} macros}{Q-eplain} can
help you create \acro{PDF} documents with hyper-references.
It can operate using \PDFTeX{} primitives, or \csx{special} commands
-for the \ProgName{dvipdfm} \acro{DVI} driver.
+for the \ProgName{dvipdfm}/\ProgName{dvipdfmx} \acro{DVI} drivers.
While there is no free implementation of all of \ProgName{Adobe}
\ProgName{Distiller}'s
@@ -6537,9 +6872,8 @@ For viewing (and printing) the resulting files, Adobe's
\ProgName{Acrobat} \ProgName{Reader} is available for a fair range of
platforms; for those for which Adobe's reader is unavailable, remotely
current versions of \ProgName{ghostscript} combined with
-\ProgName{gv}, \ProgName{GSview} (or even the unsupported
-\ProgName{ghostview}) can display and print \acro{PDF} files, as can
-\ProgName{xpdf}.
+\ProgName{gv} or \ProgName{GSview} can display and print \acro{PDF}
+files, as can \ProgName{xpdf}.
In many circumstances, \ProgName{Ghostscript} combined with a viewer
application is actually preferable to Acrobat Reader. For example, on
@@ -6554,9 +6888,8 @@ mistake.
\item[dvipdfm]\CTANref{dvipdfm}
\item[dvipdfmx]\CTANref{dvipdfmx}
\item[ghostscript]Browse \CTANref{ghostscript}
-\item[ghostview]Browse \CTANref{ghostview}
\item[GSview]Browse \CTANref{gsview}
-\item[gv]\CTANref{gv}
+\item[gv]Browse \CTANref{gv}
\item[hyper.sty]\CTANref{hyper}
\item[hyperref.sty]\CTANref{hyperref}
\end{ctanrefs}
@@ -7028,10 +7361,13 @@ the above two cases), but their code could be configured for others.
The obvious next step was to make the code configurable dynamically.
The \LaTeX{} standard \Package{graphics} package and its derivatives
-made this step: it is strongly preferred for all current work. It can
-also be used (with the help of the \Package{miniltx} ``\LaTeX{}
-emulator'' and the \Package{graphicx.tex} front-end) in documents
-written in \plaintex{}.
+made this step: it is strongly preferred for all current work.
+
+Users of \plaintex{} have two options allowing them to use
+\Package{graphicx}: the \Package{miniltx} ``\LaTeX{} emulator'' and
+the \Package{graphicx.tex} front-end allow you to load
+\Package{graphicx}, and \Qref*{\Eplain}{Q-eplain} allows you to load
+it (using the full \LaTeX{} syntax) direct.
The \Package{graphics} package takes a variety of ``driver
options''~--- package options that select code to generate the
@@ -7209,17 +7545,17 @@ which is targeted at the use of \Package{pstricks} in
\Question[Q-dvipdfmgraphics]{Imported graphics in \ProgName{dvipdfm}}
-\ProgName{Dvipdfm} translates direct from \acro{DVI} to \acro{PDF}
-(all other available routes produce \PS{} output using
-\ProgName{dvips} and then convert that to \acro{PDF} with
+\ProgName{Dvipdfm} (and \ProgName{dvipdfmx}) translates direct from
+\acro{DVI} to \acro{PDF} (all other available routes produce \PS{}
+output using \ProgName{dvips} and then convert that to \acro{PDF} with
\ProgName{ghostscript} or \ProgName{Acrobat} \ProgName{Distiller}).
-\ProgName{Dvipdfm} is a particularly flexible application. It will
-permit the inclusion of bitmap and \acro{PDF} graphics, as does
-\Qref*{\PDFTeX{}}{Q-pdftexgraphics}, but is also capable of employing
-\ProgName{ghostscript} ``on the fly'' so as to be able to permit the
-inclusion of encapsulated \PS{} (\extension{eps}) files by translating
-them to \acro{PDF}. In this way, \ProgName{dvipdfm} combines the good
+\ProgName{Dvipdfm}/\ProgName{Dvipdfmx} are particularly flexible
+applications. They permit the inclusion of bitmap and \acro{PDF}
+graphics, as does \Qref*{\PDFTeX{}}{Q-pdftexgraphics}, but are also
+capable of employing \ProgName{ghostscript} ``on the fly'' so as to be
+able to permit the inclusion of encapsulated \PS{} (\extension{eps})
+files by translating them to \acro{PDF}. In this way, they combine the good
qualities of \ProgName{dvips} and of \PDFTeX{} as a means of
processing illustrated documents.
@@ -7246,7 +7582,7 @@ containing the information; the above numbers came from an
%%CreationDate: Mon Mar 8 15:17:47 2004
\end{verbatim}
\end{quote}
-However, if such a file is available, you may abbreviate the inclusion
+If such a file is available, you may abbreviate the inclusion
code, above, to read:
\begin{quote}
\begin{verbatim}
@@ -7269,9 +7605,59 @@ configuration file (of most distributions) ``guesses'' the
\texttt{dvips} option if you're using \TeX{}.
\begin{ctanrefs}
\item[dvipdfm]\CTANref{dvipdfm}
+\item[dvipdfmx]\CTANref{dvipdfmx}
\item[ebb]Distributed as part of \CTANref{dvipdfm}
\end{ctanrefs}
+\Question[Q-grffilenames]{``Modern'' graphics file names}
+
+\TeX{} was designed in a world where file names were very simple
+indeed, typically strictly limited both in character set and length.
+In modern systems, such restrictions have largely disappeared, which
+leaves \TeX{} rather at odds with its environment. Particular
+problems arise with spaces in file names, but things like multiple
+period characters can seriously confuse the \Package{graphics}
+package.
+
+The specification of \TeX{} leaves some leeway for distributions to
+adopt file access appropriate to their operating system, but this
+hasn't got us very far. Many modern distributions allow you to
+specify a file name as \texttt{"file name.tex"} (for example), which
+helps somewhat, but while this allows us to say
+\begin{quote}
+\begin{verbatim}
+\input "foo bar.tex"
+\end{verbatim}
+\end{quote}
+the analogous usage
+\begin{quote}
+\begin{verbatim}
+\includegraphics{"gappy graphics.eps"}
+\end{verbatim}
+\end{quote}
+using ``ordinary'' \LaTeX{} causes confusion in \ProgName{xdvi} and
+\ProgName{dvips}, even though it works at compilation time. Sadly,
+even within such quotes, multiple dots give \csx{includegraphics}
+difficulties. Note that
+\begin{quote}
+\begin{verbatim}
+\includegraphics{"gappy graphics.pdf"}
+\end{verbatim}
+\end{quote}
+works in a similar version of \PDFTeX{}.
+
+If you're using the \Package{graphics} package, the \Package{grffile}
+package will help. The package offers several options, the simplest
+of which are \pkgoption{multidot} (allowing more than one dot in a
+file name) and \pkgoption{space} (allowing space in a file name). The
+\pkgoption{space} option requires that you're running on a
+sufficiently recent version of \PDFTeX{}, in \acro{PDF} mode~--- and
+even then it won't work for \MP{} files, which are read as \TeX{}
+input, and therefore use the standard input mechanism).
+\begin{ctanrefs}
+\item[grffile.sty]Distributed as part of \CTANref{oberdiek}
+\end{ctanrefs}
+
\Question[Q-graphicspath]{Importing graphics from ``somewhere else''}
By default, graphics commands like \csx{includegraphics} look
@@ -7615,14 +8001,25 @@ the question\dots{}
There are many packages to do pictures in \AllTeX{} itself (rather than
importing graphics created externally), ranging from simple use of
\LaTeX{} \environment{picture} environment, through enhancements like
-\ProgName{epic}, to
+\ProgName{eepic}, to
sophisticated (but slow) drawing with \PiCTeX{}. Depending on your type
of drawing, and setup, here are a few systems you may consider:
\begin{itemize}
+\item \PiCTeX{} is a venerable, and very powerful, system, that draws
+ by placing dots on the page to give the effect of a line or curve. While
+ this has the potential of great power, it is (of course) much slower
+ than any of the other established packages. What's more, there
+ are problems with its \Qref*{documentation}{Q-docpictex}.
+\item \Package{epic} was designed to make use of the \LaTeX{}
+ \environment{picture} environment somewhat less agonising;
+ \Package{eepic} extends it, and is capable of using \ProgName{tpic}
+ \csx{special} commands to improve printing performance. (If the
+ \csx{special}s aren't available, the \Package{eepicemu} will do the
+ business, far less efficiently.
\item \Package{pict2e}; this was advertised in % !line break
\Qref*{the \LaTeX{} manual}{Q-books}, but didn't appear for nearly
ten years after publication of the book! It removes all the petty
- niggles that surround the use of the \environment{picture}
+ restrictions that surround the use of the \environment{picture}
environment. It therefore suffers \emph{only} from the rather
eccentric drawing language of the environment, and is a far more
useful tool than the original environment has ever been. (Note that
@@ -7631,9 +8028,11 @@ of drawing, and setup, here are a few systems you may consider:
\item \Package{PSTricks}; this gives you access to all the power of
\PS{} from \TeX{} itself, by sophisticated use of
\Qref*{\csx{special} commands}{Q-specials}. Since \PS{} is itself a
- pretty powerful programming language, many astounding things can in
- principle be achieved using \Package{PSTricks}.
- \Package{pstricks}' \csx{special}s are
+ pretty powerful programming language, many astounding things can in
+ principle be achieved using \Package{PSTricks} (a wide range of
+ contributed packages, ranging from world mapping to lens design
+ diagrams, is available).
+ \Package{Pstricks}' \csx{special}s are
by default specific to \ProgName{dvips}, but V\TeX{} (both in its
commercial and in its free versions) understands them. \PDFTeX{}
users may use \Package{pst-pdf}, which (like
@@ -7675,12 +8074,16 @@ of drawing, and setup, here are a few systems you may consider:
\end{itemize}
\begin{ctanrefs}
\item[dratex.sty]\CTANref{dratex}
+\item[epic.sty]\CTANref{epic}
+\item[eepic.sty]\CTANref{eepic}
+\item[eepicemu.sty]\CTANref{eepic}
\item[mfpic]\CTANref{mfpic}
\item[preview.sty]\CTANref{preview}
\item[pspicture.sty]\CTANref{pspicture}
\item[pst-pdf.sty]\CTANref{pst-pdf}
\item[pgf.sty]\CTANref{pgf}
\item[pict2e.sty]\CTANref{pict2e}
+\item[pictex.sty]\CTANref{pictex}
\item[pstricks]\CTANref{pstricks}
\item[tikz.sty]Distributed with \CTANref{pgf}
\end{ctanrefs}
@@ -8886,9 +9289,9 @@ the \Package{natbib} and \Package{hyperref} packages will interwork.
A convention sometimes used in physics journals is to ``collapse'' a group of
related citations into a single entry in the bibliography. \BibTeX{},
by default, can't cope with this arrangement, but the \Package{mcite}
-package deals with the problem.
+and \Package{mciteplus} packages deal with the problem.
-The package overloads the \csx{cite} command to recognise a
+\Package{mcite} overloads the \csx{cite} command to recognise a
``\texttt{*}'' at the start of a key, so that citations of the form
\begin{quote}
\begin{verbatim}
@@ -8913,19 +9316,32 @@ You need to make a small change to the bibliography style
(\extension{bst}) file you use; the \Package{mcite} package
documentation tells you how to do that.
-Unfortunately, the \Class{revtex} system doesn't play with
-\Package{mcite}. As a result, for that (primarily physics-targeted
-system) you need to play silly games like:
+(Despite these multiple citations being primarily a physics-oriented
+requirement, the \Class{RevTeX} (Physics support) class doesn't work
+with \Package{mcite}.
+
+The \Package{mciteplus} package adresses many of the infelicites of
+\Package{mcite}, and \emph{does} work with \Class{RevTeX}. Again,
+`ordinary' \extension{bst} files will not work with
+\Package{mciteplus}, but the package documentation explains how to
+patch an existing \BibTeX{} style.
+
+The \Package{collref} package takes a rather different approach to the
+problem, and will work with most (if not all) \BibTeX{} packages.
+\Package{Collref} spots common subsets of the references, so if it
+sees a sequence
\begin{quote}
\begin{verbatim}
-\cite{paper0,paper1,paper3}
-\nocite{paper2}
+\cite{paper0,paper1,paper2,paper3}
+...
+\cite{some_other_paper,paper1,paper2,and_another}
\end{verbatim}
\end{quote}
-and then edit the \extension{bbl} file to merge the two citations, to
-achieve the effects of \Package{mcite}.
+it will collect \texttt{paper1} and \texttt{paper2} as a multiple reference.
\begin{ctanrefs}
+\item[collref.sty]\CTANref{collref}
\item[mcite.sty]\CTANref{mcite}
+\item[mciteplus.sty]\CTANref{mciteplus}
\item[revtex \nothtml{\rmfamily}bundle]\CTANref{revtex}
\end{ctanrefs}
@@ -8986,6 +9402,11 @@ simple~--- add
\end{quote}
to the preamble of your document.
+The \Package{compactbib} package has a similar effect. Its primary
+purpose is to produce two bibliographies, and it seems to preclude use
+of \BibTeX{} (though the package documentation, in the package file
+itself, isn't particularly clear).
+
Otherwise, one is into unseemly hacking of something or other. The
\Package{mdwlist} package actually does the job, but it doesn't work
here, because it makes a different-named list, while the name
@@ -9006,6 +9427,7 @@ plethora of space-saving measures: you can, in principle, suppress all
its other actions, and have it provide you a compressed bibliography
\emph{only}.
\begin{ctanrefs}
+\item[compactbib.sty]\CTANref{compactbib}
\item[mdwlist.sty]Distributed as part of \CTANref{mdwtools}
\item[natbib.sty]\CTANref{natbib}
\item[savetrees.sty]\CTANref{savetrees}
@@ -9393,12 +9815,13 @@ route):
Thesis styles are usually very specific to your University, so it's
usually not profitable to ask around for a package outside your own
University. Since many Universities (in their eccentric way) still
-require double-spacing, you may care to refer to
-\Qref[question]{the relevant question}{Q-linespace}.
-If you want to write your own, a good place to start is the University
-of California style, but it's not worth going to a lot of trouble. (If
-officials won't allow standard typographic conventions, you won't be
-able to produce an \ae{}sthetically pleasing document anyway!)
+require double-spaced thesis text, you may also need separately to set
+up \Qref*{double spacing}{Q-linespace}.
+
+If you want to write a new thesis class of your own, a good place to
+start is the University of California style, but remember that it's
+often difficult to produce a thesis that both looks good and conforms
+with the style that your Univeristy demands.
\begin{ctanrefs}
\item[UC thesis style]\CTANref{ucthesis}
\end{ctanrefs}
@@ -9412,8 +9835,8 @@ public archives.
Nevertheless, there are considerable numbers of macros of one sort or
another available on \acro{CTAN}; searching for your journal name in
-the CTAN catalogue (see % ! line wrap
-\Qref[question]{searching \acro{CTAN}}{Q-findfiles})
+the CTAN catalogue~--- see % ! line break
+\Qref{searching \acro{CTAN}}{Q-findfiles})~---
may well turn up what you're seeking.
Failing that, you may be well advised to contact the prospective
@@ -9598,7 +10021,8 @@ may not be optimal~--- but they're certainly practical.
More satisfactory are the \emph{\acro{KOMA}-script} classes, which are
designed to work properly with the class option files that come with
\Package{extsizes}, and the \Class{memoir} class that has its own
-options for document font sizes 9pt, 14pt and 17pt.
+options for document font sizes 9pt--12pt, 14pt, 17pt, 20pt, 25pt,
+30pt, 36pt, 48pt and 60pt.
\begin{ctanrefs}
\item[extsizes bundle]\CTANref{extsizes}
\item[\nothtml{\rmfamily}KOMA script bundle]\CTANref{koma-script}
@@ -9704,8 +10128,8 @@ to program alternative % don't let these \href suffer line-breaks
\href{http://zoonek.free.fr/LaTeX/LaTeX_samples_chapter/0.html}{chapter heading styles}
and
\href{http://zoonek.free.fr/LaTeX/LaTeX_samples_section/0.html}{section heading styles}.
-The web pages are not useful to users unless they are willing to do
-their own \LaTeX{} programming.
+The web pages provide programming examples, and expect users to adapt
+them to their own \LaTeX{} use.
\begin{ctanrefs}
\item[anonchap.sty]\CTANref{anonchap}
\item[fncychap.sty]\CTANref{fncychap}
@@ -10311,8 +10735,6 @@ was written: it does the obvious things, and more.
Users have been known to ask for running page numbers within a
section, but this really doesn't make sense: you need to run page
numbers within document objects that always start on a fresh page.
-
-Documentation of \Package{chappg} is to be found in the package file.
\begin{ctanrefs}
\item[chappg.sty]\CTANref{chappg}
\end{ctanrefs}
@@ -10355,6 +10777,7 @@ together with a sample document and prototype outputs.
\end{ctanrefs}
\Question[Q-acroantics]{Adobe \ProgName{Reader} messing with print size}
+\AliasQuestion{Q-outszwrng}
Printing from Adobe \ProgName{Reader} shrinks the page ``to fit''
(\emph{by default}). Unfortunately, its calculation doesn't consider
@@ -10364,17 +10787,22 @@ The effect typically looks as if your margins have expanded.
Solve this problem by adjusting the \ProgName{Reader}'s default in the
print dialogue; unfortunately, this dialogue varies from one version
-to the next. On \ProgName{Reader} version 7, there are two entries to
-check:
-\begin{quote}
+to the next:
+\begin{itemize}
+\item \ProgName{Reader} version 7:\\
Page Scaling (default: ``Fit to printer margins'')~--- change to
``None'', and\\
- Scale (default 95\textpercent {} of Normal size)~--- change to
+ Scale (default 95\textpercent{} of Normal size)~--- change to
``100\textpercent''.
-% NB the space after \textpercent seems to be necessary for the health
-% of sanitize.pl :-(
-\end{quote}
-
+\item Adobe Reader 6:\\
+ in the print dialogue, on the ``copies \& pages'' pane, you'll find a
+ popup menu/drop-down list titled ``Page Scaling''~--- change to ``None''.
+\item Windows, Linux Acrobat (Reader) 5.0:\\
+ In the print dialog, make sure the ``Shrink oversized pages to fit''
+ checkbox is unchecked. It may also be useful to uncheck the
+ ``Expand small pages to fit paper size'' checkbox as well.
+\end{itemize}
+
\Question[Q-papergeom]{Getting the right paper geometry from \AllTeX{}}
If your output is the wrong size, and you've checked that it's not due
@@ -10496,8 +10924,10 @@ Style'~--- ``don't do it''~--- should not lightly be ignored.
This set of \acro{FAQ}s recommends that you use a package to establish
consistent settings of the parameters: the interrelationships are
-taken care of in the established packages, without you needing to
-think about them, but
+taken care of in the established packages, without you \emph{needing}
+to think about them, but remember~--- the packages only provide
+consistent, working, mechanisms: they don't analyse the quality of
+what you propose to do.
The following answers deal with the ways one may choose to proceed:
\begin{itemize}
@@ -10631,10 +11061,12 @@ environment (which is a close relation of the \LaTeX{}
as far as \TeX{} is concerned: it merely moves text around inside the
width that \TeX{} believes in.
-The \Package{changepage} package provides ready-built commands to do the
-above; it includes provision for changing the shifts applied to your
-text according to whether you're on an odd (\emph{recto}) or an even
-(\emph{verso}) page of a two-sided document.
+The \Package{changepage} package provides ready-built commands to do
+the above; it includes provision for changing the shifts applied to
+your text according to whether you're on an odd (\emph{recto}) or an
+even (\emph{verso}) page of a two-sided document.
+\Package{Changepage}'s structure matches that of the \Class{memoir}
+class.
The (earlier) package \Package{chngpage} provides the same facilities,
but it uses rather different syntax. \Package{Changepage}'s structure
@@ -10655,10 +11087,15 @@ to make the page one line longer, or
\enlargethispage{-\baselineskip}
\end{verbatim}
\end{quote}
-to make the page one line shorter.
+to make the page one line shorter. The process is (to an extent)
+simplified by the \Package{addlines} package: its \csx{addlines}
+command takes as argument the \emph{number} of lines to add to the
+page (rather than a length): the package documentation also provides a
+useful analysis of when the command may (or may not) be expected to
+work.
\begin{ctanrefs}
+\item[addlines.sty]\CTANref{addlines}
\item[changepage.sty]\CTANref{changepage}
-\item[chngpage.sty]\CTANref{chngpage}
\end{ctanrefs}
\Question[Q-nopageno]{How to get rid of page numbers}
@@ -11181,33 +11618,33 @@ facilities.
\item[quotchap.sty]\CTANref{quotchap}
\end{ctanrefs}
-\Question[Q-outszwrng]{\AllTeX{} \acro{PDF} output prints at wrong size}
-
-Having got everything \emph{else} right, you should be aware that the
-problem may have nothing to do with \AllTeX{} and everything to do
-with the program you use for printing. A regular cause for such
-problems lies with Acrobat Reader, which by default enables its option
-to scale pages to fit on the printable area of the paper. Since a
-printer can rarely print right to the edge, this means that pdf-files
-will be shrunk by some (small) factor (even if the pdf-file is
-formatted for A4, and your paper size is set to A4 as well).
-
-Correcting this silliness is not very hard, but the exact details
-depend on the version of Acrobat Reader (or "Adobe Reader" from
-version 6.0 onwards) you have installed:
-\begin{itemize}
-\item Mac OS X, Adobe Reader 6:\\
- in the print dialogue, on the ``copies \& pages'' pane, you'll find a
- popup menu titled ``Page Scaling''. Make sure that the menu reads
- ``None''.
-\item Windows, Adobe Reader 6:\\
- in the print dialogue, select ``None'' from the drop-down list
- ``Page Scaling''.
-\item Windows, Linux Acrobat (Reader) 5.0:\\
- In the print dialog, make sure the ``Shrink oversized pages to fit''
- checkbox is unchecked. It may also be useful to uncheck the
- ``Expand small pages to fit paper size'' checkbox as well.
-\end{itemize}
+% \Question[Q-outszwrng]{\AllTeX{} \acro{PDF} output prints at wrong size}
+
+% Having got everything \emph{else} right, you should be aware that the
+% problem may have nothing to do with \AllTeX{} and everything to do
+% with the program you use for printing. A regular cause for such
+% problems lies with Acrobat Reader, which by default enables its option
+% to scale pages to fit on the printable area of the paper. Since a
+% printer can rarely print right to the edge, this means that pdf-files
+% will be shrunk by some (small) factor (even if the pdf-file is
+% formatted for A4, and your paper size is set to A4 as well).
+
+% Correcting this silliness is not very hard, but the exact details
+% depend on the version of Acrobat Reader (or "Adobe Reader" from
+% version 6.0 onwards) you have installed:
+% \begin{itemize}
+% \item Mac OS X, Adobe Reader 6:\\
+% in the print dialogue, on the ``copies \& pages'' pane, you'll find a
+% popup menu titled ``Page Scaling''. Make sure that the menu reads
+% ``None''.
+% \item Windows, Adobe Reader 6:\\
+% in the print dialogue, select ``None'' from the drop-down list
+% ``Page Scaling''.
+% \item Windows, Linux Acrobat (Reader) 5.0:\\
+% In the print dialog, make sure the ``Shrink oversized pages to fit''
+% checkbox is unchecked. It may also be useful to uncheck the
+% ``Expand small pages to fit paper size'' checkbox as well.
+%\end{itemize}
\subsection{Spacing of characters and lines}
@@ -11439,13 +11876,16 @@ The \Class{memoir} class includes the relevant functionality of the
For general numbering of lines, there are two packages for use with
\LaTeX{}, \Package{lineno} (which permits labels attached to
individual lines of typeset output) and \Package{numline}.
+(\Package{Numline} is considered obsolete, but remains available from
+the archive.)
Both of these packages play fast and loose with the \LaTeX{} output
routine, which can cause problems: the user should beware\dots{}
If the requirement is for numbering verbatim text, \Package{moreverb},
-\Class{memoir} or \Package{fancyvrb} (see % beware line break
+or \Package{fancyvrb} (see % ! line break
\Qref[question]{including files verbatim}{Q-verbfile}) may be used.
+Class \Class{memoir} also provides the necessary facilities.
One common use of line numbers is in critical editions of texts, and
for this the \Package{edmac} package offers comprehensive support;
@@ -11765,9 +12205,17 @@ There are three packages that help solve this problem:
maths mode. It can produce (\LaTeX{}-style) `robust' commands
% beware line break within paren
(\htmlonly{see }\Qref{use of \csx{protect}}{Q-protect}) for use
- within moving arguments. Note that, because the operation is
- conducted in maths mode, spaces within the \acro{URL} argument are
- ignored unless special steps are taken.
+ within moving arguments.
+
+ The package ordinarily ignores spaces in the \acro{URL}, but
+ unfortunately \acro{URL}s that contain spaces do exist; to typeset
+ them, call the package with the \pkgoption{obeyspaces} option. Two
+ other useful options allow line breaks in the \acro{URL} in places
+ where they are ordinarily suppressed to avoid confusion:
+ \pkgoption{spaces} to allow breaks at spaces (note, this requires
+ \pkgoption{obeyspaces} as well, and \pkgoption{hyphens} to allow
+ breaks after hyphens. (Note that the package \emph{never} does
+ ``ordinary'' hyphenation of names inside an \acro{URL}.)
It is possible to use the \Package{url} package in \plaintex{},
with the assistance of the \Package{miniltx} package (which was
@@ -11930,24 +12378,24 @@ is to start a paragraph (in books, usually the first of a chapter)
with its first letter set large enough to span several lines.
This style is known as ``dropped capitals'', or (in French)
-\latexhtml{``lettrines''}{«lettrines»}, and \TeX{}'s primitive
-facilities for hanging indentation make its (simple) implementation
-pretty straightforward.
+\latexhtml{``lettrines''}{\htmlentity{laquo}lettrines\htmlentity{raquo}},
+and \TeX{}'s primitive facilities for hanging indentation make its
+(simple) implementation pretty straightforward.
The \Package{dropping} package does the job simply, but has a curious
attitude to the calculation of the size of the font to be used for the
big letters. Examples appear in the package documentation, so before
-you process the \extension{dtx}, the package itself must already be installed.
-Unfortunately, \Package{dropping} has an intimate relation to the set
-of device drivers available in an early version of the \LaTeX{}
-graphics package, and it cannot be trusted to work with recent
-offerings like \PDFTeX{}, V\TeX{} or \acro{DVI}pdfm.
-
-On such occasions, the more recent \Package{lettrine} package is more
-likely to succeed. It has a well-constructed array of options, and
-the examples (a pretty impressive set) come as a separate file in the
-distribution (also available in \PS{}, so that they can be viewed
-without installing the package itself).
+you process the \extension{dtx}, the package itself must already be
+installed. Unfortunately, \Package{dropping} has an intimate relation
+to the set of device drivers available in an early version of the
+\LaTeX{} graphics package, and it cannot be trusted to work with
+modern offerings such as \PDFTeX{}, V\TeX{} or \acro{DVI}pdfm, let
+alone such modernisms as \xetex{}. As a result, the package is widely
+deprecated, nowadays.
+
+The more recent \Package{lettrine} package is generally more reliable.
+It has a well-constructed array of options, and an impressive set of
+examples adds to the package's document.
\begin{ctanrefs}
\item[dropping]\CTANref{dropping}
\item[lettrine]\CTANref{lettrine}
@@ -12632,9 +13080,26 @@ have the .aux file, write:
\end{verbatim}
\end{narrowversion}
\end{quote}
+Heiko Oberdiek's experimental \Package{zref} bundle includes a
+hyper-crossreferencing mechanism using its \Package{zref-xr} module.
+Usage is closely modelled on \Package{xr} and \Package{xr-hyper}; a
+trivial example (from a \Newsgroup{comp.text.tex} posting) is
+\begin{quote}
+\begin{verbatim}
+\usepackage{zref-xr,zref-user}
+\zexternaldocument*{xr02}
+...
+\zref{foo}
+\end{verbatim}
+\end{quote}
+The module provides all the facilities of the older packages, and can
+deal both with ``traditional'' \LaTeX{} labels and with
+\Package{zref}'s style of labels.
\begin{ctanrefs}
\item[xr.sty]Distributed as part of \CTANref{2etools}
\item[xr-hyper.sty]Distributed with \CTANref{hyperref}
+\item[zref \nothtml{\rmfamily\itshape}bundle]Distributed as part of
+ \CTANref{oberdiek}
\end{ctanrefs}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13559,6 +14024,24 @@ which feels just as ``natural'' as the \Package{mdwtools} facility,
and has the advantage of playing well with the other excellent
facilities of \Package{enumitem}.
+\Package{Expdlist} has a neat way of providing for comments, with its
+\csx{listpart} command. The command's argument becomes a comment
+between items of the list:
+\begin{quote}
+\begin{verbatim}
+\begin{enumerate}
+\item item 1
+\item item 2
+ \listpart{interpolated comment}
+\item item 3
+\end{enumerate}
+\end{verbatim}
+\end{quote}
+This, you will realise, means it doesn't even have to think about
+suspending or resuming the list, and of course it works equally well
+in any of the list environments (thought it's not actually
+\emph{necessary} for any but \environment{enumerate}).
+
\Package{Enumitem} also allows multi-level suspension and resumption
of lists:
\begin{quote}
@@ -13582,13 +14065,14 @@ of lists:
% end outer enumerate
\end{enumerate}
\end{verbatim}
-However, the comment interpolated in the nested enumeration appears as
-if it were a second paragraph to ``outer item 2'', which is hardly
-satisfactory.
\end{quote}
+However, the `nested comment' interpolated in the nested enumeration
+appears as if it were a second paragraph to ``outer item 2'', which is
+hardly satisfactory.
\begin{ctanrefs}
\item[enumerate.sty]Distributed as part of \CTANref{2etools}
\item[enumitem.sty]\CTANref{enumitem}
+\item[expdlist.sty]\CTANref{expdlist}
\item[mdwlist.sty]Distributed as part of \CTANref{mdwtools}
\end{ctanrefs}
@@ -13633,7 +14117,7 @@ position wrong (by \texttt{10pt}) if you simply write:
The \Package{topcapt} package solves this problem:
\begin{quote}
\begin{verbatim}
-\usepackage{topcaption}
+\usepackage{topcapt}
...
\begin{table}
\topcaption{Example table}
@@ -14288,7 +14772,7 @@ than columns. So, we set things up by:
\end{wideversion}
\end{quote}
Now, we put `\texttt{\$}' before the first column specifier; and we
-put `\texttt{\textasciicircum}'
+put `\texttt{\textasciicircum{}}'
before the modifiers of subsequent ones. We then use \csx{rowstyle} at
the start of each row we want to modify:
\begin{quote}
@@ -14517,6 +15001,47 @@ not work with obsolete (pre-\LaTeXe{}) packages such as
\Qref[question]{graphics inclusion}{Q-impgraph} for discussion of the
genesis of \csx{includegraphics}.
+\Question[Q-wideflt]{Centring a very wide figure or table}
+
+The normal means of centring a figure or table object is to include
+\csx{centering} at the top of the float. This doesn't help if the
+object is wider than \csx{textwidth}~--- the object starts at the left
+margin and juts out into the right margin (which is actually doubly
+unsatisfactory, since as well as looking bad, the float won't be
+placed until the next \csx{clearpage} or the like.)
+
+You can avoid the problem by rescaling the figure or table to fit, but
+this is often not satisfactory, for several reasons.
+
+Otherwise, if the object is wider than the printable area of the page,
+you've no choice other than to \Qref*{rotate it}{Q-landscape}. If,
+however, the object is \emph{just} wider than the text block, you can
+make it pretend to be the right size by:
+\begin{quote}
+\begin{wideversion}
+\begin{verbatim}
+\begin{figure}
+ \noindent
+ \makebox[\textwidth]{\includegraphics{my-wide-figure}}%
+ \caption{This figure juts out into both margins}
+\end{figure}
+\end{verbatim}
+\end{wideversion}
+\begin{narrowversion}
+\begin{verbatim}
+\begin{figure}
+ \noindent
+ \makebox[\textwidth]{%
+ \includegraphics{my-wide-figure}%
+ }%
+ \caption{This figure juts out into both margins}
+\end{figure}
+\end{verbatim}
+\end{narrowversion}
+\end{quote}
+Note the \csx{noindent}: the \csx{makebox} starts a paragraph, and you
+really don't want that indented by \csx{parindent}.
+
\Question[Q-2colfloat]{Placing two-column floats at bottom of page}
You specified placement `\texttt{[htbp]}' for your full-width figure or
@@ -14721,10 +15246,26 @@ overtake ``real floats'', so that the numbers of figures will be out
of order: figure 6 could be on page 12, while figure 5 had floated to
page 13. It's best, therefore, either to stay with floating figures
throughout a document, or to use fixed figures throughout.
+
+If it's really impossible to follow that counsel of perfection, you
+can use the \Package{perpage} package's command \csx{MakeSorted}
+command:
+\begin{quote}
+\begin{verbatim}
+...
+\usepackage{float}
+\usepackage{perpage}
+\MakeSorted{figure}
+\MakeSorted{table}
+...
+\end{verbatim}
+\end{quote}
+and the sequence of float numbers is all correct.
\begin{ctanrefs}
\item[capt-of.sty]\CTANref{capt-of}
\item[caption.sty]\CTANref{caption}
\item[float.sty]\CTANref{float}
+\item[perpage.sty]Distributed as part \CTANref{bigfoot}
\end{ctanrefs}
\subsection{Footnotes}
@@ -14832,12 +15373,18 @@ To suppress the footnote in headings and table of contents:
Footnotes in captions are especially tricky: they present problems of
their own, on top of the problems one experiences with
-\Qref*{footnotes in section titles}{Q-ftnsect} and with % ! line break
-\Qref*{footnotes in tables}{Q-footintab}. Fortunately, the
-requirement for footnotes in captions is extremely rare: if you are
-experiencing problems, it is worth reviewing what you are trying to
-say by placing this footnote. Note that the \Package{threeparttable}
-scheme (see, again, % ! line break
+\Qref*{footnotes in section titles}{Q-ftnsect} (footnotes migrating to
+to the list of figures or tables, or % ! line break
+\Qref{apparently random errors}{Q-extrabrace} because
+\csx{footnote} is a fragile command), and with % ! line break
+\Qref*{footnotes in tables}{Q-footintab} (typically, the footnote
+simply disappears). Fortunately, the requirement for footnotes in
+captions is extremely rare: if you are experiencing problems, it is
+worth reviewing what you are trying to say by placing this footnote:
+other options are to place text at the bottom of the float, or to
+place a footnote at the point where you refer to the float.
+
+Note that the \Package{threeparttable} scheme (see, again, % ! line break
\Qref[question]{footnotes in tables}{Q-footintab}) also applies
to notes in captions, and may very well be preferable to whatever you
were thinking of.
@@ -14872,10 +15419,10 @@ command in a \environment{minipage} environment within a float (as
in the example above) can produce \emph{two} copies of the footnote
body ``blah''. (In fact, the effect only occurs with captions that are
long enough to require two lines to be typeset, and so wouldn't appear
-with such a short caption.)
+with such a short caption as that in the example above.)
The documentation of the \Package{ccaption} package describes a really
-rather awful work-around.
+rather awful work-around for this problem.
\begin{ctanrefs}
\item[ccaption.sty]\CTANref{ccaption}
\item[threeparttable.sty]\CTANref{threeparttable}
@@ -15000,13 +15547,13 @@ The obvious solution is to make the footnote number reset whenever the
page number is stepped, using the % ! line break
\Qref*{\LaTeX{} internal mechanism}{Q-addtoreset}. Sadly, the place
in the document where the page number is stepped is unpredictable, not
-(``tidily'') at the end of the printed page; so the link only ever
-works by luck.
+(``tidily'') at the end of the printed page; so changing the footnote
+number only ever works by `luck'.
As a result, resetting footnotes is inevitably a complicated process,
using labels of some sort. It's nevertheless important, given the
common requirement for footnotes marked by symbols (with painfully
-small symbol sets). There are three packages that manage it, one way
+small symbol sets). There are four packages that manage it, one way
or another.
The \Package{perpage} package provides a general mechanism for
@@ -15015,7 +15562,14 @@ The interface is pretty simple: \cmdinvoke{MakePerPage}{footnote} will
do the job. If you want to restart the counter at something other
than~1 (for example to avoid something in the \LaTeX{} footnote symbol
list), you can use: \cmdinvoke{MakePerPage}[2]{footnote}. It's a
-first-rate package, small and efficient
+first-rate package, small and efficient.
+
+The \Package{zref} package provides the same facilities with its
+\pkgoption{perpage} module, which defines a command \csx{zmakeperpage}
+whose syntax is identical to that of \Package{perpage}, above. You can
+load the module by \cmdinvoke{usepackage}[perpage]{zref} (or as
+\cmdinvoke{usepackage}{zref-perpage}, if your needs so require~---
+look at \Package{zref}'s documentation for details).
The \Package{footmisc} package provides a variety of means of
controlling footnote appearance, among them a package option
@@ -15031,6 +15585,9 @@ probably not particularly useful any more. (Documentation is
\item[footmisc.sty]\CTANref{footmisc}
\item[footnpag.sty]\CTANref{footnpag}
\item[perpage.sty]Distributed as part \CTANref{bigfoot}
+\item[zref.sty]Distributed as a collection member in \CTANref{oberdiek}
+\item[zref-perpage.sty]Distributed as a collection member in
+ \CTANref{oberdiek}
\end{ctanrefs}
\Question[Q-run-fn-nos]{Not resetting footnote numbers per chapter}
@@ -15560,8 +16117,8 @@ following minimal solution:
\begin{wideversion}
\begin{verbatim}
\def\RCS$#1: #2 ${\expandafter\def\csname RCS#1\endcsname{#2}}
-\RCS$Revision: 1.548 $ % or any RCS keyword
-\RCS$Date: 2008/06/20 13:37:44 $
+\RCS$Revision: 1.612 $ % or any RCS keyword
+\RCS$Date: 2009/06/09 22:45:20 $
...
\date{Revision \RCSRevision, \RCSDate}
\end{verbatim}
@@ -15571,8 +16128,8 @@ following minimal solution:
\def\RCS$#1: #2 ${\expandafter
\def\csname RCS#1\endcsname{#2}%
}
-\RCS$Revision: 1.548 $ % or any RCS keyword
-\RCS$Date: 2008/06/20 13:37:44 $
+\RCS$Revision: 1.612 $ % or any RCS keyword
+\RCS$Date: 2009/06/09 22:45:20 $
...
\date{Revision \RCSRevision, \RCSDate}
\end{verbatim}
@@ -16230,25 +16787,14 @@ the selections before setting up hyphenation exceptions.
Knuth was making a particular point about the capabilities of \TeX{}
when he defined the logo. Unfortunately, many believe, he thereby
opened floodgates to give the world a whole range of rather silly
-`bumpy road' logos such as \AMSTeX{}, \PiCTeX{}, \BibTeX{}, and so on,
-produced in a flurry of different fonts, sizes, and baselines~--- indeed,
-everything one might hope to cause them to obstruct the reading process.
-In particular, Lamport invented \LaTeX{}
-\htmlignore
-(silly enough in itself)
-\endhtmlignore
-\begin{htmlversion}
- (silly enough in itself, with a raised small `A' and a lowered `E')
-\end{htmlversion}
-and marketing input from Addison-Wesley led to the even
-stranger current logo
-\htmlignore
-\LaTeXe{}.
-\endhtmlignore
-\begin{htmlversion}
- \LaTeXe{}, which appends a lowered single-stroke Greek letter
- epsilon.
-\end{htmlversion}
+`bumpy road' logos for \TeX{} entities such as \AMSTeX{}, \PiCTeX{},
+\BibTeX{}, and so on, produced in a flurry of different fonts, sizes,
+and baselines~--- indeed, everything one might hope to cause them to
+obstruct the reading process. In particular, Lamport invented
+\LaTeX{} (silly enough in itself, with a raised small `A' and a
+lowered `E') and marketing input from Addison-Wesley led to the even
+stranger current logo for \LaTeXe{}, which appends a lowered % !line break
+\latexhtml{\ensuremath{\varepsilon}}{single-stroke Greek letter &epsilon;}.
Sensible users don't have to follow this stuff wherever it goes,
but, for those who insist, a large collection of logos is defined in
@@ -16265,23 +16811,16 @@ use of the Knuthian font for \MP{} (you might get
% which is nice, given the feebleness of representing all these silly
% logos in html otherwise...
\begin{htmlversion}
- something like `META&nbsp;O&nbsp;T').
+ something like `META\&nbsp;\&nbsp;O\&nbsp;\&nbsp;T').
\end{htmlversion}
-You needn't despair, however~--- the author himself uses just `MetaPost'.
+You needn't despair, however~--- most versions of the logo font
+distributed nowadays contain the missing letters, and the author
+himself uses just `MetaPost'.
For those who don't wish to acquire the `proper' logos, the canonical
thing to do is to say \texttt{AMS-}\cmdinvoke{TeX}{}
-\htmlignore
-(\acro{AMS}-\TeX{})
-\endhtmlignore
for \AMSTeX{}, \texttt{Pic}\cmdinvoke{TeX}{}
-\htmlignore
-(Pic\TeX{})
-\endhtmlignore
for \PiCTeX{}, \texttt{Bib}\cmdinvoke{TeX}{}
-\htmlignore
-(Bib\TeX{})
-\endhtmlignore
for \BibTeX{}, and so on.
\begin{ctanrefs}
\item[mflogo.sty]\CTANref{mflogo}
@@ -16433,24 +16972,70 @@ a variety of jobs.
\section{Symbols, etc.}
+\Question[Q-usesymb]{Using symbols}
+
+Most symbol font sets come with a package that defines commands for
+every symbol in the font. While this is convenient, it can lead to
+difficulties, particularly with name clashes when you load packages
+that cover fonts which duplicate symbols~--- an issue which is
+discussed in
+\begin{narrowversion}
+ \Qref[question]{}{Q-alreadydef}.
+\end{narrowversion}
+\begin{wideversion}
+ ``\Qref{symbol already defined}{Q-alreadydef}''.
+\end{wideversion}
+Some font sets (for example, \FontName{MnSymbol}) are huge, and the
+accompanying macros cover so many symbols that name clashes are surely
+a serious problem.
+
+The \Package{pifont} package (originally designed to use the Adobe
+\FontName{Zapf Dingbats} font) avoids this sort of problem: it requires
+you to know the font position of any symbol you want to use (the
+documentation provides font tables). The basic command is
+\cmdinvoke*{ding}{number} for a single symbol; there are commands for
+other fancier uses. \Package{Pifont} also allows you to select other
+fonts, for similar use.
+
+The \Package{yagusylo} describes itself as ``an extended version of
+\Package{pifont}, gone technicolor''. It provides all the facilities
+of \Package{pifont}, but allows you to create your own mnemonic names
+for symbols. Thus, while you can say % ! line break
+\cmdinvoke*{yagding}[family]{symbol number}[colour], you can also
+define symbol names with \csx{defdingname}, and then use them
+with \cmdinvoke*{yagding*}{symbol name} (the defined name carries the
+font family and colour specified in the arguments of
+\csx{defdingname}).
+
+\Package{Yagusylo} is somewhat complicated, but its documentation is
+clear; it is probably the best tool to use for picking and choosing
+symbols from a variety of font families.
+\begin{ctanrefs}
+\item[mnsymbol \nothtml{\rmfamily}fonts]\CTANref{mnsymbol}
+\item[pifont.sty]Distributed as part of \CTANref{psnfss}
+\item[yagusylo.sty]\CTANref{yagusylo}
+\end{ctanrefs}
+
\Question[Q-numbersets]{Symbols for the number sets}
-It is a good idea to have commands such as \csx{R} for the real numbers and
+Mathematicians commonly use special lettering for the real numbers and
other standard number sets. Traditionally these were typeset in bold.
Because, in the ordinary course of events, mathematicians do not have
-access to bold chalk, they invented the special symbols that are now
-often used for \csx{R}, \csx{C}, \emph{etc}. These symbols are known
-as ``blackboard bold''. Before insisting on using them, consider
-whether going back to the old system of ordinary bold might not be
-acceptable (it is certainly simpler).
+access to bold chalk, they invented special symbols that are now
+often used for the number sets; these symbols are known as
+``blackboard bold'' (or double-stroked fonts); in place of the heavier
+strokes of a bold font, (some) strokes of the letters are doubled.
+The minimum useful set is upper-case letters `I', `N', `R', `Q' and
+`Z'; some fonts offer a figure `1' (for a unit matrix~--- not a number
+set at all).
A set of blackboard bold capitals is available in the \acro{AMS}
\FontName{msbm} fonts (\FontName{msbm} is available at a range of
-design sizes, with names such as \FontName{msbm10}). The pair of font
+design sizes, with names such as \FontName{msbm10}). The pair of font
families (the other is called \FontName{msam}) have a large number of
-mathematical symbols to supplement the ones in the standard \TeX{}
-distribution, and are available in Type~1 format with most modern
-distributions. Support files for using the fonts, both under
+mathematical symbols to supplement those provided in the Knuth's
+original \TeX{} distribution, and are available in Type~1 format in
+modern distributions. Support files for using the fonts, both under
\plaintex{} and \LaTeX{} (packages \Package{amssymb} and
\Package{amsfonts}), are available. The font shape is a rather
austere sans, which many people don't like (though it captures the
@@ -16472,6 +17057,11 @@ and sans shapes, at a single weight, and is available both as \MF{}
sources and as Type~1; the font covers the uppercase latin letters,
lowercase `h' and 'k', and the digit `1'.
+A document that shows the \FontName{bbm}, \FontName{bbold},
+\FontName{doublestroke} and \FontName{msbm} fonts, so that you can get
+a feel for their appearance, is available (\acro{CTAN} package
+\Package{blackboard}).
+
An alternative source of Type~1 fonts with blackboard bold characters
may be found in the steadily increasing set of complete families, both
commercial and free, that have been prepared for use with \AllTeX{}
@@ -16488,23 +17078,24 @@ the digit `1', and lower-case `k'.
The ``lazy person's'' blackboard bold macros:
\begin{quote}
\begin{verbatim}
-\newcommand{\R}{{\sf R\hspace*{-0.9ex}%
+\newcommand{\R}{{\textsf{R}\hspace*{-0.9ex}%
\rule{0.15ex}{1.5ex}\hspace*{0.9ex}}}
-\newcommand{\N}{{\sf N\hspace*{-1.0ex}%
+\newcommand{\N}{{\textsf{N}\hspace*{-1.0ex}%
\rule{0.15ex}{1.3ex}\hspace*{1.0ex}}}
-\newcommand{\Q}{{\sf Q\hspace*{-1.1ex}%
+\newcommand{\Q}{{\textsf{Q}\hspace*{-1.1ex}%
\rule{0.15ex}{1.5ex}\hspace*{1.1ex}}}
-\newcommand{\C}{{\sf C\hspace*{-0.9ex}%
+\newcommand{\C}{{\textsf{C}\hspace*{-0.9ex}%
\rule{0.15ex}{1.3ex}\hspace*{0.9ex}}}
\end{verbatim}
\end{quote}
are almost acceptable at normal size if the surrounding text is
-\FontName{cmr10}. However, they are not part of a proper maths font,
-and so do not work in sub- and superscripts. Moreover, the size and
-position of the vertical bar can be affected by the font of the
-surrounding text. As we've seen, there are plenty of alternatives:
-don't try the macros, or anything similar using capital `I' (which
-looks even worse!).
+\FontName{cmr10} (the position of the vertical bar can be affected by
+the surrounding font). However, they are not part of a proper maths font,
+and do not work in sub- and superscripts. As we've seen, there are
+plenty of alternatives: that mythical ``lazy'' person can inevitably
+do better than the macros, or anything similar using capital `I'
+(which looks even worse!). Voluntary \AllTeX{} effort has redefined
+the meaning of laziness (in this respect!).
\begin{ctanrefs}
\item[AMS support files (Plain)]\CTANref{amsfonts-plain}
\item[AMS support files (LaTeX)]\CTANref{amsfonts-latex}
@@ -16513,6 +17104,7 @@ looks even worse!).
\item[bbm fonts]\CTANref{bbm}
\item[bbm macros]\CTANref{bbm-macros}
\item[bbold fonts]\CTANref{bbold}
+\item[blackboard \nothtml{\rmfamily}evaluation set]\CTANref{blackboard}
\item[doublestroke fonts]\CTANref{doublestroke}
\item[fourier fonts]\CTANref{fourier}
\item[mathpazo fonts]\CTANref{mathpazo}
@@ -16535,11 +17127,9 @@ modern \TeX{} distributions.
distribution.
\item[RSFS] The \Package{mathrsfs} package uses a really fancy script
font (the name stands for ``Ralph Smith's Formal Script'') which is
- already part of most modern \TeX{} distributions. The package
+ already part of most modern \TeX{} distributions (Type~1 versions of
+ the font are also provided, courtesy of Taco Hoekwater). The package
creates a new command \csx{mathscr}.
-
- Type 1 versions of the font have been made available by Taco
- Hoekwater.
\item[Zapf Chancery] is the standard \PS{} calligraphic font. There
is no package but you can easily make it available by means of the
command
@@ -16560,8 +17150,9 @@ modern \TeX{} distributions.
Adobe Zapf Chancery (which the above examples use) is distributed in
any but the most basic \PS{} printers. A substantially identical
font (to the extent that the same metrics may be used) is
- available from \acro{URW} and is distributed with
- \ProgName{ghostscript}.
+ available from \acro{URW}, called URW Chancery L: it is distributed
+ with Ghostscript, and as part of the ``URW base35'' bundle, which is
+ available in most distributions.
\end{description}
Examples of the available styles are available on \acro{CTAN}.
\begin{ctanrefs}
@@ -16571,8 +17162,8 @@ Examples of the available styles are available on \acro{CTAN}.
\item[ghostscript]Browse \CTANref{ghostscript}
\item[mathrsfs.sty]Distributed as part of \CTANref{jknappen-macros}
\item[rsfs fonts]\CTANref{rsfs}
-\item[rsfs fonts, in Type 1 format]\CTANref{rsfs-type1}
\item[Script font examples]\CTANref{mathscript}
+\item[URW Chancery L]Distributed as part of \CTANref{urw-base35}
\end{ctanrefs}
\Question[Q-boldgreek]{Setting bold Greek letters in \LaTeX{}}
@@ -16831,12 +17422,252 @@ errors: you \emph{must} use
\end{verbatim}
\end{quote}
+\Question[Q-osf]{Using ``old-style'' figures}
+
+These numbers are also called medieval or lowercase figures and their
+use is mostly font-specific. Terminology is confusing since the
+lining figures (which are now the default) are a relatively recent
+development (19th century) and before they arrived, oldstyle figures
+were the norm, even when setting mathematics. (An example is Thomas
+Harriot's \emph{Artis Analyticae Praxis} published in 1631). In a
+typical old style 3, 4, 5, 7 and 9 have descenders and 6 and 8 ascend
+above the x-height; sometimes 2 will also ascend (this last seems to
+be a variation associated with French typography).
+
+\LaTeX{} provides a command \cmdinvoke*{oldstylenums}{digits}, which
+by default uses an old-style set embedded in Knuth's `math italic'
+font. The command isn't sensitive to the font style of surrounding
+text: the glyphs are only available to match the normal medium weight
+Computer Modern Roman fonts.
+
+The \Package{textcomp} package changes \csx{oldstylenums} to use the
+glyphs in the Text Companion fonts (\LaTeX{} \acro{TS}1 encoding) when
+in text mode, and also makes them available using the macros of the
+form \csx{text<number>oldstyle}, e.g., \csx{textzerooldstyle}.
+(Of course, not all font families can provide this facility.)
+
+Some font packages (e.g., \Package{mathpazo}) make old-style figures
+available and provide explicit support for making them the default:
+\cmdinvoke{usepackage}[osf]{mathpazo} selects a form where digits are
+always old-style in text. The \Package{fontinst} package will
+automatically generate ``old-style versions'' of commercial Adobe Type
+1 font families for which ``expert'' sets are available.
+
+It's also possible to make virtual fonts, that offer old-style digits,
+from existing font packages. The \FontName{cmolddig} bundle provides
+a such a virtual version of Knuth's originals, and the \FontName{eco}
+or \FontName{hfoldsty} bundles both provide versions of the \acro{EC}
+fonts. The \FontName{lm} family offers old-style figures to OpenType
+users (see below), but we have no stable mapping for \FontName{lm}
+with old-style digits from the Adobe Type 1 versions of the fonts.
+
+Originally, oldstyle figures were only to be found the expert sets of
+commercial fonts, but now they are increasingly widely available. An
+example is Matthew Carter's Georgia font, which has old-style figures
+as its normal form (the font was created for inclusion with certain
+Microsoft products and is intended for on-screen viewing).
+
+OpenType fonts have a pair of axes for number variations~---
+proportional/tabular and lining/oldstyle selections are commonly
+available. ``Full feature access'' to OpenType fonts, making such
+options available to the \AllTeX{} user, is already supported by
+\Qref*{\xetex{}}{Q-xetex} using, for example, the \Package{fontspec}
+package. Similar support is also in the works for
+\Qref*{\LuaTeX{}}{Q-luatex}.
+\begin{ctanrefs}
+\item[cmolddig \nothtml{\rmfamily}fonts]\CTANref{cmolddig}
+\item[eco \nothtml{\rmfamily}fonts]\CTANref{eco}
+\item[fontinst]\CTANref{fontinst}
+\item[fontspec.sty]\CTANref{fontspec}
+\item[mathpazo \nothtml{\rmfamily}fonts]\CTANref{mathpazo}
+\end{ctanrefs}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Macro programming}
\subsection{``Generic'' macros and techniques}
+\Question[Q-linmacnames]{Non-letters in macro names}
+
+New \LaTeX{} users are often suprised that macro definitions
+containing non-letters, such as
+\begin{quote}
+\begin{verbatim}
+\newcommand{\cul8r}{Goodbye!}
+\end{verbatim}
+\end{quote}
+fail to compile. The reason is that the \TeX{} macro language, unlike
+most programming languages, allows % ! loin break (twatbili)
+\Qref*{nothing but letters in macro names}{Q-whatmacros}.
+
+There are a number of techniques for defining a macro with a name like
+\csx{cul8r}. Unfortunately, none of the techniques is particularly
+good:
+\begin{enumerate}
+\item Use \csx{csname}\dots\csx{endcsname} to define and invoke the
+ macro:
+ \begin{quote}
+\begin{narrowversion}
+\begin{verbatim}
+\expandafter\newcommand
+ \csname cul8r\endcsname{Goodbye!}
+I said, ``\csname cul8r\endcsname''.
+\end{verbatim}
+\end{narrowversion}
+\begin{wideversion}
+\begin{verbatim}
+\expandafter\newcommand\csname cul8r\endcsname{Goodbye!}
+I said, ``\csname cul8r\endcsname''.
+\end{verbatim}
+\end{wideversion}
+ \end{quote}
+ \begin{description}
+ \item[Pro:] No unexpected side effects
+ \item[Con:] So verbose as to be unusable
+ \end{description}
+\item Define a ``special-command generator'', and use the resulting
+ commands:
+\begin{quote}
+\begin{narrowversion}
+\begin{verbatim}
+\newcommand{\DefineRemark}[2]{%
+ \expandafter\newcommand
+ \csname rmk-#1\endcsname{#2}%
+}
+\newcommand{\Remark}[1]{%
+ \csname rmk-#1\endcsname%
+}
+...
+\DefineRemark{cul8r}{Goodbye!}
+...
+I said, ``\Remark{cul8r}''.
+\end{verbatim}
+\end{narrowversion}
+\begin{wideversion}
+\begin{verbatim}
+\newcommand{\DefineRemark}[2]{%
+ \expandafter\newcommand\csname rmk-#1\endcsname{#2}%
+}
+\newcommand{\Remark}[1]{\csname rmk-#1\endcsname}
+...
+\DefineRemark{cul8r}{Goodbye!}
+...
+\Remark{cul8r}
+\end{verbatim}
+\end{wideversion}
+\end{quote}
+ \begin{description}
+ \item[Pro:] Straightforward to use, not too untidy
+ \item[Con:] It's hardly doing what we set out to do (experts will
+ see that you are defining a macro, but others likely won't)
+ \end{description}
+\item Convince \TeX{} that ``\texttt{8}'' is a letter:
+ \begin{quote}
+\begin{verbatim}
+\catcode`8 = 11
+\newcommand{\cul8r}{Goodbye!}
+I said, ``\cul8r''.
+\end{verbatim}
+ \end{quote}
+ \begin{description}
+ \item[Pro:] \csx{cul8r} can be used directly
+ \item[Con:] Likely to break other uses of ``\texttt{8}'' (such as
+ numbers or dimensions; so
+ \cmdinvoke{setlength}{\csx{paperwidth}}{8in} tells us:
+ \begin{quote}
+\begin{verbatim}
+! Missing number, treated as zero.
+<to be read again>
+ 8
+\end{verbatim}
+ \end{quote}
+ \end{description}
+ As a general rule, changing category codes is something to use
+ \emph{in extremis}, after detailed examination of options. It is
+ conceivable that such drastic action could be useful for you, but
+ most ordinary users are well advised not even to try such a
+ technique.
+\item Define a macro \csx{cul} which must always be followed by
+ ``\texttt{8r}'':
+ \begin{quote}
+\begin{verbatim}
+\def\cul8r{Goodbye!}
+I said, ``\cul8r''.
+\end{verbatim}
+ \end{quote}
+ \begin{description}
+ \item[Pro:] \csx{cul8r} can be used directly
+ \item[Con~\#1:] Breaks if \csx{cul} is followed by anything other
+ than ``\texttt{8r}'', with a confusing diagnostic~---
+ \csx{cul99} produces:
+ \begin{quote}
+\begin{wideversion}
+\begin{verbatim}
+! Use of \cul doesn't match its definition.
+<*> \cul9
+ 9
+\end{verbatim}
+\end{wideversion}
+\begin{narrowversion}
+\begin{verbatim}
+! Use of \cul doesn't match its
+ definition.
+<*> \cul9
+ 9
+\end{verbatim}
+\end{narrowversion}
+ \end{quote}
+ (which would confuse someone who hadn't even realised there
+ \emph{was} a definition of \csx{cul} in the document).
+ \item[Con~\#2:] Silently redefines existing \csx{cul}, if any;
+ as a result, the technique cannot be used to define both a
+ \csx{cul8r} and, say, a \csx{cul123} macro in the same
+ document.
+ \end{description}
+\end{enumerate}
+Technique~3 is in fact commonly used~--- in a limited form~--- within
+most \LaTeX{} packages and within \LaTeX{} itself. The convention is to
+use ``\texttt{@}'' within the names of internal macros to hide them
+from the user and thereby prevent naming conflicts. To this end,
+\LaTeX{} automatically treats ``\texttt{@}'' as a letter while
+processing classes and packages and as a non-letter while processing
+the user's document. The key to this technique is the separation:
+internally a non-letter is used for macro names, and the user doesn't
+see anything of it, while the status remains ``frozen'' in all the
+definitions created within the class or package. See % ! line break
+\Qref[question]{\csx{@} and \texttt{@} in macro names}{Q-atsigns} for
+more information.
+
+Note that analogous use of technique~3 in this example would give us
+\begin{quote}
+\begin{verbatim}
+\begingroup
+ \catcode`8 = 11
+ \gdef\cul8r{Goodbye!}
+ \gdef\later{\cul8r}
+\endgroup
+I said, ``\later''.
+\end{verbatim}
+\end{quote}
+which works, but rather defeats the object of the exercise.
+(\csx{later} has the ``frozen'' catcode for `8', even though the value
+has reverted to normal by the time it's used; note, also, the use of
+the primitive command \csx{gdef}, since \csx{newcommand} can't make a
+macro that's available outside the group.)
+
+\emph{Recommendation}: Either choose another mechanism (such as
+\csx{DefineRemark} above), or choose another name for your macro, one
+that contains only ordinary letters. A common approach is to use
+roman numerals in place of arabic ones:
+\begin{quote}
+\begin{verbatim}
+\newcommand{\culVIIIr}{Goodbye!}
+\end{verbatim}
+\end{quote}
+which rather spoils the intent of the joke implicit in the example
+\csx{cul8r}!
+
\Question[Q-findwidth]{Finding the width of a letter, word, or phrase}
Put the word in a box, and measure the width of the box. For example,
@@ -16877,7 +17708,7 @@ would naturally write:
\end{quote}
However, this would not work: a call to \csx{splat} would execute
\csx{mumble}, and the call the redefined \csx{splat} again; this is an
-infinite recursive loop, that will quickly exhaust \TeX{}'s memory.
+unterminated recursion, that will quickly exhaust \TeX{}'s memory.
Fortunately, the \TeX{} primitive \csx{let} command comes to our
rescue; it allows us to take a ``snapshot'' of the current state of a
@@ -16948,7 +17779,12 @@ The \Package{etoolbox} (which provides user access to \eTeX{}'s
programming facilities) provides a command \csx{patchcmd} which will
perform a ``string substitution'' in a macro's definition. The
package also provides commands that prepend (\csx{pretocmd}) or append
-(\csx{apptocmd}) to the definition of a command.
+(\csx{apptocmd}) to the definition of a command. Not all commands may
+be patched in this way; the package provides a command
+\csx{ifpatchable} which checks the prerequisites, and checks that the
+target command's body does indeed include the patch string you propose
+to use. (The command \csx{ifpatchable*} omits the test on the patch
+string.)
Finally, we'll briefly consider a package that is (just about)
usable, but not really recommendable. \Package{Patch} gives you an
@@ -16966,7 +17802,7 @@ Fortunately, the file (\File{patch.doc}) may be input directly, and
Roughly speaking, one gives the command a set of instructions
analogous to \ProgName{sed} substitutions, and it regenerates the
command thus amended. Unless you can't do your job any other way, you
-had probably best avoid \Package{Patch}.
+had probably best avoid \Package{patch}.
\begin{ctanrefs}
\item[etoolbox.sty]\CTANref{etoolbox}
\item[patch.doc]\CTANref{patch}
@@ -17414,6 +18250,179 @@ accurately.
\item[keyval.sty]Distributed as part of \CTANref{graphics}
\end{ctanrefs}
+\Question[Q-keyval]{Key-value input for macros and package options}
+
+When we discussed % !line break
+\Qref*{extending the number of arguments to a macro}{Q-moren9}, we
+suggested that large numbers of arguments, distinguished only by their
+position, aren't very kind to the user, and that a package such as
+\Package{keyval} offers a more attractive user interface. We now
+consider the packages that the macro programmer might use, to create
+such a user interface.
+
+The simplest key-value processor remains \Package{keyval}; it has a
+command \csx{define@key} to declare a key and a \emph{handler} to
+process it, and a macro \csx{setkeys} to offer values to the handler
+of one or more keys. Thus:
+\begin{quote}
+\begin{verbatim}
+\define@key{my}{foo}{Foo is #1\par}
+\define@key{my}{bar}[99]{Bar is #1\par}
+...
+\setkeys{my}{foo=3,bar}
+\end{verbatim}
+\end{quote}
+will produce output saying:
+\begin{quote}
+ Foo is 3\par{}
+ Bar is 99
+\end{quote}
+This has defined two keys `\texttt{foo}' and `\texttt{bar}' in family
+`\texttt{my}', and then executed them, the first with argument
+`\texttt{3}' and the second with no argument, so that the default
+value of `\texttt{99}' is picked up. In effect, the two calls to
+\csx{define@key} are simply defining commands, as (for example):
+\begin{quote}
+\begin{verbatim}
+\newcommand{\KV@my@foo}[1]{Foo is #1}
+\end{verbatim}
+\end{quote}
+(the definition of \csx{KV@my@bar} is similar, but trickier). The
+command \csx{setkeys} knows how to find those commands when it needs to
+process each key~--- it is easy to regurgitate the structure of the
+command name, with family name (`\texttt{my}', here) after the first
+`\texttt{@}', and the key name after the second `\texttt{@}'. (The
+`\texttt{KV}' part is fixed, in \Package{keyval}.)
+
+These simple commands are enough, in fact, to process the botanical
+example offered as replacement for multi-argument commands in % ! line break
+\Qref[question]{the question mentioned above}{Q-moren9}, or the
+optional arguments of the \csx{includegraphics} command of the
+\Package{graphicx} package. (The last is, in fact, what
+\Package{keyval} was designed to do.)
+
+However, we need more if we're to to have package options in
+`key-value' form. Packages like \Package{hyperref} have enormously
+complicated package options which need key-value processing at
+\csx{ProcessOptions} time: \Package{keyval} can't do that on its own.
+
+Heiko Oberdiek's \Package{kvoptions} package comes to our help: it
+enables the programmer to declare class or package options that
+operate as key and value pairs. The package defines commands
+\csx{DeclareBoolOption} for options whose value should be either
+\emph{true} or \emph{false}, and \csx{DeclareStringOption} for all
+other options that have a value. Keys are declared using
+\Package{keyval} and may remain available for use within the document,
+or may be `cancelled' to avoid confusion. If you have loaded
+\Package{kvoptions}, the \LaTeX{} kernel's \csx{DeclareOption} becomes
+\csx{DeclareVoidOption} (it's an option with no value), and
+\csx{DeclareOption*} becomes \csx{DeclareDefaultOption}.
+
+Heiko also provides \Package{kvsetkeys} which is a more robust version
+of \Package{setkeys}, with some of the rough edges made smoother.
+
+Hendri Adriaens' \Package{xkeyval} offers more flexibility than
+the original \Package{keyval} and is more robust than the original,
+too. Like \Package{kvoptions}, the package also has mechanisms to
+allow class and package options in key-value form (macros
+\csx{DeclareOptionX}, \csx{ExecuteOptionsX} and \csx{ProcessOptionsX}.
+\Package{Pstricks} bundle packages use a \Package{xkeyval} derivative
+called \Package{pst-xkey} for their own key-value manipulation.
+% xkvview? (i think we can ignore xkvltxp for these purposes)
+
+The (widely-respected) \Package{pgf} graphics package has its own
+key-value package called \Package{pgfkeys}. The documentation of the
+package (part of the huge \Package{pgf} manual, in part 5,
+``utilities'') contains a useful comparison with other key-value
+systems; some notable differences are:
+\begin{itemize}
+\item key organisation: \Package{pgfkeys} uses a tree structure, while
+ \Package{keyval} and \Package{xkeyval} both associate keys with a family;
+\item \Package{pgfkeys} supports multi-argument key code; and
+\item \Package{pgfkeys} can support call-backs when an unknown key
+ appears (these things are called \emph{handlers}.
+\end{itemize}
+Keys are organized in a tree that is reminiscent of the Unix fille
+tree. A typical key might be, \File{/tikz/coordinate system/x} or
+just \File{/x}. When you specify keys you can provide the complete
+path of the key, but you usually just provide the name of the key
+(corresponding to the file name without any path) and the path is
+added automatically. So a \csx{pgfkeys} command might be:
+\begin{wideversion}
+\begin{quote}
+\begin{verbatim}
+\pgfkeys{/my key=hello,/your keys/main key=something\strange,
+ key name without path=something else}
+\end{verbatim}
+\end{quote}
+\end{wideversion}
+\begin{narrowversion}
+\begin{quote}
+\begin{verbatim}
+\pgfkeys{/my key=hello,
+ /your keys/main key=something\strange,
+ key name without path=something else}
+\end{verbatim}
+\end{quote}
+\end{narrowversion}
+and for each key mentioned, the associated code will be executed.
+\dots{} and that code is also set up using \csx{pgfkeys}:
+\begin{quote}
+\begin{verbatim}
+\pgfkeys{/my key/.code=The value is '#1'.}
+\end{verbatim}
+\end{quote}
+after which
+\begin{quote}
+\begin{verbatim}
+\pgfkeys{/my key=hi!}
+\end{verbatim}
+\end{quote}
+will produce just
+\begin{quote}
+ The value is 'hi!'.
+\end{quote}
+The manual goes on, showing how to define a key with two arguments,
+how to provide default value for a key, and how to define aliases for
+particular key sequences (which are called ``styles''). All in all,
+it seems a well thought-out system, offering a lot of flexibility that
+isn't available with the other keys packages. However, there seems to
+be no mechanism for using \Package{pgfkeys} keys as part of the
+options of another package, in the way that \Package{kvoptions} does.
+
+Another key-value system that's part of larger set of macros is
+\Package{scrbase}, which uses the facilities of \Package{keyval} to
+build a larger set of facilities, originally for use within the
+\Class{KOMA-script} bundle. For English-speaking authors, there are
+difficulties from the German-only documentation; however, from a
+partial translation available to the author of this answer, a summary
+is possible. The package may build on the facilities either of
+\Package{kyeval} or of \Package{xkeyval}, and builds its functionality
+on the structure of the `key family'. The user may define family
+`members' and keys are defined relative to the members. (For example,
+the package \Package{scrbase} is part of the \Class{KOMA-script}
+bundle; so its keys are all members of the \Package{scrbase.sty}
+family within the \Package{KOMA} family. The function
+\csx{FamilyProcessOptions} allows the programmer to decode the options
+of the package in terms of the package's key family. Note that there
+is no special provision made for ``traditional'' package options, as
+in the \Package{kvoptions} package.
+
+This brief summary was guided by input from two sources: a draft article
+for \textsl{TUGboat} by Joseph Wright, and the partial translation of the
+documentation of package \Package{scrbase} prepared by Philipp
+Stephani. At Joseph's suggestion, discussion of his \Package{keys3}
+package, which is designed for use with the experimental \LaTeX{}3,
+has been omitted.
+\begin{ctanrefs}
+\item[keyval.sty]Distributed as part of \CTANref{graphics}
+\item[kvoptions.sty]Distributed as part of \CTANref{oberdiek}
+\item[kvsetkeys.sty]Distributed as part of \CTANref{oberdiek}
+\item[pgfkeys.sty]Distributed as part of \CTANref{pgf}
+\item[scrbase.sty]Distributed as part of \CTANref{koma-script}
+\item[xkeyval.sty]\CTANref{xkeyval}
+\end{ctanrefs}
+
\Question[Q-activechars]{Defining characters as macros}
Single characters can act as macros (defined commands), and both
@@ -17827,9 +18836,9 @@ was present in the very first releases of \PDFTeX{}) is
\begin{quote}
\begin{verbatim}
\ifx\pdfoutput\undefined
- <not running PDFTeX>
+ ... % not running PDFTeX
\else
- <running PDFTeX>
+ ... % running PDFTeX
\fi
\end{verbatim}
\end{quote}
@@ -17852,12 +18861,12 @@ test may need to be elaborated:
\begin{quote}
\begin{verbatim}
\ifx\pdfoutput\undefined
- <not running PDFTeX>
+ ... % not running PDFTeX
\else
\ifx\pdfoutput\relax
- <not running PDFTeX>
+ ... % not running PDFTeX
\else
- <running PDFTeX>
+ ... % running PDFTeX
\fi
\fi
\end{verbatim}
@@ -17871,16 +18880,16 @@ output, you also need to know about the value of \csx{pdfoutput}:
\begin{quote}
\begin{verbatim}
\ifx\pdfoutput\undefined
- <not running PDFTeX>
+ ... % not running PDFTeX
\else
\ifx\pdfoutput\relax
- <not running PDFTeX>
+ ... % not running PDFTeX
\else
- <running PDFTeX, with...>
+ % running PDFTeX, with...
\ifnum\pdfoutput>0
- <...PDF output>
+ ... % PDF output
\else
- <...DVI output>
+ ... % DVI output
\fi
\fi
\fi
@@ -17889,8 +18898,17 @@ output, you also need to know about the value of \csx{pdfoutput}:
The above is, in essence, what Heiko Oberdiek's \Package{ifpdf}
package does; the reasoning is the \acro{FAQ}'s interpretation of
Heiko's explanation.
+
+As an aside: there are now analogous packages \Package{ifxetex} and
+\Package{ifluatex}, for the two up-and-coming \TeX{}-like engines (see
+the ``\TeX{} project'' answers covering % ! line break
+\Qref[\xetex{}~--- question]{\xetex{}}{Q-xetex}, and
+\Qref[\LuaTeX{}~--- question]{\LuaTeX{}}{Q-luatex}).
\begin{ctanrefs}
\item[ifpdf.sty]Distributed with Heiko Oberdiek's packages \CTANref{oberdiek}
+\item[ifluatex.sty]Distributed with Heiko Oberdiek's packages
+ \CTANref{oberdiek}
+\item[ifxetex.sty]\CTANref{ifxetex}
\end{ctanrefs}
\Question[Q-subverttoks]{Subverting a token register}
@@ -18986,19 +20004,13 @@ then examined (in a \Package{hyperref}-safe way) to set a conditional
\csx{ifoddpage}. Of course, the \csx{label} contributes to \LaTeX{}'s
``Rerun to get cross-references right'' error messages\dots{}
-The (older) \Package{chngpage} provides the same facilities (though it
-provides a \csx{ifcpoddpage} command; \Package{changepage} (whose
-functions are extracted from the author's \Class{memoir} class) is the
-designated successor to \Package{chngpage}.
-
The Koma-Script classes have an \environment{addmargin*} environment
-that also provides the sorts of facilities that the \Package{chngpage}
+that also provides the sorts of facilities that the \Package{changepage}
offers. Koma-Script's supporting command is % !line break
\cmdinvoke{ifthispageodd}{<true>}{<false>} executes different things
depending on the page number.
\begin{ctanrefs}
\item[changepage.sty]\CTANref{changepage}
-\item[chngpage.sty]\CTANref{chngpage}
\item[\nothtml{\rmfamily}KOMA script bundle]\CTANref{koma-script}
\item[memoir.cls]\CTANref{memoir}
\end{ctanrefs}
@@ -19962,7 +20974,7 @@ necessary?''.
address or the like, then the \csx{url} command from the
\Package{url} will help: it doesn't suffer from all the problems of
\csx{verb}, though it's still not robust; % ! line break
- ''\Qref*{typesetting \acro{URL}s}{Q-setURL}'' offers advice here.
+ ``\Qref*{typesetting \acro{URL}s}{Q-setURL}'' offers advice here.
\item If you're putting \csx{verb} into the argument of a boxing
command (such as \csx{fbox}), consider using the \environment{lrbox}
environment:
@@ -19983,13 +20995,13 @@ Otherwise, there are three partial solutions to the problem.
\item Some packages have macros which are designed to be responsive
to verbatim text in their arguments. For example,
the \Package{fancyvrb} package defines a command
- \csx{VerbatimFootnotes}, which redefines the \csx{footnotetext} (and
- hence the \csx{footnote}) commands in such a way that you can include
- \csx{verb} commands in its argument. This approach could in
- principle be extended to the arguments of other commands, but it can
- clash with other packages: for example, \csx{VerbatimFootnotes}
- interacts poorly with the |para| option to the \Package{footmisc}
- package.
+ \csx{VerbatimFootnotes}, which redefines the \csx{footnotetext}
+ command, and hence also the behaviour of the \csx{footnote})
+ command, in such a way that you can include \csx{verb} commands in
+ its argument. This approach could in principle be extended to the
+ arguments of other commands, but it can clash with other packages:
+ for example, \csx{VerbatimFootnotes} interacts poorly with the
+ \pkgoption{para} option of the \Package{footmisc} package.
The \Class{memoir} class defines its \csx{footnote} command so that
it will accept verbatim in its arguments, without any supporting package.
@@ -19998,8 +21010,9 @@ Otherwise, there are three partial solutions to the problem.
and then to reuse the content of its argument; for details of this
extremely powerful facility, see the package documentation.
- Rather simpler is the \Package{verbdef} package, which defines a
- (robust) command which expands to the verbatim argument given.
+ Rather simpler is the \Package{verbdef} package, whose \csx{verbdef}
+ command defines a (robust) command which expands to the verbatim
+ argument given.
\item If you have a single character that is giving trouble (in
its absence you could simply use \csx{texttt}), consider using
\csx{string}. \cmdinvoke{texttt}{my\csx{string}\_name}
@@ -20442,6 +21455,49 @@ parentheses, but the issue seldom arises since such arguments rarely
contain text. If it were to arise, the same solution (enclosing the
confused characters in braces) would solve the problem.
+\Question[Q-pdf-fig-chars]{Characters disappear from figures in \PDFTeX{}}
+
+You have a \acro{PDF} figure, which you want to use in your
+\PDFLaTeX{} document. When you compile the document, \PDFTeX{}
+complains about ``missing glyphs'', and some (or all) of the labelling
+text or symbols in the original figure is no longer visible.
+
+What has happened is:
+\begin{enumerate}
+\item Your figure file (say \File{fig.pdf}) has a font \File{font.pfb}
+ embedded in it.
+\item \PDFTeX{} notes that it has \File{font.pfb} on disc, and loads
+ that in place of the copy in \File{fig.pdf}.
+\item It turns out that the copy in \File{fig.pdf} has glyphs that
+ aren't in \File{font.pfb} on disc, so that you get errors while
+ compiling and you see that characters are missing when you view the
+ output. (\PDFTeX{} can't know that the fonts are different, since
+ they have the same name.)
+\end{enumerate}
+Which is all very undesirable.
+
+\PDFTeX{} does this to keep file sizes down: suppose you have a
+document that loads figures \File{fig1.pdf} and \File{fig2.pdf}; both
+of those use font \File{font.pfb}. If \PDFTeX{} takes no action,
+there will be \emph{two} copies of \File{font.pfb} in the output.
+(If your document also uses the font, there could be three copies.)
+
+A real case is the \acro{URW} font \File{NimbusRomNo9L-Regu} (a clone
+of Times Roman), which is available in a version with Cyrillic
+letters, while the version in \TeX{} distributions doesn't have those
+letters. Both versions, as distributed, have the same name.
+
+The simple (``quick and dirty'') solution is to add the command
+\begin{quote}
+ \csx{pdfinclusioncopyfonts}\texttt{=1}
+\end{quote}
+to the preamble of your document.
+
+The ``real'' solution is that one or other font should be renamed. In
+either case, this would require that you reconfigure some program's
+(\TeX{}'s or your drawing package's) font tables~--- inevitably a
+tiresome job.
+
\subsection{Common misunderstandings}
\Question[Q-include]{What's going on in my \csx{include} commands?}
@@ -21863,16 +22919,18 @@ There is nothing that can directly be done about this error, as you can't
extend the number of available registers without extending \TeX{}
itself.
\begin{htmlversion}
- Of course, \Qref{\eTeX{}}{Q-etex} and \Qref{Omega}{Q-omegaleph}
+ Of course, \Qref{\eTeX{}}{Q-etex}, \Qref{Omega}{Q-omegaleph} and
+ \Qref{\LuaTeX{}}{Q-luatex}
\end{htmlversion}
\htmlignore
% beware line wrap here
- Of course, \ensuremath{\Omega} and \eTeX{}~---
- \Qref[see questions]{}{Q-omegaleph} \Qref[and]{}{Q-etex} respectively~---
+ Of course, \eTeX{}, \ensuremath{\Omega} and \LuaTeX{}~---
+ \Qref[see questions]{}{Q-etex} \Qref[,]{}{Q-omegaleph} and
+ \Qref[and]{}{Q-luatex} respectively~---
\endhtmlignore
- both do this, as does \Qref*{MicroPress Inc's V\TeX{}}{Q-commercial}.
+all do this, as does \Qref*{MicroPress Inc's V\TeX{}}{Q-commercial}.
-The commonest way to encounter one of these error messages is to have
+One common way to encounter one of these error messages is to have
broken macros of some sort, or incorrect usage of macros (an example
is discussed in \Qref[question]{epsf problems}{Q-epsf}).
@@ -21880,14 +22938,41 @@ However, sometimes one just \emph{needs} more than \TeX{} can offer,
and when this happens, you've just got to work out a different way of
doing things. An example is the % beware line wrap
\Qref*{difficulty of loading \PiCTeX{} with \LaTeX{}}{Q-usepictex}.
-In cases like \PiCTeX{}, it may be possible to use
-\Qref*{\eTeX{}}{Q-etex} (all modern distributions provide it). The
-\LaTeX{} package \Package{etex} modifies the register allocation
-mechanism to make use of \eTeX{}'s extended register sets (it's a
+The more modern drawing package, \Package{pgf} with its higher-level
+interface \Package{TikZ} is a common problem.
+
+In such cases, it is usually possible to use the
+\Qref*{\eTeX{}}{Q-etex} extensions (all modern distributions provide
+them). The \LaTeX{} package \Package{etex} modifies the register allocation
+mechanism to make use of \eTeX{}'s extended register sets.
+\Package{Etex} is a
derivative of the \plaintex{} macro file \Package{etex.src}, which is
used in building the \eTeX{} Plain format; both files are part of the
-\eTeX{} distribution). Unfortunately, \eTeX{} doesn't help with
-\csx{read} or \csx{write} objects.
+\eTeX{} distribution and are available in current distributions.
+
+It is possible that, even with \Package{etex} loaded, you still find
+yourself running out of things. Problems could be caused by packages
+that use large numbers of ``inserts'' (combinations of counter, box,
+dimension and skip registers, used for storing floats and footnotes).
+\Package{Morefloats} does this, of course (naturally enough,
+allocating new floats), and footnote packages such as
+\Package{manyfoot} and \Package{bigfoot} (which uses \Package{manyfoot}
+can also give problems. The \Package{etex} allows you to deal with
+these things: the command \cmdinvoke*{reserveinserts}{n} ensures there
+is room for \meta{n} more inserts. (Hint: \Package{morefloats} needs
+18 inserts, and \Package{manyfoot} seems to be happy with 10
+reserved.) Load \Package{etex} before any others, and reserve the
+inserts immediately:
+\begin{quote}
+\begin{verbatim}
+\documentclass[...]{...}
+\usepackage{etex}
+\reserveinserts{28}
+\end{verbatim}
+\end{quote}
+
+Unfortunately, \eTeX{} doesn't help with \csx{read} or \csx{write}
+objects (and neither will the \Package{etex} package).
\Question[Q-epsf]{\texttt{epsf} gives up after a bit}
@@ -22741,7 +23826,7 @@ However, for those improbable (or machine-generated) situations,
some distributions offer the opportunity to adjust the parameter
|max_in_open| in a configuration file.
-\Question[Q-hyperdupdest]{\PDFTeX{} destination \dots{} ignored}
+\Question[Q-hyperdupdest]{\PDFTeX{} destination \dots{}\ ignored}
The warning:
\begin{quote}
@@ -23331,6 +24416,49 @@ This author has also encountered the error when developing macros that
used the \LaTeX{} internal float mechanisms. Most people doing that
sort of thing are expected to be able to work out their own problems\dots{}
+\Question[Q-texorpdf]{Token not allowed in PDFDocEncoded string}
+
+The package \Package{hyperref} produces this error when it doesn't
+know how to make something into a ``character'' that will go into one
+of its \acro{PDF} entries. For example, the (unlikely) sequence
+\begin{quote}
+\begin{verbatim}
+\newcommand{\filled}[2]{%
+ #1%
+ \hfil
+ #2%
+}
+\section{\filled{foo}{bar}}
+\end{verbatim}
+\end{quote}
+provokes the error. \Package{Hyperref} goes on to tell you:
+\begin{quote}
+\begin{verbatim}
+removing `\hfil' on input line ...
+\end{verbatim}
+\end{quote}
+It's not surprising: how would \emph{you} put the
+typesetting instruction \csx{hfil} into a \acro{PDF} bookmark?
+
+\Package{Hyperref} allows you to define an alternative for such
+things: the command \csx{texorpdfstring}, which takes two
+arguments~--- the first is what is typeset, the second is what is put
+into the bookmark. For example, what you would probably like in this
+case is just a single space in the bookmark; if so, the erroneous
+example above would become:
+\begin{quote}
+\begin{verbatim}
+\newcommand{\filled}[2]{%
+ #1%
+ \texorpdfstring{\hfil}{\space}%
+ #2%
+}
+\section{\filled{foo}{bar}}
+\end{verbatim}
+\end{quote}
+and with that definition, the example will compile succesfully
+(\Package{hyperref} knows about the macro \csx{space}).
+
\Question[Q-optionclash]{Option clash for package}
So you've innocently added:
@@ -23572,13 +24700,22 @@ found on the project web site
(\URL{http://www.latex-project.org/papers/}), as is some of the
project's experimental code
(see \URL{http://www.latex-project.org/code.html}, which allows you to
-read the project's source repository). You can
+read the project's source repository); a recent snapshot of two major
+collections from the code, \Package{expl3} and \Package{xpackages},
+are available. Contributed code, such as \Package{keys3} (for
+key-value argument decoding) and \Package{numparse3} (for number
+processing) are available in the \acro{CTAN} `\LaTeX{} experimental' tree.
+
+You can
participate in discussions of the future of \LaTeX{} through the
mailing list \texttt{latex-l}. Subscribe to the list by sending a
message `\texttt{subscribe latex-l <\emph{your name}>}' to
\mailto{listserv@urz.Uni-Heidelberg.de}
\begin{ctanrefs}
+\item[expl3 \nothtml{\rmfamily}bundle]\CTANref{expl3}
+\item[keys3.sty]\CTANref{keys3}
\item[\nothtml{\rmfamily}\LaTeX{} project publications]\CTANref{ltx3pub}
+\item[xpackages \nothtml{\rmfamily}bundle]\CTANref{xpackages}
\end{ctanrefs}
\Question[Q-mathml]{Future \acro{WWW} technologies and \AllTeX{}}
@@ -23672,25 +24809,27 @@ support for new Web standards.
onus on the browser user; and however technically proficient
\emph{you} are, it's never safe to assume too much of your readers.
An interesting alternative is
- \href{http://www.forkosh.com/mimetex.html}{Mime\TeX{}}, which sits
+ \href{http://www.forkosh.com/mathtex.html}{Math\TeX{}}, which sits
on your server as a \acro{CGI} script, and you use it to include
your \TeX{}, in your \acro{HTML}, as if it were an image:
\begin{quote}
\begin{wideversion}
\begin{verbatim}
-<img src="../cgi-bin/mimetex.cgi?f(x)=\int\limits_{-\infty}^xe^{-t^2}dt">
+<img src="/cgi-bin/mimetex.cgi?f(x)=\int\limits_{-\infty}^xe^{-t^2}dt">
\end{verbatim}
\end{wideversion}
\begin{narrowversion}
\begin{verbatim}
-<img src="../cgi-bin/mimetex.cgi?f(x)=
+<img src="/cgi-bin/mimetex.cgi?f(x)=
\int\limits_{-\infty}^xe^{-t^2}dt">
\end{verbatim}
\end{narrowversion}
\end{quote}
+(\Package{Mathtex} supersedes the author's earlier \Package{mimetex}.)
\end{description}
\begin{ctanrefs}
\item[GELLMU]\CTANref{gellmu}
+\item[MathTeX]\CTANref{MimeTeX}
\item[MimeTeX]\CTANref{MimeTeX}
\item[TeX4HT]\CTANref{tex4ht}
\end{ctanrefs}
@@ -23833,19 +24972,113 @@ separate window), degree of correspondence of the display to the final
output, and the balance they strike between visual aid and visual
distraction.
\begin{ctanrefs}
-\item[preview-latex]Browse \CTANref{preview-latex}
+\item[preview-latex]Distributed as part of \CTANref{auctex}
\item[texmacs]Browse \CTANref{texmacs}
\end{ctanrefs}
+\Question[Q-omegaleph]{Omega and Aleph}
+
+Omega \nothtml{(\ensuremath{\Omega})} was developed as an extension of
+\TeX{}, to use with multilingual texts, expressed in a variety of
+input encodings. Omega uses 16-bit, Unicode-encoded, characters. It
+provides many innovative concepts, notably including the ``translation
+process'' that takes a character stream and transforms it according to
+various processes that may be internally specified, or be a separate
+program.
+
+While Omega showed a lot of promise at its mid-1990s announcement,
+progress was slow, and development was essentially dead by the time
+that one of the original developers withdrew (taking with him a bunch
+of research students).
+
+Before that distressing event, a separate thread of development had
+started, to produce a program % !avoid space between Aleph and comma
+called Aleph\nothtml{ (\ensuremath{\aleph})}, which merged the facilities of
+\Qref*{\eTeX{}}{Q-etex} into a stable Omega codebase and added other
+extensions. Aleph also proved an attractive platform for many people;
+but its development, too, has dried up.
+
+A presentation at Euro\TeX{} 2006 claimed that development of Omega
+was picking up again, in parallel with research into what the (new)
+developers consider a rational scheme for supporting \TeX{}-style
+typesetting. The new system was to be known as Omega-2
+(\latexhtml{\ensuremath{\Omega_2}}{Omega subscript 2}), and was to be
+designed in a modular fashion so that support of new facilities (such
+as use of advanced OpenType fonts) could be added in a relatively
+straightforward fashion. A quick web search leads to a recommendation
+that potential users consider \Qref{\LuaTeX{}}{Q-luatex} instead.
+Fortunately, lessons learned in Aleph project are being carried
+forward in the \Qref*{\LuaTeX{}}{Q-luatex} project.
+
+\Question[Q-xetex]{The \xetex{} project}
+
+\href{http://scripts.sil.org/xetex}{\xetex{}}, by Jonathan Kew, is a
+successor to the shareware \TeX{}/\acro{GX} program for Macintoshes.
+It is a Unicode-based \TeX{} implementation which is able to make
+direct use of the fonts installed on a system. It supports the
+advanced typographical features available in modern font technology
+(OpenType, \acro{AAT} on Mac~\acro{OS}~X, Graphite). \xetex{} was
+originally developed for Mac~\acro{OS}~X but it is now fully
+integrated in \texlive{} on a wide range of platforms, as well as
+being available as part of \miktex{}. \xetex{} supports Unicode
+character sets and bidirectional typesetting (via \eTeX{} primitives).
+It is popular among linguists and scholars in the humanities, as well
+as an increasing range of people working in other fields. Support for
+mathematical Unicode fonts (such as Asana Math and Cambria) is
+progressing.
+
+The project has an active % ! line break
+\href{http://www.tug.org/mailman/listinfo/xetex}{mailing list}; a
+collection of other information is to be found in a set of % ! line break
+\href{http://www.tug.org/xetex/}{links on the \acro{TUG} web site}.
+
+\Question[Q-luatex]{\PDFTeX{} and \LuaTeX{}}
+
+As is said elsewhere in these \acro{FAQ}s, development of
+\Qref*{\PDFTeX{}}{Q-whatpdftex} is ``in essence'' complete~---
+no new facilities are being developed, since the limitations of the
+present structure mean that the returns on effort invested are
+diminishing. The \PDFTeX{} team has announced that no further
+developments will be added after the release of \PDFTeX{} 1.50.0,
+which will be the next major release.
+
+In parallel with the running-down of \PDFTeX{} development,
+development of a new system, \LuaTeX{} is under way.
+\href{http://www.lua.org/}{\ProgName{Lua}} is a script
+language, designed to offer an interpreter that may be incorporated
+into other applications. \LuaTeX{} consists of a \TeX{}-like engine
+with a \ProgName{lua} interpreter built into it; the \ProgName{lua}
+interpreter has access to many of the data structures used for
+typesetting, and the user may also interpolate chunks of
+\ProgName{lua} code into their \AllTeX{} macros, or as `call-backs'
+for use when the \TeX{}-like engine does certain operations.
+
+This arrangement offers the prospect of a ``semi-soft'' typesetting
+engine: it will have its basic behaviour, but the user gets to
+redefine functionality if an idea occurs~--- there will be no need to
+persuade the world first, and then find a willing developer to work on
+the sources of of the distribution.
+
+The \href{http://www.luatex.org/}{\LuaTeX{} project} is (with monetary
+support from various sources) pursuing avenues that many of the other
+current projects have in their sights, notably Unicode character
+representations and support for OpenType fonts. The intention is
+to integrate the extensions pioneered by \Qref*{Aleph}{Q-omegaleph}.
+
+A release of \LuaTeX{} whose functionality is declared (version 0.50)
+has recently appeared. \texlive{} 2008 incorporates an early release
+of \LuaTeX{}, and the upcoming \miktex{} version 2.8 (no current
+release date) will probably incorporate \LuaTeX{}. \CONTeXT{}
+distributions can already make use of \LuaTeX{}.
+
\Question[Q-ant]{The \textsf{ANT} typesetting system}
-Achim Blumensath's \href{http://ant.berlios.de}{\textsf{ANT}} project,
-in contrast to \NTS{}, aims
-not to replicate \TeX{} with a different implementation technique, but
-rather to provide a replacement for \TeX{} which uses \TeX{}-like
-typesetting algorithms in a very different programming environment.
-\textsf{ANT} remains under development, but it is now approaching the
-status of a usable typesetting system.
+Achim Blumensath's \href{http://ant.berlios.de}{\textsf{ANT}} project
+aims not to replicate \TeX{} with a different implementation
+technique, but rather to provide a replacement for \TeX{} which uses
+\TeX{}-like typesetting algorithms in a very different programming
+environment. \textsf{ANT} remains under development, but it is now
+approaching the status of a usable typesetting system.
\textsf{ANT}'s markup language is immediately recognisable to the
\AllTeX{} user, but the scheme of implementing design in
@@ -23880,88 +25113,6 @@ filtering mechanisms will please those who have long struggled with
\ExTeX{} will accept Unicode input, from the start. In the longer
term, drawing primitives are to be considered.
-\Question[Q-omegaleph]{Omega and Aleph}
-
-Omega \nothtml{(\ensuremath{\Omega})} was developed as an extension of
-\TeX{}, to use with multilingual texts, expressed in a variety of
-input encodings. Omega uses 16-bit, Unicode-encoded, characters. It
-provides many innovative concepts, notably including the ``translation
-process'' that takes a character stream and transforms it according to
-various processes that may be internally specified, or be a separate
-program.
-
-While Omega showed a lot of promise at its mid-1990s announcement, its
-development was slow, and development was essentially dead by the time
-that one of the original developers withdrew (taking with him a bunch
-of research students).
-
-Before that distressing event, a separate thread of development was
-started, to produce a program called Aleph
-\nothtml{(\ensuremath{\aleph})}, which merged the facilities of
-\Qref*{\eTeX{}}{Q-etex} into a stable Omega codebase and added other
-extensions. Aleph also proved an attractive platform for many people;
-but its development, too, has dried up.
-
-The latest news (from Euro\TeX{} 2006) is that development of Omega is
-picking up again, in parallel with research into what the (new)
-authors consider a rational scheme for supporting \TeX{}-style
-typesetting. The new system is to be known as Omega-2
-(\latexhtml{\ensuremath{\Omega_2}}{Omega subscript 2}), and is being
-designed in a modular fashion so that support of new facilities (such
-as use of advanced OpenType fonts) can be added in a relatively
-straightforward fashion.
-
-The work done in the Aleph project is also being carried forward in
-the \Qref*{\LuaTeX{}}{Q-luatex} project.
-
-\Question[Q-luatex]{\PDFTeX{} becomes \LuaTeX{}}
-
-As is said elsewhere in these \acro{FAQ}s, development of
-\Qref*{\PDFTeX{}}{Q-whatpdftex} is ``in essence'' complete~---
-development of new facilities continues, but the limitations of the
-present structure impose a strong limit on what facilities are
-possible. (The \PDFTeX{} team has announced that no further
-developments will be added after the release of \PDFTeX{} 1.50.0,
-which will be the next major release.)
-
-In this context, the idea of \LuaTeX{} arose.
-\href{http://www.lua.org/}{\ProgName{Lua}} is a script
-language, designed to offer an interpreter with a very small
-``footprint'', so it is rather easy to build it into other
-applications. So \LuaTeX{} was launched as a \PDFTeX{}
-executable with a \ProgName{Lua} interpreter built into it.
-
-A \href{http://www.luatex.org/}{\LuaTeX{} project} is now proceeding
-(with monetary support from various sources) and is pursuing avenues
-that many of the other
-current projects have in their sights, notably Unicode character
-representations and support for OpenType fonts. Work is also in hand
-to integrate the extensions pioneered by \Qref*{Aleph}{Q-omegaleph}.
-
-The next release of \texlive{} (due in July 2008) and \miktex{}
-version 2.8 (no current release date) will incorporate \LuaTeX{}.
-\CONTeXT{} distributions can already make use of it.
-
-\Question[Q-xetex]{The \xetex{} project}
-
-\xetex{} (by Jonathan Kew) is a successor to the shareware \TeX{}/\acro{GX}
-program for Macintoshes. It is a Unicode-based (\acro{UTF}-8) TeX
-implementation which is able to make use of Mac~\acro{OS}~X \acro{AAT}
-(Apple Advanced Typography) \extension{dfonts} and OpenType fonts. It
-uses Apple's Quartz system (which facilitates the afore-mentioned font
-access) to generate \acro{PDF} output. \xetex{} supports Unicode
-character sets and bidirectional typesetting, and is widely used by
-people studying linguistics, as well as an increasing range of people
-working in other fields.
-
-A Linux and Unix-system version is available in \texlive{}~2007; that
-version (of course) relies on OpenType fonts alone. A version is
-planned for \miktex{} version 2.7 (currently planned for December 2007).
-
-The project has a \href{http://scripts.sil.org/xetex}{web site} for
-the user who wants more than this simple answer, and you can also sign
-up to a \href{http://www.tug.org/mailman/listinfo/xetex}{mailing list}.
-
\Question[Q-biblatex]{Replacing the \BibTeX{}--\LaTeX{} mechanism}
Producing a successor to \BibTeX{} has long been a favoured activity
@@ -24018,7 +25169,7 @@ a \cmdinvoke{nocite}{*} command enables \BibTeX{} to produce a usable
\Package{Amsrefs} is maintained by the AMS as part of its author
support programme,
-\Package{Biblatex} uses \BibTeX{} more-or-less as normal, but with
+\Package{Biblatex} uses \BibTeX{} simply to sort the citations using
\Package{biblatex}'s own style; the style of citations and of the
bibliography itself is determined by the way your \Package{biblatex}
style has been set up. This structure eliminates the collections of
@@ -24032,10 +25183,25 @@ sections of these \acro{FAQ}s.
\Package{Biblatex} is released as experimental software, but it's
clear that many users are already using it happily; Lehman is
responsive to problem reports, at the moment, but a set of expert
-users is already establishing itself.
+users is already establishing itself. A set of contributed styles has
+appeared, which cover some of the trickier bibliography styles. The
+road map of the project shows one more \emph{beta} release before the
+``stable'' \Package{biblatex}~1.0.
+
+A related project is
+\href{http://biblatex-biber.sourceforge.net/}{\ProgName{biber}} (or
+\ProgName{biblatex-biber}, to distinguish it from an older, defunct,
+\BibTeX{} replacement project). \ProgName{Biber} is a
+\ProgName{Perl}-based system to produce a \BibTeX{} replacement that
+is specifically tuned to the requirements of \Package{biblatex}.
+While it supports `traditional' \BibTeX{}, \ProgName{biber} aims at an
+interface language that is closely tuned to the requirements of
+\Package{biblatex}, including use of a Unicode-based character set to
+ease the generation multilingual citations.
\begin{ctanrefs}
\item[amsrefs.sty]\CTANref{amsrefs}
\item[biblatex.sty]\CTANref{biblatex}
+\item[\nothtml{\rmfamily}biblatex contributions]\CTANref{biblatex-contrib}
\item[\nothtml{\rmfamily}CrossTeX]\CTANref{crosstex}
\end{ctanrefs}
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/filectan.tex b/Master/texmf-dist/doc/generic/FAQ-en/filectan.tex
index cdfe79c55b8..6f11a17116a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/filectan.tex
+++ b/Master/texmf-dist/doc/generic/FAQ-en/filectan.tex
@@ -28,10 +28,10 @@
\CTANfile{capt-of}{macros/latex/contrib/misc/capt-of.sty}
\CTANfile{catalogue}{help/Catalogue/catalogue.html}
\CTANfile{cat-licences}{help/Catalogue/licenses.html}
-\CTANfile{changepage}{macros/latex/contrib/misc/changepage.sty}
\CTANfile{chngcntr}{macros/latex/contrib/misc/chngcntr.sty}
-\CTANfile{chngpage}{macros/latex/contrib/misc/chngpage.sty}
+\CTANfile{changepage}{macros/latex/contrib/misc/changepage.sty}
\CTANfile{clsguide}{macros/latex/doc/clsguide.pdf}
+\CTANfile{compactbib}{macros/latex/contrib/compactbib/compactbib.sty}
%\CTANfile{compan-ctan}{info/companion.ctan}
\CTANfile{context-tmf}{macros/context/current/cont-tmf.zip}
\CTANfile{dblfloatfix}{macros/latex/contrib/misc/dblfloatfix.sty}
@@ -62,6 +62,7 @@
\CTANfile{latex-classes}{macros/latex/base/classes.dtx}
\CTANfile{latex-source}{macros/latex/base/source2e.tex}
\CTANfile{latexcount}{support/latexcount/latexcount.pl}
+\CTANfile{latexcheat}{info/latexcheat/latexcheat/latexsheet.pdf}
\CTANfile{letterspacing}{macros/generic/misc/letterspacing.tex}
\CTANfile{lshort}{info/lshort/english/lshort.pdf}
\CTANfile{ltablex}{macros/latex/contrib/ltablex/ltablex.sty}
@@ -75,6 +76,7 @@
\CTANfile{metafp-pdf}{info/metafont/metafp/metafp.pdf}
\CTANfile{mf-beginners}{info/metafont/beginners/metafont-for-beginners.pdf}
\CTANfile{mf-list}{info/metafont-list}
+\CTANfile{miktex-portable}{systems/win32/miktex/setup/miktex-portable.exe}
\CTANfile{miktex-setup}{systems/win32/miktex/setup/setup.exe}
\CTANfile{miktex-usb}{info/MiKTeX+Ghostscript+GSview+USB-drive-HOWTO.txt}
\CTANfile{mil}{info/mil/mil.pdf}
@@ -90,12 +92,11 @@
\CTANfile{notoccite}{macros/latex/contrib/misc/notoccite.sty}
\CTANfile{noTeX}{biblio/bibtex/utils/misc/noTeX.bst}
\CTANfile{nopageno}{macros/latex/contrib/carlisle/nopageno.sty}
-\CTANfile{numline}{macros/latex/contrib/numline/numline.sty}
+\CTANfile{numline}{obsolete/macros/latex/contrib/numline/numline.sty}
\CTANfile{optional}{macros/latex/contrib/misc/optional.sty}
\CTANfile{parskip}{macros/latex/contrib/misc/parskip.sty}
\CTANfile{patch}{macros/generic/misc/patch.doc}
\CTANfile{path}{macros/latex/contrib/misc/path.sty}
-\CTANfile{pdftex}{systems/pdftex/pdftex.zip}
\CTANfile{pdftex-oztex}{nonfree/systems/mac/pdftex/pdftex_for_oztex.sit.bin}
\CTANfile{picins-summary}{macros/latex209/contrib/picins/picins.txt}
\CTANfile{pk300}{fonts/cm/pk/pk300.zip}
@@ -113,6 +114,8 @@
\CTANfile{tex2bib}{biblio/bibtex/utils/tex2bib/tex2bib}
\CTANfile{tex2bib-doc}{biblio/bibtex/utils/tex2bib/README}
\CTANfile{tex4ht}{support/TeX4ht/tex4ht-all.zip}
+\CTANfile{texlive-unix}{systems/texlive/tlnet/2008/install-tl-unx.tar.gz}
+\CTANfile{texlive-windows}{systems/texlive/tlnet/2008/install-tl.zip}
\CTANfile{texnames}{info/biblio/texnames.sty}
\CTANfile{texsis-index}{macros/texsis/index/index.tex}
\CTANfile{threeparttable}{macros/latex/contrib/misc/threeparttable.sty}
@@ -120,7 +123,6 @@
\CTANfile{topcapt}{macros/latex/contrib/misc/topcapt.sty}
\CTANfile{tracking}{macros/latex/contrib/tracking/tracking.sty}
\CTANfile{ttb-pdf}{info/bibtex/tamethebeast/ttb_en.pdf}
-\CTANfile{tth}{nonfree/support/tth/dist/tth_C.tgz}
\CTANfile{type1ec}{fonts/ps-type1/cm-super/type1ec.sty}
\CTANfile{ukhyph}{language/hyphenation/ukhyphen.tex}
\CTANfile{upquote}{macros/latex/contrib/upquote/upquote.sty}
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfloat.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfloat.html
index 79fddff663a..209b9b679f0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfloat.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfloat.html
@@ -26,9 +26,9 @@ LaTeX honour &lsquo;[h]&rsquo; placement of double-column floats, but the
<i>midfloat</i> package can be pressed into service to provide
something approximating the effect it would have.)
<dl>
-<dt><tt><i>dblfloatfix.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/dblfloatfix.sty">macros/latex/contrib/misc/dblfloatfix.sty</a>
+<dt><tt><i>dblfloatfix.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/dblfloatfix.sty">macros/latex/contrib/misc/dblfloatfix.sty</a>
<dt><tt><i>stfloats.sty, midfloat.sty</i></tt><dd>Distributed as part of
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sttools/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2colfloat">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2colfloat</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfltorder.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfltorder.html
index a16ff8fe4dc..9e5a041b7cb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfltorder.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2colfltorder.html
@@ -24,8 +24,8 @@ at <a href="FAQ-2colfloat.html"><code>[b]</code> placement</a>.
whole requirement is to patch the output routine; no extra commands
are needed.
<dl>
-<dt><tt><i>dblfloatfix.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/dblfloatfix.sty">macros/latex/contrib/misc/dblfloatfix.sty</a>
-<dt><tt><i>fix2col.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/carlisle/">browse</a>)
+<dt><tt><i>dblfloatfix.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/dblfloatfix.sty">macros/latex/contrib/misc/dblfloatfix.sty</a>
+<dt><tt><i>fix2col.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle/">browse the directory</a>)
<dt><tt><i>fixltx2e.sty</i></tt><dd>Part of the LaTeX distribution
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2colfltorder">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2colfltorder</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2letterfontcmd.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2letterfontcmd.html
index c87a5c088e6..94904a00111 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2letterfontcmd.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-2letterfontcmd.html
@@ -118,7 +118,7 @@ needs LaTeX&rsquo;s simplest font selection commands:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>smallcap.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smallcap.zip">macros/latex/contrib/smallcap</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smallcap.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/smallcap/">browse</a>)
+<dt><tt><i>smallcap.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smallcap.zip">macros/latex/contrib/smallcap</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smallcap/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2letterfontcmd">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2letterfontcmd</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-AMSpkg.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-AMSpkg.html
index 18d62bc7e03..b1b38a44dcf 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-AMSpkg.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-AMSpkg.html
@@ -2,7 +2,6 @@
<title>UK TeX FAQ -- question label AMSpkg</title>
</head><body>
<h3>What are the AMS packages (AMSTeX, <em>etc</em>.)?</h3>
-
<p/>AMSTeX is a TeX macro package, originally written by Michael Spivak for
the American Mathematical Society (AMS) during 1983&ndash;1985 and
is described in the book &ldquo;<a href="FAQ-books.html">The Joy of TeX</a>&rdquo;.
@@ -14,17 +13,15 @@ aspects covered include multi-line displayed equations, equation
numbering, ellipsis dots, matrices, double accents, multi-line
subscripts, syntax checking (faster processing on initial
error-checking TeX runs), and other things.
-<p/>As LaTeX increased in popularity, authors asked to submit papers to
-the AMS in LaTeX, and so the AMS developed
-AMSLaTeX, which is a
-collection of LaTeX packages and classes that offer authors most of
+<p/>As LaTeX increased in popularity, authors sought to submit papers to
+the AMS in LaTeX, so AMSLaTeX was developed. AMSLaTeX
+is a collection of LaTeX packages and classes that offer authors most of
the functionality of AMSTeX.
The AMS no longer recommends the use of AMSTeX, and urges
-its users to use AMSLaTeX instead.
-
+its authors to use AMSLaTeX instead.
<dl>
-<dt><tt><i>AMSTeX distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/amstex.zip">macros/amstex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/amstex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/amstex/">browse</a>)
-<dt><tt><i>AMSLaTeX distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+<dt><tt><i>AMSTeX distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/amstex.zip">macros/amstex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/amstex/">browse the directory</a>)
+<dt><tt><i>AMSLaTeX distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=AMSpkg">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=AMSpkg</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-BibTeXing.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-BibTeXing.html
index 7591756e032..0b8334cd9e5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-BibTeXing.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-BibTeXing.html
@@ -23,11 +23,9 @@ may also be found on CTAN. A summary and FAQ
(<i>btxFAQ</i>), by Michael Shell and David Hoadley, is also to be
recommended.
<dl>
-<dt><tt><i>BibTeX documentation</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/distribs/doc.zip">biblio/bibtex/distribs/doc</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/distribs/doc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/distribs/doc/">browse</a>)
-<dt><tt><i>BibTeX documentation, in PDF</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/doc.zip">biblio/bibtex/contrib/doc</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/doc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/doc/">browse</a>)
-<dt><tt><i>btxFAQ.pdf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/doc/btxFAQ.pdf">biblio/bibtex/contrib/doc/btxFAQ.pdf</a>
-<dt><tt><i>Tame the BeaST</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/bibtex/tamethebeast/ttb_en.pdf">info/bibtex/tamethebeast/ttb_en.pdf</a>
+<dt><tt><i>BibTeX documentation</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/doc.zip">biblio/bibtex/contrib/doc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/doc/">browse the directory</a>)
+<dt><tt><i>btxFAQ.pdf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/contrib/doc/btxFAQ.pdf">biblio/bibtex/contrib/doc/btxFAQ.pdf</a>
+<dt><tt><i>Tame the BeaST</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/bibtex/tamethebeast/ttb_en.pdf">info/bibtex/tamethebeast/ttb_en.pdf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=BibTeXing">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=BibTeXing</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-CD.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-CD.html
index 42f4b0a63f8..988565eef92 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-CD.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-CD.html
@@ -36,9 +36,9 @@ they are all pretty large downloads.
on the TUG site.
<dl>
-<dt><tt><i>MacTeX</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/mac/mactex/">systems/mac/mactex/</a>
-<dt><tt><i>ProTeXt</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/win32/protext/">systems/win32/protext/</a>
-<dt><tt><i>TeXlive install image</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/texlive/">systems/texlive/</a>
+<dt><tt><i>MacTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/mac/mactex/">systems/mac/mactex/</a>
+<dt><tt><i>ProTeXt</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/protext/">systems/win32/protext/</a>
+<dt><tt><i>TeXlive install image</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/">systems/texlive/</a>
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=CD">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=CD</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ECfonts.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ECfonts.html
index 17985361f8d..dc33c6e4351 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ECfonts.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ECfonts.html
@@ -65,10 +65,10 @@ for Adobe Type 1 fonts, and also by the <i>txfonts</i> and
(see <a href="FAQ-psfchoice.html">&ldquo;choice of scalable fonts&rdquo;</a>).
<dl>
-<dt><tt><i>CM-super fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>)
-<dt><tt><i>CM-LGC fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-lgc.zip">fonts/ps-type1/cm-lgc</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-lgc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-lgc/">browse</a>)
-<dt><tt><i>EC and TC fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ec.zip">fonts/ec</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ec.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ec/">browse</a>)
-<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/lm.zip">fonts/lm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/lm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/lm/">browse</a>)
+<dt><tt><i>CM-super fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>)
+<dt><tt><i>CM-LGC fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-lgc.zip">fonts/ps-type1/cm-lgc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-lgc/">browse the directory</a>)
+<dt><tt><i>EC and TC fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ec.zip">fonts/ec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ec/">browse the directory</a>)
+<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm.zip">fonts/lm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ECfonts">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ECfonts</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-HPdrivers.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-HPdrivers.html
index 7b59a98ca4d..3df98306c6c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-HPdrivers.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-HPdrivers.html
@@ -10,8 +10,8 @@ DEC-20s.
<p/>For Unix systems, Karl Berry&rsquo;s <i>dviljk</i> uses the same
path-searching library as <i>web2c</i>.
<dl>
-<dt><tt><i>Beebe drivers</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/beebe.zip">dviware/beebe</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/beebe.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/beebe/">browse</a>)
-<dt><tt><i>dviljk</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dviljk.zip">dviware/dviljk</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dviljk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dviljk/">browse</a>)
+<dt><tt><i>Beebe drivers</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/beebe.zip">dviware/beebe</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/beebe/">browse the directory</a>)
+<dt><tt><i>dviljk</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dviljk.zip">dviware/dviljk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dviljk/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=HPdrivers">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=HPdrivers</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX2HTML.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX2HTML.html
index e0f2d5d30c9..151536cc4a7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX2HTML.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX2HTML.html
@@ -51,7 +51,11 @@ browsing may be brighter &mdash; see
<i>tex4ht</i>&rsquo;s macros included. As a result, it&rsquo;s pretty
robust against the macros you include in your document, and it&rsquo;s
also pretty fast.
-<dt><i>TeXpider</i><dd> a commercial program from
+<dt><i>plasTeX</i><dd>a Python-based LaTeX document processing
+ framework. It gives DOM-like access to a LaTeX document, as
+ well as the ability to generate mulitple output formats
+ (e.g. HTML, DocBook, tBook, etc.).
+<dt><i>TeXpider</i><dd>a commercial program from
<a href="FAQ-commercial.html">Micropress</a>, which is
described on <a href="http://www.micropress-inc.com/webb/wbstart.htm">http://www.micropress-inc.com/webb/wbstart.htm</a>;
it uses bitmaps for equations.
@@ -70,9 +74,10 @@ page gives lists of pros and cons, by way of comparison.
HTML, with sections on (La)TeX and BibTeX &mdash; see
<a href="http://www.w3.org/Tools/Word_proc_filters.html">http://www.w3.org/Tools/Word_proc_filters.html</a>
<dl>
-<dt><tt><i>latex2html</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/latex2html/">support/latex2html/</a>
-<dt><tt><i>tex4ht</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/TeX4ht/tex4ht-all.zip">support/TeX4ht/tex4ht-all.zip</a>
-<dt><tt><i>tth</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/support/tth/dist/tth_C.tgz">nonfree/support/tth/dist/tth_C.tgz</a>
+<dt><tt><i>latex2html</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/latex2html/">support/latex2html/</a>
+<dt><tt><i>plasTeX</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/plastex/">support/plastex/</a>
+<dt><tt><i>tex4ht</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/TeX4ht/tex4ht-all.zip">support/TeX4ht/tex4ht-all.zip</a>
+<dt><tt><i>tth</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tth/dist.zip">support/tth/dist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tth/dist/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeX2HTML">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeX2HTML</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX3.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX3.html
index 2a29b0b7692..2597c7adc45 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX3.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeX3.html
@@ -21,13 +21,21 @@ found on the project web site
(<a href="http://www.latex-project.org/papers/">http://www.latex-project.org/papers/</a>), as is some of the
project&rsquo;s experimental code
(see <a href="http://www.latex-project.org/code.html">http://www.latex-project.org/code.html</a>, which allows you to
-read the project&rsquo;s source repository). You can
+read the project&rsquo;s source repository); a recent snapshot of two major
+collections from the code, <i>expl3</i> and <i>xpackages</i>,
+are available. Contributed code, such as <i>keys3</i> (for
+key-value argument decoding) and <i>numparse3</i> (for number
+processing) are available in the CTAN &lsquo;LaTeX experimental&rsquo; tree.
+<p/>You can
participate in discussions of the future of LaTeX through the
mailing list <code>latex-l</code>. Subscribe to the list by sending a
message &lsquo;<code>subscribe latex-l &lt;<em>your name</em>&gt;</code>&rsquo; to
<a href="mailto:listserv@urz.Uni-Heidelberg.de"><i>listserv@urz.Uni-Heidelberg.de</i></a>
<dl>
-<dt><tt><i>LaTeX project publications</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/ltx3pub.zip">info/ltx3pub</a> (<a href="ftp://cam.ctan.org/tex-archive/info/ltx3pub.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/ltx3pub/">browse</a>)
+<dt><tt><i>expl3 bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expl3.zip">macros/latex/contrib/expl3</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expl3/">browse the directory</a>)
+<dt><tt><i>keys3.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/exptl/keys3.zip">macros/latex/exptl/keys3</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/exptl/keys3/">browse the directory</a>)
+<dt><tt><i>LaTeX project publications</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/ltx3pub.zip">info/ltx3pub</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/ltx3pub/">browse the directory</a>)
+<dt><tt><i>xpackages bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xpackages.zip">macros/latex/contrib/xpackages</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xpackages/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeX3">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeX3</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeXtoPlain.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeXtoPlain.html
index 4a0148e2129..b62a3f12982 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeXtoPlain.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-LaTeXtoPlain.html
@@ -21,9 +21,9 @@ user more than the &ldquo;bare minimum&rdquo; that Plain TeX is designed to
offer.)
<dl>
<dt><tt><i>\latexhtml{\textrm{The}}{The} eplain system</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/macros/eplain.zip">macros/eplain</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/eplain.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/eplain/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain.zip">macros/eplain</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain/">browse the directory</a>)
<dt><tt><i>\latexhtml{\textrm{&lsquo;Plain TeX&rsquo;}}{Plain TeX} graphics</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/graphics/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeXtoPlain">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=LaTeXtoPlain</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-MP.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-MP.html
index e9a6ceaaa3e..c4ccf432443 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-MP.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-MP.html
@@ -22,5 +22,6 @@ Knuth&rsquo;s permission.
<a href="http://lists.tug.org/metapost">TUG <i>mailman</a> interface</i>.
The TUG website also hosts a
<a href="http://tug.org/metapost.html">MetaPost summary page</a>.
-<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=MP">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=MP</a>
+<p/>
+<p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=MP">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=MP</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-PSpreview.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-PSpreview.html
index 8b6bd2a9737..2b2e0a382c1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-PSpreview.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-PSpreview.html
@@ -19,7 +19,7 @@ this, you have three options:
PostScript previewer. Some systems offer this capability as
standard, but most people will need to use a separate previewer such
as <i>ghostscript</i> or <i>ghostscript</i>-based viewers
- such as <i>ghostview</i> or shareware offering <i>GSview</i>.
+ such as <i>gv</i> or shareware offering <i>GSview</i>.
<li> Under Windows on a PC, or on a Macintosh, let Adobe Type Manager
display the fonts (textures, on the Macintosh, works like this).
@@ -38,12 +38,12 @@ this, you have three options:
this if you have purchased the fonts.
</ul>
<dl>
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
-<dt><tt><i>ghostview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/gnu/ghostview/">support/ghostscript/gnu/ghostview/</a>
-<dt><tt><i>gsftopk</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/gsftopk.zip">fonts/utilities/gsftopk</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/gsftopk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/gsftopk/">browse</a>)
-<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/nonfree/support/ghostscript/ghostgum/">nonfree/support/ghostscript/ghostgum/</a>
-<dt><tt><i>ps2pk</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/ps2pk.zip">fonts/utilities/ps2pk</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/ps2pk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/ps2pk/">browse</a>)
-<dt><tt><i>xdvi</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/xdvi.zip">dviware/xdvi</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/xdvi.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/xdvi/">browse</a>)
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>gsftopk</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/gsftopk.zip">fonts/utilities/gsftopk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/gsftopk/">browse the directory</a>)
+<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/ghostgum/">support/ghostscript/ghostgum/</a>
+<dt><tt><i>gv</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/gv/">support/gv/</a>
+<dt><tt><i>ps2pk</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/ps2pk.zip">fonts/utilities/ps2pk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/ps2pk/">browse the directory</a>)
+<dt><tt><i>xdvi</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivedviware/xdvi/">dviware/xdvi/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=PSpreview">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=PSpreview</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-RCS.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-RCS.html
index d8ef63eaa2c..81b1908c6af 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-RCS.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-RCS.html
@@ -20,8 +20,8 @@ following minimal solution:
<blockquote>
<pre>
\def\RCS$#1: #2 ${\expandafter\def\csname RCS#1\endcsname{#2}}
-\RCS$Revision: 1.543 $ % or any RCS keyword
-\RCS$Date: 2008/06/21 18:54:02 $
+\RCS$Revision: 1.612 $ % or any RCS keyword
+\RCS$Date: 2009/06/09 22:45:20 $
...
\date{Revision \RCSRevision, \RCSDate}
</pre>
@@ -63,11 +63,11 @@ Plain TeX. Note that <i>vc</i> is the only option that
currently claims to support <i>Bazaar</i>- and
<i>Git</i>-controlled repositories.
<dl>
-<dt><tt><i>rcs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rcs.zip">macros/latex/contrib/rcs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rcs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/rcs/">browse</a>)
-<dt><tt><i>rcsinfo.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rcsinfo.zip">macros/latex/contrib/rcsinfo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rcsinfo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/rcsinfo/">browse</a>)
-<dt><tt><i>svn.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/svn.zip">macros/latex/contrib/svn</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/svn.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/svn/">browse</a>)
-<dt><tt><i>svninfo.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/svninfo.zip">macros/latex/contrib/svninfo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/svninfo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/svninfo/">browse</a>)
-<dt><tt><i>vc</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/vc.zip">support/vc</a> (<a href="ftp://cam.ctan.org/tex-archive/support/vc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/vc/">browse</a>)
+<dt><tt><i>rcs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rcs.zip">macros/latex/contrib/rcs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rcs/">browse the directory</a>)
+<dt><tt><i>rcsinfo.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rcsinfo.zip">macros/latex/contrib/rcsinfo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rcsinfo/">browse the directory</a>)
+<dt><tt><i>svn.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/svn.zip">macros/latex/contrib/svn</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/svn/">browse the directory</a>)
+<dt><tt><i>svninfo.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/svninfo.zip">macros/latex/contrib/svninfo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/svninfo/">browse the directory</a>)
+<dt><tt><i>vc</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/vc.zip">support/vc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/vc/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=RCS">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=RCS</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-SGML2TeX.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-SGML2TeX.html
index 8a5d7f1fd4e..e828d3ed966 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-SGML2TeX.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-SGML2TeX.html
@@ -59,7 +59,7 @@ source is available on CTAN.
SGML, and of public domain tools for writing and manipulating it, in
<i>TUGboat</i> 16(2).
<dl>
-<dt><tt><i>html2latex source</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/html2latex.zip">support/html2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/html2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/html2latex/">browse</a>)
+<dt><tt><i>html2latex source</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/html2latex.zip">support/html2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/html2latex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=SGML2TeX">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=SGML2TeX</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXfuture.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXfuture.html
index 6db8acf7837..140f1518971 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXfuture.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXfuture.html
@@ -7,15 +7,17 @@ he will continue to fix any bugs that are reported to him (though
bugs are rare). This decision was made soon after
TeX version 3.0 was released; at each bug-fix release
the version number acquires one more digit, so that it tends to the
-limit pi (at the time of writing, Knuth&rsquo;s latest release is version
-3.141592). Knuth wants TeX to be frozen at version pi when he
-dies; thereafter, no further changes may be made to Knuth&rsquo;s source.
-(A similar rule is applied to Metafont; its version number tends to the
-limit e, and currently stands at 2.71828.)
+limit pi (at the time of writing, Knuth&rsquo;s latest release
+is version 3.1415926). Knuth wants TeX to be frozen at
+version pi when he dies; thereafter, no further changes
+may be made to Knuth&rsquo;s source. (A similar rule is applied to Metafont;
+its version number tends to the limit e, and currently
+stands at 2.718281.)
<p/>Knuth explains his decision, and exhorts us all to respect it, in a
-paper originally published in <i>TUGboat</i> 11(4) (and reprinted in the
-
-<a href="http://www.ntg.nl/maps/pdf/5_34.pdf">NTG journal MAPS</a>).
+paper originally published in
+<a href="http://tug.org/TUGboat/Articles/tb11-4/tb30knut.pdf"><i>TUGboat</i> 11(4)</a>,
+and reprinted in the
+<a href="http://www.ntg.nl/maps/pdf/5_34.pdf">NTG journal MAPS</a>.
<p/>There are projects (some of them long-term
projects: see, for example,
<a href="FAQ-LaTeX3.html">the LaTeX3 project</a>)
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXsystems.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXsystems.html
index 40217a1f6c7..657afe58153 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXsystems.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-TeXsystems.html
@@ -13,12 +13,16 @@
TeX Live, which is distributed as part of the
<a href="FAQ-CD.html">TeX collection</a>.
<p/> Members of many TeX user groups receive copies of the collection
- (on CD and DVD), as part of their membership of the
- groups.
+ (on DVD), as part of their membership of the groups.
<p/> MacOS/X is also a Unix-based system; however users should refer to
the information below, under item &ldquo;Mac&rdquo;.
- <dl>
- <dt><tt><i>texlive</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/systems/texlive/">systems/texlive/</a>
+<p/> TeX Live may also be installed &ldquo;over the network&rdquo;; a network
+ installer is provided, and once you have a system, a manager
+ (<i>tlmgr</i>) can both keep your installation up-to-date and
+ add packages you didn&rsquo;t install at first.
+<p/> <dl>
+ <dt><tt><i>texlive</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/">systems/texlive/</a>
+ <dt><tt><i>texlive installer (Unix)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/tlnet/2008/install-tl-unx.tar.gz">systems/texlive/tlnet/2008/install-tl-unx.tar.gz</a>
</dl>
<dt>Linux<dd> GNU/Linux users are supported by TeX Live (as noted
above).
@@ -28,19 +32,34 @@
production of PDF from (La)TeX input. Sadly, it&rsquo;s no
longer supported, and the ready-built images are made for use with a
rather ancient Linux kernel.
+<p/> For the future, the MiKTeX developer intends to release a version
+ of that excellent (Windows) system for use on Linux; a beta version
+ is available via <a href="http://miktex.org/unx/">the MiKTeX site</a>.
<dl>
- <dt><tt><i>texlive</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/systems/texlive/">systems/texlive/</a>
- <dt><tt><i>vtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/vtex/linux.zip">systems/vtex/linux</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/vtex/linux.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/vtex/linux/">browse</a>)
- <dt><tt><i>vtex required common files</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/vtex/common.zip">systems/vtex/common</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/vtex/common.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/vtex/common/">browse</a>)
+ <dt><tt><i>texlive</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/">systems/texlive/</a>
+ <dt><tt><i>vtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/linux.zip">systems/vtex/linux</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/linux/">browse the directory</a>)
+ <dt><tt><i>vtex required common files</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/common.zip">systems/vtex/common</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/common/">browse the directory</a>)
</dl>
-<dt>PC: Windows post-95<dd>
+<dt>PC: Windows<dd>
MiKTeX, by Christian Schenk, is a comprehensive distribution. It has
its own previewer, YAP, which is itself capable of printing,
though the distribution also includes a port of <i>dvips</i>.
The current version is available for file-by-file download (the
- HTML files in the directory offer hints
- on what you need to get going). The MiKTeX developers provide a
- ready-to-run copy of the distribution, on CD (for purchase) via the
+ HTML files in the directory offer hints on what you need to
+ get going). MiKTeX can automatically install packages that it
+ &ldquo;knows about&rdquo;, but that aren&rsquo;t in your system (it gets them over
+ the network). Furthermore, users may keep their installation
+ up-to-date, over the network: the distribution contains a &ldquo;package
+ manager&rdquo;, through which the user may select individual packages, or
+ request that every extant update be retrieved.
+<p/> MiKTeX may also be used in a configuration which involves no
+ installation at all: its &ldquo;portable&rdquo; distribution may be unpacked
+ on a memory stick, and used on any windows computer without making
+ any direct use of the hard drive. This is the first &ldquo;official&rdquo;
+ release of such a setup, though a similar object has been available
+ on the net for some time.
+<p/> The MiKTeX developers also provide a ready-to-run copy of the
+ distribution, on CD (for purchase) via the
<a href="http://www.miktex.org/cd/">MiKTeX web site</a>; otherwise the
<i>setup</i> executable is available on CTAN, together with
all the optional packages.
@@ -52,8 +71,8 @@
steps, along with explanations.
<p/> Windows users are also supported directly by the TeX Live
distribution; a system is provided on the installation disc of the
- TeX collection (and it can, with some difficulty, be run &ldquo;from
- the disc&rdquo; without installing <em>anything</em>).
+ TeX collection. The system may also be installed over the
+ network, using an installer application tailored for use with Windows.
<p/> <a href="http://foundry.supelec.fr/projects/xemtex/">XEmTeX</a>, by
Fabrice Popineau (he who created the excellent, but now defunct,
fpTeX distribution), is an integrated distribution of TeX, LaTeX,
@@ -86,13 +105,15 @@
comes with a bunch of Type 1 fonts packaged to work with BaKoMa
TeX, which further the focus.
<dl>
- <dt><tt><i>bakoma</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/win32/bakoma.zip">systems/win32/bakoma</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/win32/bakoma.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/win32/bakoma/">browse</a>)
- <dt><tt><i>miktex</i></tt><dd>Acquire <a href="ftp://cam.ctan.org/tex-archive/systems/win32/miktex/setup/setup.exe">systems/win32/miktex/setup/setup.exe</a> (also available from the
+ <dt><tt><i>bakoma</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/bakoma/">systems/win32/bakoma/</a>
+ <dt><tt><i>miktex</i></tt><dd>Acquire <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/miktex/setup/setup.exe">systems/win32/miktex/setup/setup.exe</a> (also available from the
MiKTeX web site), and read installation instructions from
- <a href="http://www.miktex.org/2.5/Setup.aspx">the MiKTeX installation page</a>
- <dt><tt><i>protext.exe</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/win32/protext/">systems/win32/protext/</a>
- <dt><tt><i>tetex</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/obsolete/systems/unix/teTeX/current/distrib/">obsolete/systems/unix/teTeX/current/distrib/</a>
+ <a href="http://www.miktex.org/2.7/setup">the MiKTeX installation page</a>
+ <dt><tt><i>Portable miktex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/miktex/setup/miktex-portable.exe">systems/win32/miktex/setup/miktex-portable.exe</a>
+ <dt><tt><i>protext.exe</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/protext/">systems/win32/protext/</a>
+ <dt><tt><i>texlive</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/">systems/texlive/</a>
+ <dt><tt><i>texlive installer (Windows)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/texlive/tlnet/2008/install-tl.zip">systems/texlive/tlnet/2008/install-tl.zip</a>
</dl>
<dt>PC: MSDOS or OS/2<dd> EmTeX, by Eberhard Mattes,
includes LaTeX, BibTeX, previewers, and drivers, and is
@@ -110,15 +131,15 @@
operating systems, who want an up-to-date (La)TeX system, need to
migrate to Win32-based systems.
<dl>
- <dt><tt><i>emtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/emtex/">browse</a>)
- <dt><tt><i>emtexTDS</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.zip">obsolete/systems/os2/emtex-contrib/emtexTDS</a> (<a href="ftp://cam.ctan.org/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS/">browse</a>)
+ <dt><tt><i>emtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex/">browse the directory</a>)
+ <dt><tt><i>emtexTDS</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.zip">obsolete/systems/os2/emtex-contrib/emtexTDS</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS/">browse the directory</a>)
</dl>
<dt>PC: MSDOS<dd> The most recent MSDOS offering is a
port of the Web2C 7.0 implementation, using the GNU
<i>djgpp</i> compiler. While this package is more recent than
emTeX, it still implements a rather old instance of (La)TeX.
<dl>
- <dt><tt><i>djgpp</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/djgpp.zip">systems/msdos/djgpp</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/djgpp.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/djgpp/">browse</a>)
+ <dt><tt><i>djgpp</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/djgpp.zip">systems/msdos/djgpp</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/djgpp/">browse the directory</a>)
</dl>
<dt>PC: OS/2<dd> EmTeX, by Eberhard Mattes (see
above), was actually developed under OS/2, and lives happily
@@ -128,10 +149,10 @@
in direct production of PDF from (La)TeX input. (This
version is, like the Linux version, unfortunately no longer supported.)
<dl>
- <dt><tt><i>emtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/emtex/">browse</a>)
- <dt><tt><i>emtexTDS</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.zip">obsolete/systems/os2/emtex-contrib/emtexTDS</a> (<a href="ftp://cam.ctan.org/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS/">browse</a>)
- <dt><tt><i>vtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/vtex/os2.zip">systems/vtex/os2</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/vtex/os2.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/vtex/os2/">browse</a>)
- <dt><tt><i>vtex required common files</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/vtex/common.zip">systems/vtex/common</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/vtex/common.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/vtex/common/">browse</a>)
+ <dt><tt><i>emtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex/">browse the directory</a>)
+ <dt><tt><i>emtexTDS</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS.zip">obsolete/systems/os2/emtex-contrib/emtexTDS</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/obsolete/systems/os2/emtex-contrib/emtexTDS/">browse the directory</a>)
+ <dt><tt><i>vtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/os2.zip">systems/vtex/os2</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/os2/">browse the directory</a>)
+ <dt><tt><i>vtex required common files</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/common.zip">systems/vtex/common</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/vtex/common/">browse the directory</a>)
</dl>
@@ -174,24 +195,24 @@
The MacTeX-on-OSX mailing list is a useful resource for users;
mail <a href="mailto:MacOSX-TeX-on@email.esm.psu.edu"><i>MacOSX-TeX-on@email.esm.psu.edu</i></a> to subscribe.
<dl>
- <dt><tt><i>cmactex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/cmactex.zip">nonfree/systems/mac/cmactex</a> (<a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/cmactex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/nonfree/systems/mac/cmactex/">browse</a>)
- <dt><tt><i>mactex</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/mac/mactex/">systems/mac/mactex/</a>
- <dt><tt><i>oztex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/oztex.zip">nonfree/systems/mac/oztex</a> (<a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/oztex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/nonfree/systems/mac/oztex/">browse</a>)
+ <dt><tt><i>cmactex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/mac/cmactex.zip">systems/mac/cmactex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/mac/cmactex/">browse the directory</a>)
+ <dt><tt><i>mactex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/mac/mactex/">systems/mac/mactex/</a>
+ <dt><tt><i>oztex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/mac/oztex.zip">systems/mac/oztex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/mac/oztex/">browse the directory</a>)
</dl>
<dt>OpenVMS<dd> TeX for OpenVMS is available, though
it seems unlikely that the version on CTAN is the latest
available.
<dl>
- <dt><tt><i>OpenVMS</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/OpenVMS/TEX97_CTAN.ZIP">systems/OpenVMS/TEX97_CTAN.ZIP</a>
+ <dt><tt><i>OpenVMS</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/OpenVMS/TEX97_CTAN.ZIP">systems/OpenVMS/TEX97_CTAN.ZIP</a>
</dl>
<dt>Atari<dd> TeX for the Atari ST is available from CTAN.
<dl>
- <dt><tt><i>Atari TeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/atari.zip">systems/atari</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/atari.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/atari/">browse</a>)
+ <dt><tt><i>Atari TeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/atari.zip">systems/atari</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/atari/">browse the directory</a>)
</dl>
<dt>Amiga<dd> Full implementations of TeX 3.1 (PasTeX) and Metafont
2.7 are available.
<dl>
- <dt><tt><i>PasTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/amiga.zip">systems/amiga</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/amiga.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/amiga/">browse</a>)
+ <dt><tt><i>PasTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/amiga.zip">systems/amiga</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/amiga/">browse the directory</a>)
</dl>
<dt>TOPS-20<dd> TeX was originally written on a DEC-10
under WAITS,
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-WYGexpts.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-WYGexpts.html
index 5de14a4523d..a01cbced43b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-WYGexpts.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-WYGexpts.html
@@ -89,8 +89,8 @@ separate window), degree of correspondence of the display to the final
output, and the balance they strike between visual aid and visual
distraction.
<dl>
-<dt><tt><i>preview-latex</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/preview-latex/">support/preview-latex/</a>
-<dt><tt><i>texmacs</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/systems/unix/TeXmacs/">systems/unix/TeXmacs/</a>
+<dt><tt><i>preview-latex</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/auctex/">support/auctex/</a>
+<dt><tt><i>texmacs</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/unix/TeXmacs/">systems/unix/TeXmacs/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=WYGexpts">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=WYGexpts</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-abspos.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-abspos.html
index 34d7cedaf42..25c3448f6b6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-abspos.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-abspos.html
@@ -26,9 +26,9 @@ must therefore also be available.)
<dl>
-<dt><tt><i>eso-pic.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eso-pic.zip">macros/latex/contrib/eso-pic</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eso-pic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/eso-pic/">browse</a>)
-<dt><tt><i>everyshi.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ms/">browse</a>)
-<dt><tt><i>textpos.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textpos.zip">macros/latex/contrib/textpos</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textpos.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">browse</a>)
+<dt><tt><i>eso-pic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eso-pic.zip">macros/latex/contrib/eso-pic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eso-pic/">browse the directory</a>)
+<dt><tt><i>everyshi.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms/">browse the directory</a>)
+<dt><tt><i>textpos.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textpos.zip">macros/latex/contrib/textpos</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textpos/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=abspos</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acroantics.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acroantics.html
index 9768f8a3c7b..53b0f91abaa 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acroantics.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acroantics.html
@@ -2,22 +2,27 @@
<title>UK TeX FAQ -- question label acroantics</title>
</head><body>
<h3>Adobe <i>Reader</i> messing with print size</h3>
-<p/>Printing from Adobe <i>Reader</i> shrinks the page &ldquo;to fit&rdquo;
+<p/><p/>Printing from Adobe <i>Reader</i> shrinks the page &ldquo;to fit&rdquo;
(<em>by default</em>). Unfortunately, its calculation doesn&rsquo;t consider
the existing margins of the document, so that it shrinks what it
believes is your whole page onto what it believes is its output page.
The effect typically looks as if your margins have expanded.
<p/>Solve this problem by adjusting the <i>Reader</i>&rsquo;s default in the
print dialogue; unfortunately, this dialogue varies from one version
-to the next. On <i>Reader</i> version 7, there are two entries to
-check:
-<blockquote>
+to the next:
+<ul>
+<li> <i>Reader</i> version 7:<br>
Page Scaling (default: &ldquo;Fit to printer margins&rdquo;) &mdash; change to
&ldquo;None&rdquo;, and<br>
- Scale (default 95% of Normal size) &mdash; change to
+ Scale (default 95textpercent of Normal size) &mdash; change to
&ldquo;100%&rdquo;.
-
-
-</blockquote><p>
+<li> Adobe Reader 6:<br>
+ in the print dialogue, on the &ldquo;copies &amp; pages&rdquo; pane, you&rsquo;ll find a
+ popup menu/drop-down list titled &ldquo;Page Scaling&rdquo; &mdash; change to &ldquo;None&rdquo;.
+<li> Windows, Linux Acrobat (Reader) 5.0:<br>
+ In the print dialog, make sure the &ldquo;Shrink oversized pages to fit&rdquo;
+ checkbox is unchecked. It may also be useful to uncheck the
+ &ldquo;Expand small pages to fit paper size&rdquo; checkbox as well.
+</ul>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=acroantics">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=acroantics</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acrobat.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acrobat.html
index da4bb7af6b0..047c6933ec3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acrobat.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-acrobat.html
@@ -42,12 +42,13 @@ can operate using PDFTeX primitives, the hyperTeX
<code>\</code><code>special</code>s, or DVI driver-specific <code>\</code><code>special</code> commands.
Both <i>dvips</i> and Y&amp;Y&rsquo;s <i>DVIPSONE</i> can
translate the DVI with these <code>\</code><code>special</code> commands into
-PostScript acceptable to Distiller, and <i>dvipdfm</i> has <code>\</code><code>special</code>
-commands of its own.
+PostScript acceptable to Distiller, and
+<i>dvipdfm</i> and <i>dvipdfmx</i> have <code>\</code><code>special</code> commands of
+its own.
<p/>If you use Plain TeX, the <a href="FAQ-eplain.html">Eplain macros</a> can
help you create PDF documents with hyper-references.
It can operate using PDFTeX primitives, or <code>\</code><code>special</code> commands
-for the <i>dvipdfm</i> DVI driver.
+for the <i>dvipdfm</i>/<i>dvipdfmx</i> DVI drivers.
<p/>While there is no free implementation of all of <i>Adobe</i>
<i>Distiller</i>&rsquo;s
functionality, any but the very oldest versions of <i>Ghostscript</i>
@@ -57,9 +58,8 @@ provide pretty reliable distillation (but beware of the problems with
<i>Acrobat</i> <i>Reader</i> is available for a fair range of
platforms; for those for which Adobe&rsquo;s reader is unavailable, remotely
current versions of <i>ghostscript</i> combined with
-<i>gv</i>, <i>GSview</i> (or even the unsupported
-<i>ghostview</i>) can display and print PDF files, as can
-<i>xpdf</i>.
+<i>gv</i> or <i>GSview</i> can display and print PDF
+files, as can <i>xpdf</i>.
<p/>In many circumstances, <i>Ghostscript</i> combined with a viewer
application is actually preferable to Acrobat Reader. For example, on
Windows Acrobat Reader locks the <code>.pdf</code> file it&rsquo;s displaying: this
@@ -70,14 +70,13 @@ mistake.
<dl>
<dt><tt><i>Acrobat Reader</i></tt><dd>browse
<a href="ftp://ftp.adobe.com/pub/adobe/acrobatreader">ftp://ftp.adobe.com/pub/adobe/acrobatreader</a>
-<dt><tt><i>dvipdfm</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvipdfm/">browse</a>)
-<dt><tt><i>dvipdfmx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfmx.zip">dviware/dvipdfmx</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfmx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvipdfmx/">browse</a>)
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
-<dt><tt><i>ghostview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/gnu/ghostview/">support/ghostscript/gnu/ghostview/</a>
-<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/nonfree/support/ghostscript/ghostgum/">nonfree/support/ghostscript/ghostgum/</a>
-<dt><tt><i>gv</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/support/gv/">support/gv/</a>
-<dt><tt><i>hyper.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyper.zip">macros/latex/contrib/hyper</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyper.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyper/">browse</a>)
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
+<dt><tt><i>dvipdfm</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm/">browse the directory</a>)
+<dt><tt><i>dvipdfmx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfmx.zip">dviware/dvipdfmx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfmx/">browse the directory</a>)
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/ghostgum/">support/ghostscript/ghostgum/</a>
+<dt><tt><i>gv</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/gv/">support/gv/</a>
+<dt><tt><i>hyper.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyper.zip">macros/latex/contrib/hyper</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyper/">browse the directory</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=acrobat">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=acrobat</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-activechars.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-activechars.html
index 7bb7a695e11..8f21c60a556 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-activechars.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-activechars.html
@@ -113,8 +113,8 @@ made active &mdash; the definition of the command persists even if the
character&rsquo;s catcode reverts to its original value; the definition
becomes accessible again if the character once again becomes active.
<dl>
-<dt><tt><i>doc.sty</i></tt><dd>Distributed as part of the source of LaTeX, <a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.zip">macros/latex/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/base/">browse</a>)
-<dt><tt><i>shortvrb.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>doc.sty</i></tt><dd>Distributed as part of the source of LaTeX, <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base.zip">macros/latex/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base/">browse the directory</a>)
+<dt><tt><i>shortvrb.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=activechars">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=activechars</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-addtoreset.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-addtoreset.html
index 219c4a1d6ba..30c2fc51553 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-addtoreset.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-addtoreset.html
@@ -67,8 +67,8 @@ a label-like mechanism, and may require more than one run of LaTeX
to stabilise counter values &mdash; LaTeX will generate the usual
warnings about labels changing.
<dl>
-<dt><tt><i>chngcntr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
-<dt><tt><i>perpage.sty</i></tt><dd>Distributed as part <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bigfoot/">browse</a>)
+<dt><tt><i>chngcntr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
+<dt><tt><i>perpage.sty</i></tt><dd>Distributed as part <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=addtoreset">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=addtoreset</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-algorithms.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-algorithms.html
index 61cf79d5c30..aaf4f057efb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-algorithms.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-algorithms.html
@@ -93,15 +93,15 @@ algorithms to float like figures and tables.
<dl>
-<dt><tt><i>algorithm2e.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithm2e.zip">macros/latex/contrib/algorithm2e</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithm2e.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/algorithm2e/">browse</a>)
-<dt><tt><i>algorithmicx bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithmicx.zip">macros/latex/contrib/algorithmicx</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithmicx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/algorithmicx/">browse</a>)
-<dt><tt><i>algorithms bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithms.zip">macros/latex/contrib/algorithms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/algorithms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/algorithms/">browse</a>)
-<dt><tt><i>alg.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/alg.zip">macros/latex/contrib/alg</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/alg.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/alg/">browse</a>)
-<dt><tt><i>clrscode.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/clrscode.zip">macros/latex/contrib/clrscode</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/clrscode.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/clrscode/">browse</a>)
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
-<dt><tt><i>newalg.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/newalg.zip">macros/latex/contrib/newalg</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/newalg.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/newalg/">browse</a>)
-<dt><tt><i>program.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/program.zip">macros/latex/contrib/program</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/program.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/program/">browse</a>)
-<dt><tt><i>pseudocode.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pseudocode.zip">macros/latex/contrib/pseudocode</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pseudocode.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pseudocode/">browse</a>)
+<dt><tt><i>algorithm2e.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithm2e.zip">macros/latex/contrib/algorithm2e</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithm2e/">browse the directory</a>)
+<dt><tt><i>algorithmicx bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithmicx.zip">macros/latex/contrib/algorithmicx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithmicx/">browse the directory</a>)
+<dt><tt><i>algorithms bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithms.zip">macros/latex/contrib/algorithms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/algorithms/">browse the directory</a>)
+<dt><tt><i>alg.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/alg.zip">macros/latex/contrib/alg</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/alg/">browse the directory</a>)
+<dt><tt><i>clrscode.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/clrscode.zip">macros/latex/contrib/clrscode</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/clrscode/">browse the directory</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
+<dt><tt><i>newalg.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/newalg.zip">macros/latex/contrib/newalg</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/newalg/">browse the directory</a>)
+<dt><tt><i>program.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/program.zip">macros/latex/contrib/program</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/program/">browse the directory</a>)
+<dt><tt><i>pseudocode.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pseudocode.zip">macros/latex/contrib/pseudocode</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pseudocode/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=algorithms">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=algorithms</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-alreadydef.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-alreadydef.html
index 748ce8e51cc..762e7a60d13 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-alreadydef.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-alreadydef.html
@@ -53,9 +53,9 @@ and making the <i>txfonts</i> version of the command available as
<p/>Documentation of <i>savesym</i> doesn&rsquo;t amount to much: the only
commands are <code>\</code><code>savesymbol</code> and <code>\</code><code>restoresymbol</code>, as noted above.
<dl>
-<dt><tt><i>amsmath.sty</i></tt><dd>Part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
-<dt><tt><i>savesym.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/savesym/savesym.sty">macros/latex/contrib/savesym/savesym.sty</a>
-<dt><tt><i>txfonts.sty</i></tt><dd>Part of <a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/txfonts/">browse</a>)
+<dt><tt><i>amsmath.sty</i></tt><dd>Part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
+<dt><tt><i>savesym.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/savesym/savesym.sty">macros/latex/contrib/savesym/savesym.sty</a>
+<dt><tt><i>txfonts.sty</i></tt><dd>Part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=alreadydef">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=alreadydef</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-altabcr.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-altabcr.html
index b895f454cad..0d4e430e0a0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-altabcr.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-altabcr.html
@@ -71,7 +71,7 @@ following <code>&amp;</code> appears to LaTeX just like the second
<code>\</code><code>tabularnewline</code> explicitly, or use the <code>\</code><code>RBS</code> trick described
there.
<dl>
-<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=altabcr">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=altabcr</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ant.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ant.html
index 9fda82f2995..a76e084feac 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ant.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ant.html
@@ -2,13 +2,12 @@
<title>UK TeX FAQ -- question label ant</title>
</head><body>
<h3>The ANT typesetting system</h3>
-<p/>Achim Blumensath&rsquo;s <a href="http://ant.berlios.de">ANT</a> project,
-in contrast to <i>NTS</i>, aims
-not to replicate TeX with a different implementation technique, but
-rather to provide a replacement for TeX which uses TeX-like
-typesetting algorithms in a very different programming environment.
-ANT remains under development, but it is now approaching the
-status of a usable typesetting system.
+<p/>Achim Blumensath&rsquo;s <a href="http://ant.berlios.de">ANT</a> project
+aims not to replicate TeX with a different implementation
+technique, but rather to provide a replacement for TeX which uses
+TeX-like typesetting algorithms in a very different programming
+environment. ANT remains under development, but it is now
+approaching the status of a usable typesetting system.
<p/>ANT&rsquo;s markup language is immediately recognisable to the
(La)TeX user, but the scheme of implementing design in
ANT&rsquo;s own implementation language (presently
@@ -17,7 +16,7 @@ writer. This architecture holds the promise of a system that avoids a
set of serious problems with TeX&rsquo;s user interface: those that
derive from the design language being the same as the markup language.
<dl>
-<dt><tt><i>ANT</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/ant.zip">systems/ant</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/ant.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/ant/">browse</a>)
+<dt><tt><i>ANT</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/ant.zip">systems/ant</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/ant/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ant">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ant</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-appendix.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-appendix.html
index 89083a05049..9f81f957890 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-appendix.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-appendix.html
@@ -102,9 +102,9 @@ user is referred to the package documentation for further details.
<i>appendix</i> package. The <i>KOMA-script</i> classes offer a
<code>\</code><code>appendixprefix</code> command for manipulating the appearance of appendixes.
<dl>
-<dt><tt><i>appendix.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/appendix.zip">macros/latex/contrib/appendix</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/appendix.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/appendix/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>appendix.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/appendix.zip">macros/latex/contrib/appendix</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/appendix/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=appendix">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=appendix</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-archives.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-archives.html
index c5d5971f4f9..262c0e4d2c9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-archives.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-archives.html
@@ -25,19 +25,20 @@ CTAN mirrors are Web-accessible.
<p/>As a matter of course, to reduce network load,
please use the CTAN site
or mirror closest to you. A complete and current list of CTAN sites
-and known mirrors is available as file <a href="ftp://cam.ctan.org/tex-archive/CTAN.sites">CTAN.sites</a> on the
+and known mirrors is available as file <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveCTAN.sites">CTAN.sites</a> on the
archives themselves.
<p/>Better still, the script behind <a href="http://mirror.ctan.org/">http://mirror.ctan.org/</a> will
cunningly choose a &ldquo;nearby&rdquo; mirror for you, using information from
-the database &lsquo;behind&rsquo; <a href="ftp://cam.ctan.org/tex-archive/CTAN.sites">CTAN.sites</a>; at present it uses
+the database &lsquo;behind&rsquo; <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveCTAN.sites">CTAN.sites</a>; at present it uses
<code>ftp</code> protocol for transfers, but the intention is to convert
it to using <code>http</code> (web) protocol in the near future.
<p/>To access a particular thing through the <code>mirror.ctan.org</code>
mechanism, simply place the CTAN path after the base
URL; so
<a href="http://mirror.ctan.org/macros/latex/contrib/footmisc/">http://mirror.ctan.org/macros/latex/contrib/footmisc/</a> will
-connect you to the <i>footmisc</i> directory &mdash; note that the
-<i>tex-archive</i> part of the CTAN path isn&rsquo;t needed.
+connect you to the <i>footmisc</i> directory at some CTAN
+site &mdash; note that the <i>tex-archive</i> part of the CTAN path
+isn&rsquo;t needed.
<p/>For details of how to find files at CTAN sites, see
&ldquo;<a href="FAQ-findfiles.html">finding (La)TeX files</a>&rdquo;.
<p/>The TeX user who has no access to any sort of
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-askquestion.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-askquestion.html
index f2f9211afd8..c6e66a4cc52 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-askquestion.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-askquestion.html
@@ -53,6 +53,12 @@ application of your own common sense.
needs your local <i>xyzthesis</i> class, or some other resource
not generally available, be sure to include a pointer to how the
resource can be obtained.
+<li> Figures are special, of course. Sometimes the figure itself is
+ <em>really</em> needed, but most problems may be demonstrated with a
+ &ldquo;figure substitute&rdquo; in the form of a
+ <code>\</code><code>rule{</code><em>width</em><code>}{</code><em>height</em><code>}</code> command, for some value of
+ &lt;<i>width</i>&gt; and &lt;<i>height</i>&gt;. If the (real) figure is needed,
+ don&rsquo;t try posting it: far better to put it on the web somewhere.
<li> Be as succinct as possible. Your helpers don&rsquo;t usually need to
know <em>why</em> you&rsquo;re doing something, just <em>what</em> you&rsquo;re
doing and where the problem is.
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-atsigns.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-atsigns.html
index 1c73cdc7fbe..c4245c16ff3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-atsigns.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-atsigns.html
@@ -46,7 +46,7 @@ bundling them up into a <code>.sty</code> file and including them with
<code>\</code><code>usepackage</code>; this way you hide your LaTeX internal code somewhere
that LaTeX internal code is expected, which often looks &lsquo;tidier&rsquo;.
<dl>
-<dt><tt><i>Examples from the Companion</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/tlc2/">browse</a>)
+<dt><tt><i>Examples from the Companion</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=atsigns</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-backref.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-backref.html
index 882a922f255..862ecf161be 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-backref.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-backref.html
@@ -16,8 +16,8 @@ forgiveable in the case of the <i>hyperref</i>-related
<i>backref</i>, since the concept of multiple hyperlinks from the
same anchor is less than appealing.)
<dl>
-<dt><tt><i>backref.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>citeref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/citeref.zip">macros/latex/contrib/citeref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/citeref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/citeref/">browse</a>)
+<dt><tt><i>backref.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>citeref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/citeref.zip">macros/latex/contrib/citeref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/citeref/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=backref">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=backref</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-balance.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-balance.html
index f04c9d28794..4ffe7eac66a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-balance.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-balance.html
@@ -39,9 +39,9 @@ It is this difficulty (what&rsquo;s required in any instance can&rsquo;t really
expressed in current LaTeX) that led the author of
<i>multicol</i> to suppress single-column-wide floats.
<dl>
-<dt><tt><i>balance.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/preprint.zip">macros/latex/contrib/preprint</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/preprint.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/preprint/">browse</a>)
-<dt><tt><i>flushend.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sttools/">browse</a>)
-<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>balance.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/preprint.zip">macros/latex/contrib/preprint</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/preprint/">browse the directory</a>)
+<dt><tt><i>flushend.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools/">browse the directory</a>)
+<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
<p/></dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=balance">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=balance</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibinline.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibinline.html
index 6bf4d75f2d8..feb98644284 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibinline.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibinline.html
@@ -32,10 +32,10 @@ footnotes. Therefore, in a document which has other footnotes, it may
be advisable to use <i>jurabib</i> (or of course
<i>inlinebib</i>), to avoid confusion of footnotes and foot-citations.
<dl>
-<dt><tt><i>bibentry.sty</i></tt><dd><em>Distributed with</em> <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
-<dt><tt><i>footbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footbib.zip">macros/latex/contrib/footbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footbib/">browse</a>)
-<dt><tt><i>inlinebib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/inlinebib.zip">biblio/bibtex/contrib/inlinebib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/inlinebib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/inlinebib/">browse</a>)
-<dt><tt><i>jurabib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/jurabib.zip">macros/latex/contrib/jurabib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/jurabib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/jurabib/">browse</a>)
+<dt><tt><i>bibentry.sty</i></tt><dd><em>Distributed with</em> <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
+<dt><tt><i>footbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footbib.zip">macros/latex/contrib/footbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footbib/">browse the directory</a>)
+<dt><tt><i>inlinebib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/inlinebib.zip">biblio/bibtex/contrib/inlinebib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/inlinebib/">browse the directory</a>)
+<dt><tt><i>jurabib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/jurabib.zip">macros/latex/contrib/jurabib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/jurabib/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibinline">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibinline</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-biblatex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-biblatex.html
index 055e46b3acb..2b694e6a089 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-biblatex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-biblatex.html
@@ -46,7 +46,7 @@ a <code>\</code><code>nocite{*}</code> command enables BibTeX to produce a usabl
<i>amsrefs</i> bibliography database.)
<p/><i>Amsrefs</i> is maintained by the AMS as part of its author
support programme,
-<p/><i>Biblatex</i> uses BibTeX more-or-less as normal, but with
+<p/><i>Biblatex</i> uses BibTeX simply to sort the citations using
<i>biblatex</i>&rsquo;s own style; the style of citations and of the
bibliography itself is determined by the way your <i>biblatex</i>
style has been set up. This structure eliminates the collections of
@@ -59,11 +59,25 @@ sections of these FAQs.
<p/><i>Biblatex</i> is released as experimental software, but it&rsquo;s
clear that many users are already using it happily; Lehman is
responsive to problem reports, at the moment, but a set of expert
-users is already establishing itself.
+users is already establishing itself. A set of contributed styles has
+appeared, which cover some of the trickier bibliography styles. The
+road map of the project shows one more <em>beta</em> release before the
+&ldquo;stable&rdquo; <i>biblatex</i> 1.0.
+<p/>A related project is
+<a href="http://biblatex-biber.sourceforge.net/"><i>biber</a></i> (or
+<i>biblatex-biber</i>, to distinguish it from an older, defunct,
+BibTeX replacement project). <i>Biber</i> is a
+<i>Perl</i>-based system to produce a BibTeX replacement that
+is specifically tuned to the requirements of <i>biblatex</i>.
+While it supports &lsquo;traditional&rsquo; BibTeX, <i>biber</i> aims at an
+interface language that is closely tuned to the requirements of
+<i>biblatex</i>, including use of a Unicode-based character set to
+ease the generation multilingual citations.
<dl>
-<dt><tt><i>amsrefs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/amsrefs.zip">macros/latex/contrib/amsrefs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/amsrefs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/amsrefs/">browse</a>)
-<dt><tt><i>biblatex.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/exptl/biblatex.zip">macros/latex/exptl/biblatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/exptl/biblatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/exptl/biblatex/">browse</a>)
-<dt><tt><i>CrossTeX</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/biblio/crosstex/">biblio/crosstex/</a>
+<dt><tt><i>amsrefs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/amsrefs.zip">macros/latex/contrib/amsrefs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/amsrefs/">browse the directory</a>)
+<dt><tt><i>biblatex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/exptl/biblatex.zip">macros/latex/exptl/biblatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/exptl/biblatex/">browse the directory</a>)
+<dt><tt><i>biblatex contributions</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/exptl/biblatex-contrib/">macros/latex/exptl/biblatex-contrib/</a>
+<dt><tt><i>CrossTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/crosstex/">biblio/crosstex/</a>
</dl>
<p/>
<p/>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibplain.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibplain.html
index 6e2fc9e212b..3f9f106fd16 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibplain.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibplain.html
@@ -8,8 +8,8 @@ Plain TeX, either directly or with <a href="FAQ-eplain.html">Eplain</a>. See
<a href="FAQ-BibTeXing.html">the use of BibTeX</a> for more
information about BibTeX itself.
<dl>
-<dt><tt><i>btxmac.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/eplain/tex/eplain/btxmac.tex">macros/eplain/tex/eplain/btxmac.tex</a>
-<dt><tt><i>eplain system</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/eplain.zip">macros/eplain</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/eplain.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/eplain/">browse</a>)
+<dt><tt><i>btxmac.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/eplain/tex/eplain/btxmac.tex">macros/eplain/tex/eplain/btxmac.tex</a>
+<dt><tt><i>eplain system</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain.zip">macros/eplain</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibplain">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibplain</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibstrtl.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibstrtl.html
index c8665ba7998..d9a5664bbf5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibstrtl.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibstrtl.html
@@ -9,7 +9,7 @@ The diagnostic usually arises because of an infelicity in the coding of
<i>abstract.bst</i>, or styles derived from it. (One doesn&rsquo;t
ordinarily output annotations in other styles.)
<p/>The solution is to make a copy of the style file (or get a clean copy
-from CTAN &mdash; <a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/bibtools/abstract.bst">biblio/bibtex/utils/bibtools/abstract.bst</a>), and rename it (e.g., on a
+from CTAN &mdash; <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/bibtools/abstract.bst">biblio/bibtex/utils/bibtools/abstract.bst</a>), and rename it (e.g., on a
long file-name system, to <i>abstract-long.bst</i>). Now edit it: find
function <code>output.nonnull</code> and
<ul>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibtocorder.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibtocorder.html
index 1818cab7147..2356f4c392f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibtocorder.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bibtocorder.html
@@ -26,7 +26,7 @@ found errors in your &ldquo;stable&rdquo; version, often enough.
citations while in the table of contents, or lists of figures, tables
(or other floating things: the code is quite general).
<dl>
-<dt><tt><i>notoccite.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/notoccite.sty">macros/latex/contrib/misc/notoccite.sty</a>
+<dt><tt><i>notoccite.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/notoccite.sty">macros/latex/contrib/misc/notoccite.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibtocorder">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bibtocorder</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bold-extras.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bold-extras.html
index d590e8896a4..52f5763c3e4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bold-extras.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-bold-extras.html
@@ -38,9 +38,9 @@ freely available (monospace text in the typeset version of this
FAQ uses <i>LuxiMono</i>, with the metrics and LaTeX
support available on the archive.
<dl>
-<dt><tt><i>bold-extra.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/bold-extra.sty">macros/latex/contrib/misc/bold-extra.sty</a>
-<dt><tt><i>bold tt and small caps fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/mf-extra/bold.zip">fonts/cm/mf-extra/bold</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/cm/mf-extra/bold.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/mf-extra/bold/">browse</a>)
-<dt><tt><i>LuxiMono fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/LuxiMono.zip">fonts/LuxiMono</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/LuxiMono.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/LuxiMono/">browse</a>)
+<dt><tt><i>bold-extra.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/bold-extra.sty">macros/latex/contrib/misc/bold-extra.sty</a>
+<dt><tt><i>bold tt and small caps fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/mf-extra/bold.zip">fonts/cm/mf-extra/bold</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/mf-extra/bold/">browse the directory</a>)
+<dt><tt><i>LuxiMono fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/LuxiMono.zip">fonts/LuxiMono</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/LuxiMono/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bold-extras">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=bold-extras</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-boldgreek.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-boldgreek.html
index b2cfa27d529..1248c3f4278 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-boldgreek.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-boldgreek.html
@@ -37,10 +37,10 @@ which then causes problems in superscripts, etc.
<p/>All these solutions cover all mathematical symbols, not merely Greek
letters.
<dl>
-<dt><tt><i>bm.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>amsbsy.sty</i></tt><dd>Distributed as part of AMSLaTeX <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+<dt><tt><i>bm.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>amsbsy.sty</i></tt><dd>Distributed as part of AMSLaTeX <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
<dt><tt><i>amsmath.sty</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=boldgreek">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=boldgreek</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-books.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-books.html
index f466f8f7bb6..609abc60c29 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-books.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-books.html
@@ -20,7 +20,9 @@ other books covering TeX:
Krantz (CRC Press, 1994, ISBN 0-849-37159-7)
<dt>TeX by Topic<dd>by Victor Eijkhout (Addison-Wesley, 1992,
ISBN 0-201-56882-9 &mdash; now out of print, but see
- <a href="FAQ-ol-books.html">online books</a>)
+ <a href="FAQ-ol-books.html">online books</a>; you can now buy a copy
+ printed, on demand, by Lulu &mdash; see
+ \url{http://www.lulu.com/content/2555607})
<dt>TeX for the Beginner<dd>by Wynter Snow (Addison-Wesley, 1992,
ISBN 0-201-54799-6)
<dt>TeX for the Impatient<dd>by Paul W. Abrahams, Karl Berry and
@@ -128,12 +130,12 @@ and we list it under &ldquo;<a href="FAQ-ol-books.html">online books</a>&rdquo;.
warnings that books are now out of print are always welcome. However,
this FAQ does <em>not</em> carry reviews of current published material.
<dl>
-<dt><tt><i>Examples for First Steps in LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/FirstSteps.zip">info/examples/FirstSteps</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/FirstSteps.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/FirstSteps/">browse</a>)
-<dt><tt><i>Examples for LaTeX Companion</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/tlc2/">browse</a>)
-<dt><tt><i>Examples for LaTeX Graphics Companion</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/lgc.zip">info/examples/lgc</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/lgc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/lgc/">browse</a>)
-<dt><tt><i>Examples for LaTeX Web Companion</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/lwc.zip">info/examples/lwc</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/lwc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/lwc/">browse</a>)
+<dt><tt><i>Examples for First Steps in LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/FirstSteps.zip">info/examples/FirstSteps</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/FirstSteps/">browse the directory</a>)
+<dt><tt><i>Examples for LaTeX Companion</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2/">browse the directory</a>)
+<dt><tt><i>Examples for LaTeX Graphics Companion</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/lgc.zip">info/examples/lgc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/lgc/">browse the directory</a>)
+<dt><tt><i>Examples for LaTeX Web Companion</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/lwc.zip">info/examples/lwc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/lwc/">browse the directory</a>)
-<dt><tt><i>Sample of Math into LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/mil/mil.pdf">info/mil/mil.pdf</a>
+<dt><tt><i>Sample of Math into LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/mil/mil.pdf">info/mil/mil.pdf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=books">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=books</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-braket.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-braket.html
index a43bde32fba..b0aff775352 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-braket.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-braket.html
@@ -26,7 +26,7 @@ for set specifications (as above) and for Dirac brackets (and bras and
kets). The package uses the e-TeX built-in command if it finds
itself running under e-TeX.
<dl>
-<dt><tt><i>braket.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/braket.sty">macros/latex/contrib/misc/braket.sty</a>
+<dt><tt><i>braket.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/braket.sty">macros/latex/contrib/misc/braket.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=braket">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=braket</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breakbox.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breakbox.html
index 6d2d0339c93..71601d25a89 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breakbox.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breakbox.html
@@ -33,11 +33,11 @@ device-independent Metafont for the shading). The author of
there are reasons to suspect that it may be unstable working with
current LaTeX.
<dl>
-<dt><tt><i>backgrnd.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/misc/backgrnd.tex">macros/generic/misc/backgrnd.tex</a>
-<dt><tt><i>boites.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/boites.zip">macros/latex/contrib/boites</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/boites.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/boites/">browse</a>)
-<dt><tt><i>framed.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/framed.sty">macros/latex/contrib/misc/framed.sty</a>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>shade.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/shade.zip">macros/generic/shade</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/generic/shade.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/generic/shade/">browse</a>)
+<dt><tt><i>backgrnd.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/generic/misc/backgrnd.tex">macros/generic/misc/backgrnd.tex</a>
+<dt><tt><i>boites.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/boites.zip">macros/latex/contrib/boites</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/boites/">browse the directory</a>)
+<dt><tt><i>framed.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/framed.sty">macros/latex/contrib/misc/framed.sty</a>
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>shade.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/shade.zip">macros/generic/shade</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/shade/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=breakbox">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=breakbox</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breaklinks.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breaklinks.html
index beaa7106abb..67942462183 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breaklinks.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-breaklinks.html
@@ -39,7 +39,7 @@ the page number will be made active.
you have at present no simple solution: you have to rewrite your text,
or to use a different PDF generation mechanism.
<dl>
-<dt><tt><i>breakurl.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/breakurl.zip">macros/latex/contrib/breakurl</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/breakurl.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/breakurl/">browse</a>)
+<dt><tt><i>breakurl.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/breakurl.zip">macros/latex/contrib/breakurl</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/breakurl/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=breaklinks">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=breaklinks</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buffovl.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buffovl.html
index e31223e21bf..0ad3217b462 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buffovl.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buffovl.html
@@ -47,8 +47,8 @@ than a given length; so the solution is just to edit the file.
Users of the shareware program <i>GSview</i> will find buttons to
perform the required transformation of the file being displayed.
<dl>
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
-<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/nonfree/support/ghostscript/ghostgum/">nonfree/support/ghostscript/ghostgum/</a>
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>GSview</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/ghostgum/">support/ghostscript/ghostgum/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=buffovl">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=buffovl</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buildbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buildbib.html
index 03d4b998995..474d702057a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buildbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-buildbib.html
@@ -64,13 +64,13 @@ in this endeavour:
using <i>bids.to.bibtex</i>
</ul>
<dl>
-<dt><tt><i>bids.to.bibtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/bids/bids.to.bibtex">biblio/bibtex/utils/bids/bids.to.bibtex</a>
-<dt><tt><i>btOOL</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/btOOL.zip">biblio/bibtex/utils/btOOL</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/btOOL.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/btOOL/">browse</a>)
-<dt><tt><i>ebib</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/ebib.zip">biblio/bibtex/utils/ebib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/ebib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/ebib/">browse</a>)
-<dt><tt><i>isi2bibtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/isi2bibtex.zip">biblio/bibtex/utils/isi2bibtex</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/isi2bibtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/isi2bibtex/">browse</a>)
-<dt><tt><i>tex2bib</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/tex2bib/tex2bib">biblio/bibtex/utils/tex2bib/tex2bib</a>
-<dt><tt><i>tex2bib.readme</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/tex2bib/README">biblio/bibtex/utils/tex2bib/README</a>
-<dt><tt><i>xbibfile</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/xbibfile.zip">biblio/bibtex/utils/xbibfile</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/xbibfile.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/xbibfile/">browse</a>)
+<dt><tt><i>bids.to.bibtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/bids/bids.to.bibtex">biblio/bibtex/utils/bids/bids.to.bibtex</a>
+<dt><tt><i>btOOL</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/btOOL.zip">biblio/bibtex/utils/btOOL</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/btOOL/">browse the directory</a>)
+<dt><tt><i>ebib</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/ebib.zip">biblio/bibtex/utils/ebib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/ebib/">browse the directory</a>)
+<dt><tt><i>isi2bibtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/isi2bibtex.zip">biblio/bibtex/utils/isi2bibtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/isi2bibtex/">browse the directory</a>)
+<dt><tt><i>tex2bib</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/tex2bib/tex2bib">biblio/bibtex/utils/tex2bib/tex2bib</a>
+<dt><tt><i>tex2bib.readme</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/tex2bib/README">biblio/bibtex/utils/tex2bib/README</a>
+<dt><tt><i>xbibfile</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/xbibfile.zip">biblio/bibtex/utils/xbibfile</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/xbibfile/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=buildbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=buildbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cancellation.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cancellation.html
index 68d98f6654e..21eeacbd2fd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cancellation.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cancellation.html
@@ -9,7 +9,7 @@ package provides several variants of cancellation marks
a means of cancelling &lsquo;to&rsquo; a particular value.
<p/>Documentation of <i>cancel</i> is in the package file.
<dl>
-<dt><tt><i>cancel.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/cancel.sty">macros/latex/contrib/misc/cancel.sty</a>
+<dt><tt><i>cancel.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/cancel.sty">macros/latex/contrib/misc/cancel.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cancellation">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cancellation</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-captsty.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-captsty.html
index d9dfeb65092..98bbc9f1834 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-captsty.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-captsty.html
@@ -40,12 +40,12 @@ file <i>manual.tex</i>, which is created when you unpack
now been overtaken again by <i>caption</i>; however,
<i>caption2</i> remains available for use in older documents.
<dl>
-<dt><tt><i>caption.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/caption.zip">macros/latex/contrib/caption</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/caption.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/caption/">browse</a>)
-<dt><tt><i>capt-of.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/capt-of.sty">macros/latex/contrib/misc/capt-of.sty</a>
-<dt><tt><i>ccaption.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ccaption/">browse</a>)
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>caption.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/caption.zip">macros/latex/contrib/caption</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/caption/">browse the directory</a>)
+<dt><tt><i>capt-of.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/capt-of.sty">macros/latex/contrib/misc/capt-of.sty</a>
+<dt><tt><i>ccaption.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption/">browse the directory</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=captsty">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=captsty</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-casechange.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-casechange.html
index 147a29f6e65..2b51f342ba4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-casechange.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-casechange.html
@@ -59,7 +59,7 @@ commands (<em>not</em> the TeX primitive commands <code>\</code><code>uppercase<
<code>\</code><code>lowercase</code>), so that section headings and the like don&rsquo;t produce
broken page headings.
<dl>
-<dt><tt><i>textcase.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textcase.zip">macros/latex/contrib/textcase</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textcase.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textcase/">browse</a>)
+<dt><tt><i>textcase.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textcase.zip">macros/latex/contrib/textcase</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textcase/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=casechange">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=casechange</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changebars.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changebars.html
index c7a89b8a53a..719a51a6840 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changebars.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changebars.html
@@ -70,14 +70,14 @@ A rudimentary revision facility is provided by another
all changes. Manual editing of the difference file can be used to
accept or reject selected changes only.
<dl>
-<dt><tt><i>backgrnd.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/misc/backgrnd.tex">macros/generic/misc/backgrnd.tex</a>
-<dt><tt><i>changebar.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/changebar.zip">macros/latex/contrib/changebar</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/changebar.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/changebar/">browse</a>)
-<dt><tt><i>changes.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/changes.zip">macros/latex/contrib/changes</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/changes.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/changes/">browse</a>)
-<dt><tt><i>framed.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/framed.sty">macros/latex/contrib/misc/framed.sty</a>
-<dt><tt><i>latexdiff, latexrevise</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/latexdiff.zip">support/latexdiff</a> (<a href="ftp://cam.ctan.org/tex-archive/support/latexdiff.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/latexdiff/">browse</a>)
-<dt><tt><i>lineno.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lineno.zip">macros/latex/contrib/lineno</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lineno.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/lineno/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>vertbars.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/vertbars.sty">macros/latex/contrib/misc/vertbars.sty</a>
+<dt><tt><i>backgrnd.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/generic/misc/backgrnd.tex">macros/generic/misc/backgrnd.tex</a>
+<dt><tt><i>changebar.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/changebar.zip">macros/latex/contrib/changebar</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/changebar/">browse the directory</a>)
+<dt><tt><i>changes.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/changes.zip">macros/latex/contrib/changes</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/changes/">browse the directory</a>)
+<dt><tt><i>framed.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/framed.sty">macros/latex/contrib/misc/framed.sty</a>
+<dt><tt><i>latexdiff, latexrevise</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexdiff.zip">support/latexdiff</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexdiff/">browse the directory</a>)
+<dt><tt><i>lineno.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lineno.zip">macros/latex/contrib/lineno</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lineno/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>vertbars.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/vertbars.sty">macros/latex/contrib/misc/vertbars.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=changebars">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=changebars</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changemargin.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changemargin.html
index 8de6cff6081..0ec0fd07080 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changemargin.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-changemargin.html
@@ -21,8 +21,10 @@ per line (though the constraints change for two-column text).
Style&rsquo; &mdash; &ldquo;don&rsquo;t do it&rdquo; &mdash; should not lightly be ignored.
<p/>This set of FAQs recommends that you use a package to establish
consistent settings of the parameters: the interrelationships are
-taken care of in the established packages, without you needing to
-think about them, but
+taken care of in the established packages, without you <em>needing</em>
+to think about them, but remember &mdash; the packages only provide
+consistent, working, mechanisms: they don&rsquo;t analyse the quality of
+what you propose to do.
<p/>The following answers deal with the ways one may choose to proceed:
<ul>
<li> <a href="FAQ-marginpkgs.html">Choose which package to use</a>.
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chapbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chapbib.html
index 550ae8aeb80..dacbbb004b7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chapbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chapbib.html
@@ -14,8 +14,8 @@ within the document: the package will deal with chapters and sections
(as defined by LaTeX itself) and also defines a <code>bibunit</code>
environment so that users can select their own structuring.
<dl>
-<dt><tt><i>chapterbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cite.zip">macros/latex/contrib/cite</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cite.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/cite/">browse</a>)
-<dt><tt><i>bibunits.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bibunits.zip">macros/latex/contrib/bibunits</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bibunits.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bibunits/">browse</a>)
+<dt><tt><i>chapterbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cite.zip">macros/latex/contrib/cite</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cite/">browse the directory</a>)
+<dt><tt><i>bibunits.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bibunits.zip">macros/latex/contrib/bibunits</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bibunits/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=chapbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=chapbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chngmargonfly.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chngmargonfly.html
index 18c0bec481d..8b35339f452 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chngmargonfly.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-chngmargonfly.html
@@ -36,10 +36,12 @@ environment (which is a close relation of the LaTeX
<code>quote</code> environment) <em>doesn&rsquo;t</em> change the text width
as far as TeX is concerned: it merely moves text around inside the
width that TeX believes in.
-<p/>The <i>changepage</i> package provides ready-built commands to do the
-above; it includes provision for changing the shifts applied to your
-text according to whether you&rsquo;re on an odd (<em>recto</em>) or an even
-(<em>verso</em>) page of a two-sided document.
+<p/>The <i>changepage</i> package provides ready-built commands to do
+the above; it includes provision for changing the shifts applied to
+your text according to whether you&rsquo;re on an odd (<em>recto</em>) or an
+even (<em>verso</em>) page of a two-sided document.
+<i>Changepage</i>&rsquo;s structure matches that of the <i>memoir</i>
+class.
<p/>The (earlier) package <i>chngpage</i> provides the same facilities,
but it uses rather different syntax. <i>Changepage</i>&rsquo;s structure
matches that of the <i>memoir</i> class, and it should be used for
@@ -58,10 +60,15 @@ to make the page one line longer, or
\enlargethispage{-\baselineskip}
</pre>
</blockquote><p>
-to make the page one line shorter.
+to make the page one line shorter. The process is (to an extent)
+simplified by the <i>addlines</i> package: its <code>\</code><code>addlines</code>
+command takes as argument the <em>number</em> of lines to add to the
+page (rather than a length): the package documentation also provides a
+useful analysis of when the command may (or may not) be expected to
+work.
<dl>
-<dt><tt><i>changepage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/changepage.sty">macros/latex/contrib/misc/changepage.sty</a>
-<dt><tt><i>chngpage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/chngpage.sty">macros/latex/contrib/misc/chngpage.sty</a>
+<dt><tt><i>addlines.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/addlines.zip">macros/latex/contrib/addlines</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/addlines/">browse the directory</a>)
+<dt><tt><i>changepage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/changepage.sty">macros/latex/contrib/misc/changepage.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=chngmargonfly">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=chngmargonfly</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citeURL.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citeURL.html
index ebe82a177d8..590e0c14874 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citeURL.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citeURL.html
@@ -77,13 +77,13 @@ is an acceptable character in an URL. Any current version of the
&ldquo;<code>%</code>&ndash;end-of-line&rdquo; structure in its argument, and
removes it.
<dl>
-<dt><tt><i>babelbib bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/babelbib.zip">biblio/bibtex/contrib/babelbib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/babelbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/babelbib/">browse</a>)
-<dt><tt><i>custom-bib bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/custom-bib/">browse</a>)
-<dt><tt><i>harvard.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/harvard.zip">macros/latex/contrib/harvard</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/harvard.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/harvard/">browse</a>)
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>natbib styles</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
-<dt><tt><i>url.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
-<dt><tt><i>urlbst</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/urlbst.zip">biblio/bibtex/contrib/urlbst</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/urlbst.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/urlbst/">browse</a>)
+<dt><tt><i>babelbib bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/babelbib.zip">biblio/bibtex/contrib/babelbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/babelbib/">browse the directory</a>)
+<dt><tt><i>custom-bib bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib/">browse the directory</a>)
+<dt><tt><i>harvard.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/harvard.zip">macros/latex/contrib/harvard</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/harvard/">browse the directory</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>natbib styles</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
+<dt><tt><i>url.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
+<dt><tt><i>urlbst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/urlbst.zip">biblio/bibtex/contrib/urlbst</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/urlbst/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citeURL">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citeURL</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citesort.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citesort.html
index 2fbf74de819..613c7754485 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citesort.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-citesort.html
@@ -25,11 +25,11 @@ package:
</pre>
the <i>natbib</i> and <i>hyperref</i> packages will interwork.
<dl>
-<dt><tt><i>cite.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cite.zip">macros/latex/contrib/cite</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cite.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/cite/">browse</a>)
-<dt><tt><i>hypernat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/hypernat.sty">macros/latex/contrib/misc/hypernat.sty</a>
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>plainnat.bst</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
-<dt><tt><i>unsrtnat.bst</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
+<dt><tt><i>cite.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cite.zip">macros/latex/contrib/cite</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cite/">browse the directory</a>)
+<dt><tt><i>hypernat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/hypernat.sty">macros/latex/contrib/misc/hypernat.sty</a>
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>plainnat.bst</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
+<dt><tt><i>unsrtnat.bst</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citesort">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citesort</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cmdstar.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cmdstar.html
index cd2b68610d8..d25ad304643 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cmdstar.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cmdstar.html
@@ -62,7 +62,7 @@ definition like:
</blockquote><p>
<dl>
<dt><tt><i>ifthen.sty</i></tt><dd>Part of the LaTeX distribution
-<dt><tt><i>suffix.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bigfoot/">browse</a>)
+<dt><tt><i>suffix.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot/">browse the directory</a>)
</dl>
<p/>
<p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cmdstar">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cmdstar</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-codelist.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-codelist.html
index 4ec9f46961d..3c949593ab1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-codelist.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-codelist.html
@@ -72,13 +72,13 @@ LaTeX source in your C program comments. The program then
converts your program into a LaTeX document for processing. The
program (implicitly) claims to be &ldquo;self-documenting&rdquo;.
<dl>
-<dt><tt><i>c2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/c2latex.zip">support/c2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/c2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/c2latex/">browse</a>)
-<dt><tt><i>C++2LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/C++2LaTeX-1_1pl1.zip">support/C++2LaTeX-1_1pl1</a> (<a href="ftp://cam.ctan.org/tex-archive/support/C++2LaTeX-1_1pl1.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/C++2LaTeX-1_1pl1/">browse</a>)
-<dt><tt><i>highlight</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/highlight.zip">support/highlight</a> (<a href="ftp://cam.ctan.org/tex-archive/support/highlight.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/highlight/">browse</a>)
-<dt><tt><i>lgrind</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/lgrind.zip">support/lgrind</a> (<a href="ftp://cam.ctan.org/tex-archive/support/lgrind.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/lgrind/">browse</a>)
-<dt><tt><i>listings.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/listings.zip">macros/latex/contrib/listings</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/listings.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/listings/">browse</a>)
-<dt><tt><i>tgrind</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/tgrind.zip">support/tgrind</a> (<a href="ftp://cam.ctan.org/tex-archive/support/tgrind.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/tgrind/">browse</a>)
-<dt><tt><i>tiny_c2l</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/tiny_c2l.zip">support/tiny_c2l</a> (<a href="ftp://cam.ctan.org/tex-archive/support/tiny_c2l.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/tiny_c2l/">browse</a>)
+<dt><tt><i>c2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/c2latex.zip">support/c2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/c2latex/">browse the directory</a>)
+<dt><tt><i>C++2LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/C++2LaTeX-1_1pl1.zip">support/C++2LaTeX-1_1pl1</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/C++2LaTeX-1_1pl1/">browse the directory</a>)
+<dt><tt><i>highlight</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/highlight.zip">support/highlight</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/highlight/">browse the directory</a>)
+<dt><tt><i>lgrind</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/lgrind.zip">support/lgrind</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/lgrind/">browse the directory</a>)
+<dt><tt><i>listings.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/listings.zip">macros/latex/contrib/listings</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/listings/">browse the directory</a>)
+<dt><tt><i>tgrind</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tgrind.zip">support/tgrind</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tgrind/">browse the directory</a>)
+<dt><tt><i>tiny_c2l</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tiny_c2l.zip">support/tiny_c2l</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tiny_c2l/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=codelist">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=codelist</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-commercial.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-commercial.html
index 195e7d938ee..d4e9b28961a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-commercial.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-commercial.html
@@ -100,7 +100,7 @@ also have email, and normal telephone and fax support.
Source: Mail from Christopher Mabb, August 2007
<dt>Macintosh; Textures<dd> &ldquo;A TeX system &lsquo;for the rest of
us&rsquo; &rdquo;. A beta release of Textures for MacOS/X is
- available <a href="http://www.bluesky.com/news/220b.html">http://www.bluesky.com/news/220b.html</a>
+ available~&mdash; see <a href="http://www.bluesky.com/news/news_frames.html">http://www.bluesky.com/news/news_frames.html</a>
<p/> (Blue Sky also gives away a Metafont implementation and some
font manipulation tools for Macs.)
<blockquote>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-compactbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-compactbib.html
index 8675cc55670..83cdbab4994 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-compactbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-compactbib.html
@@ -15,6 +15,10 @@ simple &mdash; add
</pre>
</blockquote><p>
to the preamble of your document.
+<p/>The <i>compactbib</i> package has a similar effect. Its primary
+purpose is to produce two bibliographies, and it seems to preclude use
+of BibTeX (though the package documentation, in the package file
+itself, isn&rsquo;t particularly clear).
<p/>Otherwise, one is into unseemly hacking of something or other. The
<i>mdwlist</i> package actually does the job, but it doesn&rsquo;t work
here, because it makes a different-named list, while the name
@@ -35,9 +39,10 @@ plethora of space-saving measures: you can, in principle, suppress all
its other actions, and have it provide you a compressed bibliography
<em>only</em>.
<dl>
-<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
-<dt><tt><i>natbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
-<dt><tt><i>savetrees.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/savetrees.zip">macros/latex/contrib/savetrees</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/savetrees.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/savetrees/">browse</a>)
+<dt><tt><i>compactbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/compactbib/compactbib.sty">macros/latex/contrib/compactbib/compactbib.sty</a>
+<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
+<dt><tt><i>natbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
+<dt><tt><i>savetrees.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/savetrees.zip">macros/latex/contrib/savetrees</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/savetrees/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=compactbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=compactbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-complist.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-complist.html
index 81365892835..af99daac92e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-complist.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-complist.html
@@ -98,14 +98,14 @@ to set spacing between items and between paragraphs within items.
more &ldquo;basic&rdquo; (and therefore more flexible) manner than the
<a href="FAQ-enumerate.html"><i>enumerate</i> package</a> does.
<dl>
-<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>enumitem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/enumitem/">browse</a>)
-<dt><tt><i>expdlist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/expdlist/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
-<dt><tt><i>multenum.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multenum.zip">macros/latex/contrib/multenum</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multenum.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multenum/">browse</a>)
-<dt><tt><i>paralist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/paralist.zip">macros/latex/contrib/paralist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/paralist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/paralist/">browse</a>)
-<dt><tt><i>savetrees.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/savetrees.zip">macros/latex/contrib/savetrees</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/savetrees.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/savetrees/">browse</a>)
+<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>enumitem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem/">browse the directory</a>)
+<dt><tt><i>expdlist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
+<dt><tt><i>multenum.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multenum.zip">macros/latex/contrib/multenum</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multenum/">browse the directory</a>)
+<dt><tt><i>paralist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/paralist.zip">macros/latex/contrib/paralist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/paralist/">browse the directory</a>)
+<dt><tt><i>savetrees.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/savetrees.zip">macros/latex/contrib/savetrees</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/savetrees/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=complist">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=complist</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-concrete.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-concrete.html
index 388fc0299e8..86bfe9f8dd4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-concrete.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-concrete.html
@@ -48,15 +48,15 @@ they are available from <a href="FAQ-psfchoice.html">MicroPress</a>. The
<a href="FAQ-textrace.html">CM-Super fonts</a> contain Type 1 versions
of the Concrete fonts in T1 encoding.
<dl>
-<dt><tt><i>beton.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/beton.zip">macros/latex/contrib/beton</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/beton.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/beton/">browse</a>)
-<dt><tt><i>ccfonts.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccfonts.zip">macros/latex/contrib/ccfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ccfonts/">browse</a>)
-<dt><tt><i>CM-Super fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>)
-<dt><tt><i>concmath.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/concmath.zip">macros/latex/contrib/concmath</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/concmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/concmath/">browse</a>)
-<dt><tt><i>Concmath fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/concmath.zip">fonts/concmath</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/concmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/concmath/">browse</a>)
-<dt><tt><i>Concrete fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/concrete.zip">fonts/concrete</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/concrete.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/concrete/">browse</a>)
-<dt><tt><i>euler.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/euler.zip">macros/latex/contrib/euler</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/euler.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/euler/">browse</a>)
-<dt><tt><i>eulervm bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/eulervm.zip">fonts/eulervm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/eulervm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/eulervm/">browse</a>)
-<dt><tt><i>gkpmac.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/knuth/local/lib/gkpmac.tex">systems/knuth/local/lib/gkpmac.tex</a>
+<dt><tt><i>beton.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/beton.zip">macros/latex/contrib/beton</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/beton/">browse the directory</a>)
+<dt><tt><i>ccfonts.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccfonts.zip">macros/latex/contrib/ccfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccfonts/">browse the directory</a>)
+<dt><tt><i>CM-Super fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>)
+<dt><tt><i>concmath.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/concmath.zip">macros/latex/contrib/concmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/concmath/">browse the directory</a>)
+<dt><tt><i>Concmath fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/concmath.zip">fonts/concmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/concmath/">browse the directory</a>)
+<dt><tt><i>Concrete fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/concrete.zip">fonts/concrete</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/concrete/">browse the directory</a>)
+<dt><tt><i>euler.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/euler.zip">macros/latex/contrib/euler</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/euler/">browse the directory</a>)
+<dt><tt><i>eulervm bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eulervm.zip">fonts/eulervm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eulervm/">browse the directory</a>)
+<dt><tt><i>gkpmac.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/knuth/local/lib/gkpmac.tex">systems/knuth/local/lib/gkpmac.tex</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=concrete">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=concrete</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-conditional.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-conditional.html
index cba1c195363..b6aa1b47a08 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-conditional.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-conditional.html
@@ -150,20 +150,20 @@ an <code>extract</code> environment which you can use to create complete
ready-to-run LaTeX documents with stuff you&rsquo;ve extracted.
<dl>
<dt><tt><i>askinclude.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages &mdash;
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
-<dt><tt><i>comment.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/comment.zip">macros/latex/contrib/comment</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/comment.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/comment/">browse</a>)
-<dt><tt><i>excludeonly.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/excludeonly.sty">macros/latex/contrib/misc/excludeonly.sty</a>
-<dt><tt><i>extract.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/extract.zip">macros/latex/contrib/extract</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/extract.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/extract/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>optional.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/optional.sty">macros/latex/contrib/misc/optional.sty</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>comment.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/comment.zip">macros/latex/contrib/comment</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/comment/">browse the directory</a>)
+<dt><tt><i>excludeonly.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/excludeonly.sty">macros/latex/contrib/misc/excludeonly.sty</a>
+<dt><tt><i>extract.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/extract.zip">macros/latex/contrib/extract</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/extract/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>optional.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/optional.sty">macros/latex/contrib/misc/optional.sty</a>
<dt><tt><i>pagesel.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages &mdash;
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
-<dt><tt><i>pdfpages.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdfpages.zip">macros/latex/contrib/pdfpages</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdfpages.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pdfpages/">browse</a>)
-<dt><tt><i>selectp.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/selectp.sty">macros/latex/contrib/misc/selectp.sty</a>
-<dt><tt><i>verbatim.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>version.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/version.sty">macros/latex/contrib/misc/version.sty</a>
-<dt><tt><i>versions.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/versions/versions.sty">macros/latex/contrib/versions/versions.sty</a>
-<dt><tt><i>xcomment.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/seminar.zip">macros/latex/contrib/seminar</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/seminar.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/seminar/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>pdfpages.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdfpages.zip">macros/latex/contrib/pdfpages</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdfpages/">browse the directory</a>)
+<dt><tt><i>selectp.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/selectp.sty">macros/latex/contrib/misc/selectp.sty</a>
+<dt><tt><i>verbatim.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>version.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/version.sty">macros/latex/contrib/misc/version.sty</a>
+<dt><tt><i>versions.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/versions/versions.sty">macros/latex/contrib/versions/versions.sty</a>
+<dt><tt><i>xcomment.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/seminar.zip">macros/latex/contrib/seminar</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/seminar/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=conditional">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=conditional</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-context.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-context.html
index c3f57b68c60..7af37da0271 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-context.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-context.html
@@ -43,8 +43,7 @@ prodigious energy. Support is available via a
<a href="http://contextgarden.net">WIKI site</a> and via the
<a href="http://www.ntg.nl/mailman/listinfo/ntg-context">mailing list</a>.
<dl>
-<dt><tt><i>ConTeXt distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/context.zip">macros/context</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/context.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/context/">browse</a>)
+<dt><tt><i>ConTeXt distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/context.zip">macros/context</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/context/">browse the directory</a>)
</dl>
-<p/>
-<p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=context">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=context</a>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=context">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=context</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-crop.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-crop.html
index 2c86ecce729..d7562f3743f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-crop.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-crop.html
@@ -13,8 +13,8 @@ facilities to satisfy any conceivable production house. Users of the
<i>memoir</i> class don&rsquo;t need the package, since <i>memoir</i> has
its own facilities for programming crop marks.
<dl>
-<dt><tt><i>crop.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/crop.zip">macros/latex/contrib/crop</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/crop.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/crop/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>crop.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/crop.zip">macros/latex/contrib/crop</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/crop/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=crop">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=crop</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-custbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-custbib.html
index 69209eed9eb..d3e34e49a8b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-custbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-custbib.html
@@ -19,8 +19,8 @@ own <code>.bst</code> file. This technique doesn&rsquo;t offer entirely new sty
of document, but the system&rsquo;s &ldquo;master BibTeX styles&rdquo; already
offer significantly more than the BibTeX standard set.
<dl>
-<dt><tt><i>BibTeX documentation</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/distribs/doc.zip">biblio/bibtex/distribs/doc</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/distribs/doc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/distribs/doc/">browse</a>)
-<dt><tt><i>makebst.tex</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/custom-bib/">browse</a>)
+<dt><tt><i>BibTeX documentation</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/doc.zip">biblio/bibtex/contrib/doc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/doc/">browse the directory</a>)
+<dt><tt><i>makebst.tex</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=custbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=custbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cv.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cv.html
index caa9ad674ba..41648d41839 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cv.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-cv.html
@@ -31,12 +31,12 @@ FAQ team. Its output certainly looks good.
<p/>There is also a LaTeX 2.09 package <i>resume</i>, which comes with
little but advice <em>against</em> trying to use it.
<dl>
-<dt><tt><i>currvita.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/currvita.zip">macros/latex/contrib/currvita</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/currvita.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/currvita/">browse</a>)
-<dt><tt><i>curve.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/curve.zip">macros/latex/contrib/curve</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/curve.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/curve/">browse</a>)
-<dt><tt><i>europecv.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/europecv.zip">macros/latex/contrib/europecv</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/europecv.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/europecv/">browse</a>)
-<dt><tt><i>moderncv.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moderncv.zip">macros/latex/contrib/moderncv</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moderncv.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/moderncv/">browse</a>)
-<dt><tt><i>resume.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/obsolete/macros/latex209/contrib/resume/resume.sty">obsolete/macros/latex209/contrib/resume/resume.sty</a>
-<dt><tt><i>vita.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/vita.zip">macros/latex/contrib/vita</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/vita.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/vita/">browse</a>)
+<dt><tt><i>currvita.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/currvita.zip">macros/latex/contrib/currvita</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/currvita/">browse the directory</a>)
+<dt><tt><i>curve.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/curve.zip">macros/latex/contrib/curve</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/curve/">browse the directory</a>)
+<dt><tt><i>europecv.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/europecv.zip">macros/latex/contrib/europecv</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/europecv/">browse the directory</a>)
+<dt><tt><i>moderncv.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moderncv.zip">macros/latex/contrib/moderncv</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moderncv/">browse the directory</a>)
+<dt><tt><i>resume.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveobsolete/macros/latex209/contrib/resume/resume.sty">obsolete/macros/latex209/contrib/resume/resume.sty</a>
+<dt><tt><i>vita.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/vita.zip">macros/latex/contrib/vita</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/vita/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cv">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=cv</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dec_comma.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dec_comma.html
index 8c4bc8f9ae9..c1cde44104c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dec_comma.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dec_comma.html
@@ -33,9 +33,9 @@ group the digits of very &lsquo;long&rsquo; numbers), but is inevitably less
convenient than <i>icomma</i> or <i>ziffer</i> if you are typing a
lot of numbers.
<dl>
-<dt><tt><i>icomma.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/was.zip">macros/latex/contrib/was</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/was.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/was/">browse</a>)
-<dt><tt><i>numprint.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/numprint.zip">macros/latex/contrib/numprint</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/numprint.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/numprint/">browse</a>)
-<dt><tt><i>ziffer.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ziffer.zip">macros/latex/contrib/ziffer</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ziffer.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ziffer/">browse</a>)
+<dt><tt><i>icomma.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/was.zip">macros/latex/contrib/was</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/was/">browse the directory</a>)
+<dt><tt><i>numprint.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/numprint.zip">macros/latex/contrib/numprint</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/numprint/">browse the directory</a>)
+<dt><tt><i>ziffer.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ziffer.zip">macros/latex/contrib/ziffer</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ziffer/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dec_comma">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dec_comma</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-destable.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-destable.html
index 53ed96568b7..3f135df12c2 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-destable.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-destable.html
@@ -35,7 +35,7 @@ position wrong (by <code>10pt</code>) if you simply write:
The <i>topcapt</i> package solves this problem:
<blockquote>
<pre>
-\usepackage{topcaption}
+\usepackage{topcapt}
...
\begin{table}
\topcaption{Example table}
@@ -74,10 +74,10 @@ value <code>10pt</code>) and <code>\</code><code>belowcaptionskip</code> (defaul
</blockquote><p>
does the job. (The package itself is very slightly more elaborate...)
<dl>
-<dt><tt><i>booktabs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/booktabs/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>topcapt.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/topcapt.sty">macros/latex/contrib/misc/topcapt.sty</a>
+<dt><tt><i>booktabs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>topcapt.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/topcapt.sty">macros/latex/contrib/misc/topcapt.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=destable">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=destable</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-divzero.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-divzero.html
index 675a02de27b..9c75637cdad 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-divzero.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-divzero.html
@@ -48,7 +48,7 @@ will resolve the error, and will behave as you might hope.
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>graphics.sty,graphicx.sty</i></tt><dd>Both parts of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>) bundle
+<dt><tt><i>graphics.sty,graphicx.sty</i></tt><dd>Both parts of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>) bundle
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=divzero">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=divzero</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-doc-wiki.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-doc-wiki.html
index 14f72dc46ec..9d5d4cf3dba 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-doc-wiki.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-doc-wiki.html
@@ -8,14 +8,11 @@ stuff that someone else has added: while there is obvious potential
for chaos, there is evidence that a strong user community can keep a
WIKI under control.
<p/>Following the encouraging performance of the
-<a href="http://contextgarden.net/">ConTeXt WIKI</a>, both a
-<a href="http://en.wikibooks.org/wiki/TeX">(Plain) TeX WIKI</a> and a
-<a href="http://en.wikibooks.org/wiki/LaTeX">LaTeX WIKI</a> have been
-established. Both seem rather sparse, as yet, and the LaTeX WIKI
-contains some suggestions that go counter to established advice (e.g.,
-the LaTeX WIKI has details on the
-<a href="FAQ-eqnarray.html">use of the <code>eqnarray</code> environment</a>);
-however one may hope that both will become useful resources in the
-longer term.
+<a href="http://contextgarden.net/">ConTeXt WIKI</a>, valiant efforts
+have been made generating &ldquo;WIKI books&rdquo; for (La)TeX users. Thus we
+have <a href="http://en.wikibooks.org/wiki/TeX">(Plain) TeX WIKI</a> and
+<a href="http://en.wikibooks.org/wiki/LaTeX">LaTeX WIKI</a> are well
+established. Neither would seem yet to be of publication quality, but
+they both seem useful reference sources.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=doc-wiki">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=doc-wiki</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docotherdir.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docotherdir.html
index aa6074b7fed..336f6561392 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docotherdir.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docotherdir.html
@@ -58,8 +58,8 @@ provide a path to the file. (There are also
<p/>Documentation of <i>chapterfolder</i> is in French, but the
<i>README</i> in the directory is in English.
<dl>
-<dt><tt><i>chapterfolder.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/chapterfolder.zip">macros/latex/contrib/chapterfolder</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/chapterfolder.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/chapterfolder/">browse</a>)
-<dt><tt><i>import.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/import.sty">macros/latex/contrib/misc/import.sty</a>
+<dt><tt><i>chapterfolder.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/chapterfolder.zip">macros/latex/contrib/chapterfolder</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/chapterfolder/">browse the directory</a>)
+<dt><tt><i>import.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/import.sty">macros/latex/contrib/misc/import.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=docotherdir">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=docotherdir</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docpictex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docpictex.html
index 2040e88b3ac..8d9776c5cf6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docpictex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-docpictex.html
@@ -14,8 +14,8 @@ manual is <em>not</em> available electronically.
CTAN, which is a great aide-memoire for those who basically
know the package to start with.
<dl>
-<dt><tt><i>pictex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pictex.zip">graphics/pictex</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pictex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pictex/">browse</a>)
-<dt><tt><i>PiCTeX summary</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/pictex/summary.zip">info/pictex/summary</a> (<a href="ftp://cam.ctan.org/tex-archive/info/pictex/summary.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/pictex/summary/">browse</a>)
+<dt><tt><i>pictex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex.zip">graphics/pictex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex/">browse the directory</a>)
+<dt><tt><i>PiCTeX summary</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/pictex/summary.zip">info/pictex/summary</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/pictex/summary/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=docpictex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=docpictex</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dpfloat.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dpfloat.html
index 56c65cbb3c2..38a140ed293 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dpfloat.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dpfloat.html
@@ -25,7 +25,7 @@ The construction has no effect unless the standard class option
<p/>Full documentation of the package (such as it is) is to be found in
<i>README.dpfloat</i>
<dl>
-<dt><tt><i>dpfloat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dpfloat.zip">macros/latex/contrib/dpfloat</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dpfloat.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/dpfloat/">browse</a>)
+<dt><tt><i>dpfloat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dpfloat.zip">macros/latex/contrib/dpfloat</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dpfloat/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dpfloat">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dpfloat</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawFeyn.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawFeyn.html
index 08a3f88af38..5b36261fa5e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawFeyn.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawFeyn.html
@@ -25,10 +25,10 @@ fragments, which you can compose to produce complete diagrams. It
offers fairly simple diagrams which look good in equations, rather
than complicated ones more suitable for display in figures.
<dl>
-<dt><tt><i>axodraw</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/axodraw.zip">graphics/axodraw</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/axodraw.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/axodraw/">browse</a>)
-<dt><tt><i>feyn font bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/feyn.zip">fonts/feyn</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/feyn.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/feyn/">browse</a>)
-<dt><tt><i>feynman bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/feynman.zip">macros/latex209/contrib/feynman</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/feynman.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex209/contrib/feynman/">browse</a>)
-<dt><tt><i>feynmf/feynmp bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/feynmf.zip">macros/latex/contrib/feynmf</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/feynmf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/feynmf/">browse</a>)
+<dt><tt><i>axodraw</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/axodraw.zip">graphics/axodraw</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/axodraw/">browse the directory</a>)
+<dt><tt><i>feyn font bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/feyn.zip">fonts/feyn</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/feyn/">browse the directory</a>)
+<dt><tt><i>feynman bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/feynman.zip">macros/latex209/contrib/feynman</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/feynman/">browse the directory</a>)
+<dt><tt><i>feynmf/feynmp bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/feynmf.zip">macros/latex/contrib/feynmf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/feynmf/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawFeyn">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawFeyn</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawing.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawing.html
index 5cd801f9013..a541f5b6bfb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawing.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-drawing.html
@@ -5,14 +5,25 @@
<p/>There are many packages to do pictures in (La)TeX itself (rather than
importing graphics created externally), ranging from simple use of
LaTeX <code>picture</code> environment, through enhancements like
-<i>epic</i>, to
+<i>eepic</i>, to
sophisticated (but slow) drawing with PicTeX. Depending on your type
of drawing, and setup, here are a few systems you may consider:
<ul>
+<li> PicTeX is a venerable, and very powerful, system, that draws
+ by placing dots on the page to give the effect of a line or curve. While
+ this has the potential of great power, it is (of course) much slower
+ than any of the other established packages. What&rsquo;s more, there
+ are problems with its <a href="FAQ-docpictex.html">documentation</a>.
+<li> <i>epic</i> was designed to make use of the LaTeX
+ <code>picture</code> environment somewhat less agonising;
+ <i>eepic</i> extends it, and is capable of using <i>tpic</i>
+ <code>\</code><code>special</code> commands to improve printing performance. (If the
+ <code>\</code><code>special</code>s aren&rsquo;t available, the <i>eepicemu</i> will do the
+ business, far less efficiently.
<li> <i>pict2e</i>; this was advertised in
<a href="FAQ-books.html">the LaTeX manual</a>, but didn&rsquo;t appear for nearly
ten years after publication of the book! It removes all the petty
- niggles that surround the use of the <code>picture</code>
+ restrictions that surround the use of the <code>picture</code>
environment. It therefore suffers <em>only</em> from the rather
eccentric drawing language of the environment, and is a far more
useful tool than the original environment has ever been. (Note that
@@ -21,9 +32,11 @@ of drawing, and setup, here are a few systems you may consider:
<li> <i>PSTricks</i>; this gives you access to all the power of
PostScript from TeX itself, by sophisticated use of
<a href="FAQ-specials.html"><code>\</code><code>special</code> commands</a>. Since PostScript is itself a
- pretty powerful programming language, many astounding things can in
- principle be achieved using <i>PSTricks</i>.
- <i>pstricks</i>&rsquo; <code>\</code><code>special</code>s are
+ pretty powerful programming language, many astounding things can in
+ principle be achieved using <i>PSTricks</i> (a wide range of
+ contributed packages, ranging from world mapping to lens design
+ diagrams, is available).
+ <i>Pstricks</i>&rsquo; <code>\</code><code>special</code>s are
by default specific to <i>dvips</i>, but VTeX (both in its
commercial and in its free versions) understands them. PDFTeX
users may use <i>pst-pdf</i>, which (like
@@ -63,15 +76,19 @@ of drawing, and setup, here are a few systems you may consider:
readable (and is fully documented).
</ul>
<dl>
-<dt><tt><i>dratex.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/dratex.zip">graphics/dratex</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/dratex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/dratex/">browse</a>)
-<dt><tt><i>mfpic</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/mfpic.zip">graphics/mfpic</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/mfpic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/mfpic/">browse</a>)
-<dt><tt><i>preview.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/preview.zip">macros/latex/contrib/preview</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/preview.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/preview/">browse</a>)
-<dt><tt><i>pspicture.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pspicture.zip">macros/latex/contrib/pspicture</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pspicture.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pspicture/">browse</a>)
-<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pst-pdf/">browse</a>)
-<dt><tt><i>pgf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.zip">graphics/pgf</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pgf/">browse</a>)
-<dt><tt><i>pict2e.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pict2e.zip">macros/latex/contrib/pict2e</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pict2e.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pict2e/">browse</a>)
-<dt><tt><i>pstricks</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pstricks/">browse</a>)
-<dt><tt><i>tikz.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.zip">graphics/pgf</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pgf/">browse</a>)
+<dt><tt><i>dratex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/dratex.zip">graphics/dratex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/dratex/">browse the directory</a>)
+<dt><tt><i>epic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/epic.zip">macros/latex/contrib/epic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/epic/">browse the directory</a>)
+<dt><tt><i>eepic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eepic.zip">macros/latex/contrib/eepic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eepic/">browse the directory</a>)
+<dt><tt><i>eepicemu.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eepic.zip">macros/latex/contrib/eepic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eepic/">browse the directory</a>)
+<dt><tt><i>mfpic</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/mfpic.zip">graphics/mfpic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/mfpic/">browse the directory</a>)
+<dt><tt><i>preview.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/preview.zip">macros/latex/contrib/preview</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/preview/">browse the directory</a>)
+<dt><tt><i>pspicture.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pspicture.zip">macros/latex/contrib/pspicture</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pspicture/">browse the directory</a>)
+<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf/">browse the directory</a>)
+<dt><tt><i>pgf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf.zip">graphics/pgf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf/">browse the directory</a>)
+<dt><tt><i>pict2e.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pict2e.zip">macros/latex/contrib/pict2e</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pict2e/">browse the directory</a>)
+<dt><tt><i>pictex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex.zip">graphics/pictex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex/">browse the directory</a>)
+<dt><tt><i>pstricks</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks/">browse the directory</a>)
+<dt><tt><i>tikz.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf.zip">graphics/pgf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawing">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=drawing</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dropping.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dropping.html
index 32a0256fd41..f58f8b286fd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dropping.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dropping.html
@@ -6,25 +6,25 @@
is to start a paragraph (in books, usually the first of a chapter)
with its first letter set large enough to span several lines.
<p/>This style is known as &ldquo;dropped capitals&rdquo;, or (in French)
-«lettrines», and TeX&rsquo;s primitive
-facilities for hanging indentation make its (simple) implementation
-pretty straightforward.
+&laquo;lettrines&raquo;,
+and TeX&rsquo;s primitive facilities for hanging indentation make its
+(simple) implementation pretty straightforward.
<p/>The <i>dropping</i> package does the job simply, but has a curious
attitude to the calculation of the size of the font to be used for the
big letters. Examples appear in the package documentation, so before
-you process the <code>.dtx</code>, the package itself must already be installed.
-Unfortunately, <i>dropping</i> has an intimate relation to the set
-of device drivers available in an early version of the LaTeX
-graphics package, and it cannot be trusted to work with recent
-offerings like PDFTeX, VTeX or DVIpdfm.
-<p/>On such occasions, the more recent <i>lettrine</i> package is more
-likely to succeed. It has a well-constructed array of options, and
-the examples (a pretty impressive set) come as a separate file in the
-distribution (also available in PostScript, so that they can be viewed
-without installing the package itself).
+you process the <code>.dtx</code>, the package itself must already be
+installed. Unfortunately, <i>dropping</i> has an intimate relation
+to the set of device drivers available in an early version of the
+LaTeX graphics package, and it cannot be trusted to work with
+modern offerings such as PDFTeX, VTeX or DVIpdfm, let
+alone such modernisms as XeTeX. As a result, the package is widely
+deprecated, nowadays.
+<p/>The more recent <i>lettrine</i> package is generally more reliable.
+It has a well-constructed array of options, and an impressive set of
+examples adds to the package&rsquo;s document.
<dl>
-<dt><tt><i>dropping</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dropping.zip">macros/latex/contrib/dropping</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dropping.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/dropping/">browse</a>)
-<dt><tt><i>lettrine</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lettrine.zip">macros/latex/contrib/lettrine</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lettrine.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/lettrine/">browse</a>)
+<dt><tt><i>dropping</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dropping.zip">macros/latex/contrib/dropping</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dropping/">browse the directory</a>)
+<dt><tt><i>lettrine</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lettrine.zip">macros/latex/contrib/lettrine</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lettrine/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dropping">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dropping</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dtx.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dtx.html
index cbbed32fbb1..ff2da9b05b3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dtx.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dtx.html
@@ -43,11 +43,11 @@ package to
thus permitting documented distribution of bundles containing code for
Metafont and MetaPost together with related LaTeX code.
<dl>
-<dt><tt><i>clsguide.pdf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc/clsguide.pdf">macros/latex/doc/clsguide.pdf</a>
-<dt><tt><i>docmfp.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/docmfp.zip">macros/latex/contrib/docmfp</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/docmfp.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/docmfp/">browse</a>)
+<dt><tt><i>clsguide.pdf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/doc/clsguide.pdf">macros/latex/doc/clsguide.pdf</a>
+<dt><tt><i>docmfp.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/docmfp.zip">macros/latex/contrib/docmfp</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/docmfp/">browse the directory</a>)
<dt><tt><i>docstrip.tex</i></tt><dd>Part of the LaTeX distribution
-<dt><tt><i>DTX tutorial</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/dtxtut.zip">info/dtxtut</a> (<a href="ftp://cam.ctan.org/tex-archive/info/dtxtut.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/dtxtut/">browse</a>)
-<dt><tt><i>makedtx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/makedtx.zip">support/makedtx</a> (<a href="ftp://cam.ctan.org/tex-archive/support/makedtx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/makedtx/">browse</a>)
+<dt><tt><i>DTX tutorial</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/dtxtut.zip">info/dtxtut</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/dtxtut/">browse the directory</a>)
+<dt><tt><i>makedtx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/makedtx.zip">support/makedtx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/makedtx/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dtx">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dtx</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi-bmp.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi-bmp.html
index 11ea878604c..682f5bf0660 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi-bmp.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi-bmp.html
@@ -14,9 +14,10 @@ source &mdash; not everything that you can write in (La)TeX can be
translated to HTML (at least, portable HTML that may be
viewed in &lsquo;most&rsquo; browsers), so the commonest avoiding action is to
generate a bitmap of the missing bit. Examples are maths (a maths
-extension to the <code>*</code>ML family is available but not widely
-used), and &lsquo;exotic&rsquo; typescripts (ones that you cannot guarantee your
-readers will have available). Other common examples are generation of
+extension to the &lsquo;<code>*</code>ML&rsquo; family is available but not
+universally supported by browsers), and &lsquo;exotic&rsquo; typescripts (ones
+that you cannot guarantee your readers will have available). Other
+common examples are generation of
sample bitmaps, and generation for insertion into some other
application&rsquo;s display &mdash; to insert equations into Microsoft
PowerPoint, or to support the enhanced-<i>emacs</i> setup called
@@ -41,8 +42,8 @@ web-oriented environments. Note that <i>dvipng</i> gives
high-quality output even though its internal operations are optimised
for speed.
<dl>
-<dt><tt><i>dvi2bitmap</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2bitmap.zip">dviware/dvi2bitmap</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2bitmap.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvi2bitmap/">browse</a>)
-<dt><tt><i>dvipng</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvipng.zip">dviware/dvipng</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvipng.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvipng/">browse</a>)
+<dt><tt><i>dvi2bitmap</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2bitmap.zip">dviware/dvi2bitmap</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2bitmap/">browse the directory</a>)
+<dt><tt><i>dvipng</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipng.zip">dviware/dvipng</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipng/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvi-bmp">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvi-bmp</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi.html
index 7539268ba10..743f414dcce 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvi.html
@@ -22,7 +22,7 @@ possibly material to be introduced by means of
source of Knuth&rsquo;s program <i>dvitype</i> (whose original purpose,
as its name implies, was to view the content of a DVI file).
<dl>
-<dt><tt><i>dvitype</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/knuth/dist/texware/dvitype.web">systems/knuth/dist/texware/dvitype.web</a>
+<dt><tt><i>dvitype</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/knuth/dist/texware/dvitype.web">systems/knuth/dist/texware/dvitype.web</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvi">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvi</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipdfmgraphics.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipdfmgraphics.html
index e0e0c376c90..e962230257b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipdfmgraphics.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipdfmgraphics.html
@@ -2,16 +2,16 @@
<title>UK TeX FAQ -- question label dvipdfmgraphics</title>
</head><body>
<h3>Imported graphics in <i>dvipdfm</i></h3>
-<p/><i>Dvipdfm</i> translates direct from DVI to PDF
-(all other available routes produce PostScript output using
-<i>dvips</i> and then convert that to PDF with
+<p/><i>Dvipdfm</i> (and <i>dvipdfmx</i>) translates direct from
+DVI to PDF (all other available routes produce PostScript
+output using <i>dvips</i> and then convert that to PDF with
<i>ghostscript</i> or <i>Acrobat</i> <i>Distiller</i>).
-<p/><i>Dvipdfm</i> is a particularly flexible application. It will
-permit the inclusion of bitmap and PDF graphics, as does
-<a href="FAQ-pdftexgraphics.html">PDFTeX</a>, but is also capable of employing
-<i>ghostscript</i> &ldquo;on the fly&rdquo; so as to be able to permit the
-inclusion of encapsulated PostScript (<code>.eps</code>) files by translating
-them to PDF. In this way, <i>dvipdfm</i> combines the good
+<p/><i>Dvipdfm</i>/<i>Dvipdfmx</i> are particularly flexible
+applications. They permit the inclusion of bitmap and PDF
+graphics, as does <a href="FAQ-pdftexgraphics.html">PDFTeX</a>, but are also
+capable of employing <i>ghostscript</i> &ldquo;on the fly&rdquo; so as to be
+able to permit the inclusion of encapsulated PostScript (<code>.eps</code>)
+files by translating them to PDF. In this way, they combine the good
qualities of <i>dvips</i> and of PDFTeX as a means of
processing illustrated documents.
<p/>Unfortunately, &ldquo;ordinary&rdquo; LaTeX can&rsquo;t deduce the bounding box of
@@ -37,7 +37,7 @@ containing the information; the above numbers came from an
%%CreationDate: Mon Mar 8 15:17:47 2004
</pre>
</blockquote><p>
-However, if such a file is available, you may abbreviate the inclusion
+If such a file is available, you may abbreviate the inclusion
code, above, to read:
<blockquote>
<pre>
@@ -58,8 +58,9 @@ don&rsquo;t ordinarily need to specify the fact, since the default graphics
configuration file (of most distributions) &ldquo;guesses&rdquo; the
<code>dvips</code> option if you&rsquo;re using TeX.
<dl>
-<dt><tt><i>dvipdfm</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvipdfm/">browse</a>)
-<dt><tt><i>ebb</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvipdfm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvipdfm/">browse</a>)
+<dt><tt><i>dvipdfm</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm/">browse the directory</a>)
+<dt><tt><i>dvipdfmx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfmx.zip">dviware/dvipdfmx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfmx/">browse the directory</a>)
+<dt><tt><i>ebb</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm.zip">dviware/dvipdfm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvipdfm/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvipdfmgraphics">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvipdfmgraphics</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips-pdf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips-pdf.html
index 9da7380561b..3ad634b39ac 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips-pdf.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips-pdf.html
@@ -40,7 +40,7 @@ come.
Shell&rsquo;s <i>testflow</i> package, which these FAQs recommend as a
&ldquo;<a href="FAQ-tutbitslatex.html">specialised tutorial</a>.
<dl>
-<dt><tt><i>testflow</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
+<dt><tt><i>testflow</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvips-pdf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvips-pdf</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips.html
index b64722780eb..10f7e879ecd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvips.html
@@ -14,8 +14,8 @@ distribution of TeX for VMS.
<p/>A precompiled version to work with emTeX is available on CTAN.
<dl>
<dt><tt><i>MSDOS and OS/2</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/systems/msdos/dviware/dvips.zip">systems/msdos/dviware/dvips</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/dviware/dvips.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/dviware/dvips/">browse</a>)
-<dt><tt><i>VMS distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/OpenVMS/TEX97_CTAN.ZIP">systems/OpenVMS/TEX97_CTAN.ZIP</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/dviware/dvips.zip">systems/msdos/dviware/dvips</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/dviware/dvips/">browse the directory</a>)
+<dt><tt><i>VMS distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/OpenVMS/TEX97_CTAN.ZIP">systems/OpenVMS/TEX97_CTAN.ZIP</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvips">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvips</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipsgraphics.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipsgraphics.html
index 19140f647be..7f68af65f8c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipsgraphics.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-dvipsgraphics.html
@@ -32,10 +32,10 @@ assuming that capability destroys portability, and is only
recommendable if you are sure you will never want to share your
document.
<dl>
-<dt><tt><i>a2ping</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/a2ping.zip">graphics/a2ping</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/a2ping.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/a2ping/">browse</a>)
-<dt><tt><i>bmeps</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/bmeps.zip">support/bmeps</a> (<a href="ftp://cam.ctan.org/tex-archive/support/bmeps.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/bmeps/">browse</a>)
-<dt><tt><i>jpeg2ps</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/support/jpeg2ps.zip">nonfree/support/jpeg2ps</a> (<a href="ftp://cam.ctan.org/tex-archive/nonfree/support/jpeg2ps.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/nonfree/support/jpeg2ps/">browse</a>)
-<dt><tt><i>sam2p</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/sam2p.zip">graphics/sam2p</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/sam2p.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/sam2p/">browse</a>)
+<dt><tt><i>a2ping</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/a2ping.zip">graphics/a2ping</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/a2ping/">browse the directory</a>)
+<dt><tt><i>bmeps</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/bmeps.zip">support/bmeps</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/bmeps/">browse the directory</a>)
+<dt><tt><i>jpeg2ps</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jpeg2ps.zip">support/jpeg2ps</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jpeg2ps/">browse the directory</a>)
+<dt><tt><i>sam2p</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/sam2p.zip">graphics/sam2p</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/sam2p/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvipsgraphics">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=dvipsgraphics</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-editors.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-editors.html
index e9e01c97566..4173da13c93 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-editors.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-editors.html
@@ -6,19 +6,19 @@
operating systems; some are described below, but this is only a
personal selection:
<dl>
-<dt>Unix<dd> Try
- <a href="http://www.gnu.org/software/emacs/emacs.html">GNU <i>emacs</a></i>
- or <a href="http://www.xemacs.org/"><i>XEmacs</a></i>, and
- the AUC-TeX
+<dt>Unix<dd> The commonest choices are <i>[X]Emacs</i> or
+ <i>vim</i>, though several others are available.
+<p/> <a href="http://www.gnu.org/software/emacs/emacs.html">GNU <i>emacs</a></i>
+ and <a href="http://www.xemacs.org/"><i>XEmacs</a></i> are supported
+ by the AUC-TeX
bundle (available from CTAN). AUC-TeX provides menu
items and control sequences for common constructs, checks syntax,
lays out markup nicely, lets you call TeX and drivers from
within the editor, and everything else like this that you can think
of. Complex, but very powerful.
-<p/> Many who consider the versions of <i>emacs</i> spawn of the devil, prefer
- <a href="http://vim.sourceforge.net"><i>vim</a></i>, a highly configurable
- editor (also available for Windows and Macintosh systems). Many
- plugins are available to support the needs of the (La)TeX user,
+<p/> <a href="http://vim.sourceforge.net"><i>Vim</a></i> is also highly
+ configurable (also available for Windows and Macintosh systems).
+ Many plugins are available to support the needs of the (La)TeX user,
including syntax highlighting, calling TeX programs,
auto-insertion and -completion of common (La)TeX structures, and
browsing LaTeX help. The scripts <i>auctex.vim</i> and
@@ -66,12 +66,19 @@ personal selection:
works well with OzTeX. From release 2.2.0 (at least), Textures
works with MacOS X.
<p/> For MacOS X users, the free tool of choice appears to be
- <a href="http://www.uoregon.edu/~koch/texshop/texshop.html">TeXShop</a>, which
+ <a href="http://www.uoregon.edu/~koch/texshop/texshop.html">TeXshop</a>, which
combines an editor and a shell with a coherent philosophy of dealing
with (La)TeX in the OS X environment. TeXShop is distributed as
part of the MacTeX system, and will therefore be available out of
the box on machines on which MacTeX has been installed.
<p/> <i>Vim</i> is also available for use on Macintosh systems.
+<dt>Wildcard<dd> TUG is sponsoring the development of a
+ cross-platform editor and shell, modelled on the excellent
+ TeXshop for the Macintosh. While this program,
+ <a href="http://www.tug.org/texworks/">TeXworks</a>, is still under
+ development, it is already quite usable: if you&rsquo;re looking for a
+ (La)TeX development environment, and are willing to step beyond
+ the boundaries, it may be for you.
</dl>
Atari, Amiga and NeXT users also have nice
environments. LaTeX users looking for <i>make</i>-like
@@ -83,15 +90,15 @@ access to your BibTeX files &mdash;
see &ldquo;<a href="FAQ-buildbib.html">creating a bibliography file</a>&rdquo;.
<dl>
-<dt><tt><i>alpha</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/support/alpha.zip">nonfree/systems/mac/support/alpha</a> (<a href="ftp://cam.ctan.org/tex-archive/nonfree/systems/mac/support/alpha.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/nonfree/systems/mac/support/alpha/">browse</a>)
-<dt><tt><i>auctex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/auctex.zip">support/auctex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/auctex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/auctex/">browse</a>)
-<dt><tt><i>epmtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/os2/epmtex.zip">systems/os2/epmtex</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/os2/epmtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/os2/epmtex/">browse</a>)
-<dt><tt><i>LaTeX4Jed</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/jed.zip">support/jed</a> (<a href="ftp://cam.ctan.org/tex-archive/support/jed.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/jed/">browse</a>)
-<dt><tt><i>Nedit LaTeX support</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/NEdit-LaTeX-Extensions.zip">support/NEdit-LaTeX-Extensions</a> (<a href="ftp://cam.ctan.org/tex-archive/support/NEdit-LaTeX-Extensions.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/NEdit-LaTeX-Extensions/">browse</a>)
-<dt><tt><i>TeXnicCenter</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/win32/TeXnicCenter/">systems/win32/TeXnicCenter/</a>
-<dt><tt><i>TeXshell</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/texshell.zip">systems/msdos/texshell</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/texshell.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/texshell/">browse</a>)
-<dt><tt><i>TeXtelmExtel</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex-contrib/TeXtelmExtel.zip">systems/msdos/emtex-contrib/TeXtelmExtel</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex-contrib/TeXtelmExtel.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/emtex-contrib/TeXtelmExtel/">browse</a>)
-<dt><tt><i>winedt</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/win32/winedt/">systems/win32/winedt/</a>
+<dt><tt><i>alpha</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivenonfree/systems/mac/support/alpha/">nonfree/systems/mac/support/alpha/</a>
+<dt><tt><i>auctex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/auctex/">support/auctex/</a>
+<dt><tt><i>epmtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/os2/epmtex.zip">systems/os2/epmtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/os2/epmtex/">browse the directory</a>)
+<dt><tt><i>LaTeX4Jed</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jed.zip">support/jed</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jed/">browse the directory</a>)
+<dt><tt><i>Nedit LaTeX support</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/NEdit-LaTeX-Extensions.zip">support/NEdit-LaTeX-Extensions</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/NEdit-LaTeX-Extensions/">browse the directory</a>)
+<dt><tt><i>TeXnicCenter</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/TeXnicCenter/">systems/win32/TeXnicCenter/</a>
+<dt><tt><i>TeXshell</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/texshell.zip">systems/msdos/texshell</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/texshell/">browse the directory</a>)
+<dt><tt><i>TeXtelmExtel</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/msdos/emtex-contrib/TeXtelmExtel/">systems/msdos/emtex-contrib/TeXtelmExtel/</a>
+<dt><tt><i>winedt</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/winedt/">systems/win32/winedt/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=editors">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=editors</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-empty.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-empty.html
index 0d37b2b6658..ead243c365e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-empty.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-empty.html
@@ -29,9 +29,9 @@ third argument. The package&rsquo;s code also appears in the LaTeX
issue in number two of the &ldquo;around the bend&rdquo; articles by the late
lamented Mike Downes.
<dl>
-<dt><tt><i>Around the bend series</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/aro-bend.zip">info/aro-bend</a> (<a href="ftp://cam.ctan.org/tex-archive/info/aro-bend.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/aro-bend/">browse</a>)
-<dt><tt><i>ifmtarg.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/ifmtarg.sty">macros/latex/contrib/misc/ifmtarg.sty</a>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>Around the bend series</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/challenges/aro-bend.zip">info/challenges/aro-bend</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/challenges/aro-bend/">browse the directory</a>)
+<dt><tt><i>ifmtarg.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/ifmtarg.sty">macros/latex/contrib/misc/ifmtarg.sty</a>
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=empty">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=empty</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-endingroup.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-endingroup.html
index 4bbeb620fe9..5f8eb472976 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-endingroup.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-endingroup.html
@@ -63,7 +63,7 @@ The diagnostic not only tells us where the group started, but also the
<code>\</code><code>bgroup</code>, and the two are not distinguishable at the TeX-engine
level).
<dl>
-<dt><tt><i>checkend.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bezos.zip">macros/latex/contrib/bezos</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bezos.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bezos/">browse</a>)
+<dt><tt><i>checkend.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bezos.zip">macros/latex/contrib/bezos</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bezos/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=endingroup">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=endingroup</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-enumerate.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-enumerate.html
index 0804dc1c7ea..d6a2196f96f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-enumerate.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-enumerate.html
@@ -80,10 +80,10 @@ to make references to the list items format appear as (i), (ii),
<dl>
-<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>enumitem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/enumitem/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>paralist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/paralist.zip">macros/latex/contrib/paralist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/paralist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/paralist/">browse</a>)
+<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>enumitem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>paralist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/paralist.zip">macros/latex/contrib/paralist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/paralist/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=enumerate">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=enumerate</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-epigraph.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-epigraph.html
index 30224225c79..eec51dad4d0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-epigraph.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-epigraph.html
@@ -63,10 +63,35 @@ as those of <i>epigraph</i>, but it&rsquo;s probably easier to use.
commands <code>\</code><code>setchapterpreamble</code> and <code>\</code><code>dictum</code> to provide these
facilities.
<dl>
-<dt><tt><i>epigraph.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/epigraph.zip">macros/latex/contrib/epigraph</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/epigraph.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/epigraph/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>quotchap.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/quotchap.zip">macros/latex/contrib/quotchap</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/quotchap.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/quotchap/">browse</a>)
+<dt><tt><i>epigraph.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/epigraph.zip">macros/latex/contrib/epigraph</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/epigraph/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>quotchap.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/quotchap.zip">macros/latex/contrib/quotchap</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/quotchap/">browse the directory</a>)
</dl>
-<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=epigraph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=epigraph</a>
+<p/>
+<p/>
+
+
+
+
+
+
+
+<p/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=epigraph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=epigraph</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eplain.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eplain.html
index de3f766ac42..f7ffebe97fc 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eplain.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eplain.html
@@ -5,9 +5,10 @@
<p/>The <a href="http://tug.org/eplain">Eplain</a>
macro package expands on and extends the definitions in Plain TeX.
Eplain is not intended to provide &ldquo;generic typesetting
-capabilities&rdquo;, as do LaTeX or <a href="FAQ-texinfo.html">Texinfo</a>. Instead, it
-defines macro tools that should be useful whatever commands you choose
-to use when you prepare your manuscript.
+capabilities&rdquo;, as do ConTeXt, LaTeX or
+<a href="FAQ-texinfo.html">Texinfo</a>. Instead, it defines macro tools that
+should be useful whatever commands you choose to use when you prepare
+your manuscript.
<p/>For example, Eplain does not have a command <code>\</code><code>section</code>,
which would format section headings in an &ldquo;appropriate&rdquo; way, as
LaTeX&rsquo;s <code>\</code><code>section</code> does. The philosophy of Eplain is that
@@ -18,9 +19,9 @@ results, or if you are trying to match a different format, you are out
of luck.
<p/>On the other hand, almost everyone would like capabilities such as
cross-referencing by labels, so that you don&rsquo;t have to put actual page
-numbers in the manuscript. The authors of Eplain are not aware of
-any generally available macro packages that do not force their
-typographic style on an author, and yet provide such capabilities.
+numbers in the manuscript. The authors of Eplain believe it is the
+only generally available macro package that does not force its
+typographic style on an author, and yet provides these such capabilities.
<p/>Another useful feature of Eplain is the ability to create PDF files
with hyperlinks. The cross-referencing macros can implicitly generate
hyperlinks for the cross-references, but you can also create explicit
@@ -44,7 +45,7 @@ available online, and there&rsquo;s
also a mailing list &mdash; sign up, or browse the list archives, via
<a href="http://tug.org/mailman/listinfo/tex-eplain">http://tug.org/mailman/listinfo/tex-eplain</a>
<dl>
-<dt><tt><i>Eplain distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/eplain.zip">macros/eplain</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/eplain.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/eplain/">browse</a>)
+<dt><tt><i>Eplain distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain.zip">macros/eplain</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/eplain/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=eplain">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=eplain</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eps.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eps.html
index ae5d45c197a..53fc6588cf1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eps.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eps.html
@@ -1,9 +1,9 @@
<head>
<title>UK TeX FAQ -- question label eps</title>
</head><body>
-<h3>What is &ldquo;Encapsulated PostScript&rdquo; (&ldquo;EPS&rdquo;)</h3>
+<h3>What is &ldquo;Encapsulated PostScript&rdquo; (&ldquo;EPS&rdquo;)?</h3>
<p/>PostScript has been for many years a <em>lingua franca</em> of powerful
-printers (modern high-quality printers now tend to require some
+printers (though modern high-quality printers now tend to require some
constrained form of Adobe Acrobat, instead); since PostScript is also a
powerful graphical programming language, it is commonly used as an
output medium for drawing (and other) packages.
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eqnarray.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eqnarray.html
index 8e023a4e0e0..289e2d3bc6a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eqnarray.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-eqnarray.html
@@ -32,7 +32,7 @@ greater things), code as:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>AMSLaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+<dt><tt><i>AMSLaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=eqnarray">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=eqnarray</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-erroradvice.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-erroradvice.html
index 52223c34168..8bef190c72e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-erroradvice.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-erroradvice.html
@@ -65,7 +65,7 @@ appeal to the <a href="FAQ-gethelp.html">wider public</a>
for assistance, but if you do, be sure to
report full backtraces (see <code>errorcontextlines</code> above) and so on.
<dl>
-<dt><tt><i>trace.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>trace.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=erroradvice">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=erroradvice</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-euro.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-euro.html
index 353ecc6f12f..76a752be089 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-euro.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-euro.html
@@ -71,13 +71,13 @@ good things.
<i>china2e</i> (whose primary aim is Chinese dates and suchlike
matters) and the <i>eurosym</i> fonts.
<dl>
-<dt><tt><i>china2e bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/china2e.zip">macros/latex/contrib/china2e</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/china2e.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/china2e/">browse</a>)
-<dt><tt><i>EC fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ec.zip">fonts/ec</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ec.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ec/">browse</a>)
-<dt><tt><i>euro fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/euro.zip">fonts/euro</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/euro.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/euro/">browse</a>)
-<dt><tt><i>euro-ce fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/euro-ce.zip">fonts/euro-ce</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/euro-ce.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/euro-ce/">browse</a>)
-<dt><tt><i>eurofont.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eurofont.zip">macros/latex/contrib/eurofont</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eurofont.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/eurofont/">browse</a>)
-<dt><tt><i>eurosym fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/eurosym.zip">fonts/eurosym</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/eurosym.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/eurosym/">browse</a>)
-<dt><tt><i>marvosym fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/psfonts/marvosym.zip">fonts/psfonts/marvosym</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/psfonts/marvosym.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/psfonts/marvosym/">browse</a>)
+<dt><tt><i>china2e bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/china2e.zip">macros/latex/contrib/china2e</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/china2e/">browse the directory</a>)
+<dt><tt><i>EC fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ec.zip">fonts/ec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ec/">browse the directory</a>)
+<dt><tt><i>euro fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/euro.zip">fonts/euro</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/euro/">browse the directory</a>)
+<dt><tt><i>euro-ce fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/euro-ce.zip">fonts/euro-ce</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/euro-ce/">browse the directory</a>)
+<dt><tt><i>eurofont.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eurofont.zip">macros/latex/contrib/eurofont</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eurofont/">browse the directory</a>)
+<dt><tt><i>eurosym fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eurosym.zip">fonts/eurosym</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eurosym/">browse the directory</a>)
+<dt><tt><i>marvosym fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/psfonts/marvosym.zip">fonts/psfonts/marvosym</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/psfonts/marvosym/">browse the directory</a>)
<dt><tt><i>textcomp.sty</i></tt><dd>Part of the LaTeX distribution.
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=euro">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=euro</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extref.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extref.html
index c38d4bf0af9..21d5af5a421 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extref.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extref.html
@@ -63,9 +63,26 @@ have the .aux file, write:
</pre>
</blockquote><p>
+Heiko Oberdiek&rsquo;s experimental <i>zref</i> bundle includes a
+hyper-crossreferencing mechanism using its <i>zref-xr</i> module.
+Usage is closely modelled on <i>xr</i> and <i>xr-hyper</i>; a
+trivial example (from a <i>comp.text.tex</i> posting) is
+<blockquote>
+<pre>
+\usepackage{zref-xr,zref-user}
+\zexternaldocument*{xr02}
+...
+\zref{foo}
+</pre>
+</blockquote><p>
+The module provides all the facilities of the older packages, and can
+deal both with &ldquo;traditional&rdquo; LaTeX labels and with
+<i>zref</i>&rsquo;s style of labels.
<dl>
-<dt><tt><i>xr.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>xr-hyper.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
+<dt><tt><i>xr.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>xr-hyper.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>zref bundle</i></tt><dd>Distributed as part of
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=extref">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=extref</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extsizes.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extsizes.html
index 20f9d86dafe..8ee78f010fd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extsizes.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-extsizes.html
@@ -19,11 +19,12 @@ may not be optimal &mdash; but they&rsquo;re certainly practical.
<p/>More satisfactory are the <em>KOMA-script</em> classes, which are
designed to work properly with the class option files that come with
<i>extsizes</i>, and the <i>memoir</i> class that has its own
-options for document font sizes 9pt, 14pt and 17pt.
+options for document font sizes 9pt&ndash;12pt, 14pt, 17pt, 20pt, 25pt,
+30pt, 36pt, 48pt and 60pt.
<dl>
-<dt><tt><i>extsizes bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/extsizes.zip">macros/latex/contrib/extsizes</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/extsizes.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/extsizes/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>extsizes bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/extsizes.zip">macros/latex/contrib/extsizes</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/extsizes/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=extsizes">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=extsizes</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fancyhdr.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fancyhdr.html
index a07ae879e1d..886edefe28b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fancyhdr.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fancyhdr.html
@@ -30,9 +30,9 @@ in a separate file; documentation of <i>scrpage2</i> is integrated
with the <i>scrgui*</i> documentation files that are distributed with
the <i>KOMA-script</i> classes.
<dl>
-<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyhdr/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fancyhdr">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fancyhdr</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fig.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fig.html
deleted file mode 100644
index 8573b218546..00000000000
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fig.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<head>
-<title>UK TeX FAQ -- question label fig</title>
-</head><body>
-<h3>Fig, a (La)TeX-friendly drawing package</h3>
-<p/><i>(X)Fig</i> is a menu driven tool that allows you to
-draw objects on the screen of an X workstation; <i>transfig</i>
-is a set of tools which translate the code <i>fig</i>. The list
-of export formats is very long, and includes Metafont and MetaPost,
-Encapsulated PostScript and PDF, as well as combinations that wrap
-a graphics format in a LaTeX import file.
-<p/>There&rsquo;s no explicit port of <i>xfig</i> to windows (although it is
-believed to work under <i>cygwin</i> with their X-windows system).
-However, the program
-<a href="http://tech-www.informatik.uni-hamburg.de/applets/javafig/"><i>jfig</a></i>
-is thought by many to be an acceptable substitute, written in Java.
-<dl>
-<dt><tt><i>xfig</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/xfig.zip">graphics/xfig</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/xfig.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/xfig/">browse</a>)
-<dt><tt><i>transfig</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/transfig.zip">graphics/transfig</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/transfig.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/transfig/">browse</a>)
-</dl>
-<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fig">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fig</a>
-</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figetc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figetc.html
new file mode 100644
index 00000000000..ba201ccb0f1
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figetc.html
@@ -0,0 +1,28 @@
+<head>
+<title>UK TeX FAQ -- question label figetc</title>
+</head><body>
+<h3>(La)TeX-friendly drawing packages</h3>
+<p/><p/><i>(X)Fig</i> is a menu driven tool that allows you to
+draw objects on the screen of an X workstation; <i>transfig</i>
+is a set of tools which translate the code <i>fig</i>. The list
+of export formats is very long, and includes Metafont and MetaPost,
+Encapsulated PostScript and PDF, as well as combinations that wrap
+a graphics format in a LaTeX import file, which may include
+LaTeX commands to place text (compiled by LaTeX itself) as
+labels, etc., in the figures.
+<p/>There&rsquo;s no explicit port of <i>xfig</i> to windows (although it is
+believed to work under <i>cygwin</i> with their X-windows system).
+However, the program
+<a href="http://tech-www.informatik.uni-hamburg.de/applets/javafig/"><i>jfig</a></i>
+is thought by many to be an acceptable substitute, written in Java.
+<p/><i>Asymptote</i> is a widely-praised development of the MetaPost
+language, which can draw 2D or 3D diagrams, and can also label
+diagrams with LaTeX text; copious documentation is available via
+<a href="http://asymptote.sourceforge.net"><i>asymptote</a>&rsquo;s web site</i>.
+<dl>
+<dt><tt><i>asymptote</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/asymptote.zip">graphics/asymptote</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/asymptote/">browse the directory</a>)
+<dt><tt><i>xfig</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivegraphics/xfig/">graphics/xfig/</a>
+<dt><tt><i>transfig</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/transfig.zip">graphics/transfig</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/transfig/">browse the directory</a>)
+</dl>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=figetc">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=figetc</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figurehere.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figurehere.html
index e5b38703e2e..6b2393bbe92 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figurehere.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-figurehere.html
@@ -48,10 +48,25 @@ overtake &ldquo;real floats&rdquo;, so that the numbers of figures will be out
of order: figure 6 could be on page 12, while figure 5 had floated to
page 13. It&rsquo;s best, therefore, either to stay with floating figures
throughout a document, or to use fixed figures throughout.
+<p/>If it&rsquo;s really impossible to follow that counsel of perfection, you
+can use the <i>perpage</i> package&rsquo;s command <code>\</code><code>MakeSorted</code>
+command:
+<blockquote>
+<pre>
+...
+\usepackage{float}
+\usepackage{perpage}
+\MakeSorted{figure}
+\MakeSorted{table}
+...
+</pre>
+</blockquote><p>
+and the sequence of float numbers is all correct.
<dl>
-<dt><tt><i>capt-of.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/capt-of.sty">macros/latex/contrib/misc/capt-of.sty</a>
-<dt><tt><i>caption.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/caption.zip">macros/latex/contrib/caption</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/caption.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/caption/">browse</a>)
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
+<dt><tt><i>capt-of.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/capt-of.sty">macros/latex/contrib/misc/capt-of.sty</a>
+<dt><tt><i>caption.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/caption.zip">macros/latex/contrib/caption</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/caption/">browse the directory</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
+<dt><tt><i>perpage.sty</i></tt><dd>Distributed as part <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=figurehere">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=figurehere</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filename.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filename.html
index 3937df6fbcc..6947b5a95bb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filename.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filename.html
@@ -88,7 +88,7 @@ name (without its &lsquo;<code>.tex</code>&rsquo;), use the commands:
The <i>FiNK</i> bundle includes a <i>fink.el</i> that provides
support under <i>emacs</i> with AUC-TeX.
<dl>
-<dt><tt><i>fink.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fink.zip">macros/latex/contrib/fink</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fink.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fink/">browse</a>)
+<dt><tt><i>fink.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fink.zip">macros/latex/contrib/fink</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fink/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=filename">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=filename</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filesused.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filesused.html
index 9a10f936df3..48a43e2f463 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filesused.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-filesused.html
@@ -35,8 +35,8 @@ document; it comes with configuration files for use with
<i>teTeX</i> and <i>MiKTeX</i>. It&rsquo;s plainly useful when
you&rsquo;re sending the first copy of a document.
<dl>
-<dt><tt><i>bundledoc</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/bundledoc.zip">support/bundledoc</a> (<a href="ftp://cam.ctan.org/tex-archive/support/bundledoc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/bundledoc/">browse</a>)
-<dt><tt><i>snapshot.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/snapshot.zip">macros/latex/contrib/snapshot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/snapshot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/snapshot/">browse</a>)
+<dt><tt><i>bundledoc</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/bundledoc.zip">support/bundledoc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/bundledoc/">browse the directory</a>)
+<dt><tt><i>snapshot.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/snapshot.zip">macros/latex/contrib/snapshot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/snapshot/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=filesused">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=filesused</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfiles.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfiles.html
index 929facbf9f2..7e6bbc10c58 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfiles.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfiles.html
@@ -54,8 +54,8 @@ keep an eye on the changes on the archive. Since these files are
updated only once a day, a nightly automatic download (perhaps using
<i>rsync</i>) makes good sense.
<dl>
-<dt><tt><i>FILES.byname</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/FILES.byname">FILES.byname</a>
-<dt><tt><i>FILES.last07days</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/FILES.last07days">FILES.last07days</a>
+<dt><tt><i>FILES.byname</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveFILES.byname">FILES.byname</a>
+<dt><tt><i>FILES.last07days</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveFILES.last07days">FILES.last07days</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=findfiles">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=findfiles</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfont.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfont.html
index 240ad8b393d..07e87699760 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfont.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-findfont.html
@@ -21,7 +21,7 @@ fonts that are configured for general (both textual and mathematical)
use with (La)TeX. The list of such fonts is sufficiently short that
they <em>can</em> all be discussed in one answer here.
<dl>
-<dt><tt><i>Metafont font list</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/metafont-list">info/metafont-list</a>
+<dt><tt><i>Metafont font list</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/metafont-list">info/metafont-list</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=findfont">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=findfont</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fixwidtab.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fixwidtab.html
index f72016b2eb1..6a781cf4208 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fixwidtab.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fixwidtab.html
@@ -45,9 +45,9 @@ should process using LaTeX. Processing will give you a <i>.sty</i>
file as well as the <i>.dvi</i> or <i>.pdf</i> output containing the
documentation.
<dl>
-<dt><tt><i>ltxtable.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/carlisle/">browse</a>)
-<dt><tt><i>tabularx.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>tabulary.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tabulary.zip">macros/latex/contrib/tabulary</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tabulary.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tabulary/">browse</a>)
+<dt><tt><i>ltxtable.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle/">browse the directory</a>)
+<dt><tt><i>tabularx.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>tabulary.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tabulary.zip">macros/latex/contrib/tabulary</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tabulary/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fixwidtab">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fixwidtab</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-floats.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-floats.html
index 118069a5b39..2883465ec02 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-floats.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-floats.html
@@ -80,12 +80,12 @@ equally well to tables, or to &ldquo;non-standard&rdquo; floats defined by the
the job for you.
</ul>
<dl>
-<dt><tt><i>afterpage.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>endfloat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/endfloat.zip">macros/latex/contrib/endfloat</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/endfloat.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/endfloat/">browse</a>)
+<dt><tt><i>afterpage.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>endfloat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/endfloat.zip">macros/latex/contrib/endfloat</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/endfloat/">browse the directory</a>)
<dt><tt><i>flafter.sty</i></tt><dd>Part of the LaTeX distribution
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
-<dt><tt><i>morefloats.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/morefloats.sty">macros/latex/contrib/misc/morefloats.sty</a>
-<dt><tt><i>placeins.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/placeins.zip">macros/latex/contrib/placeins</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/placeins.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/placeins/">browse</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
+<dt><tt><i>morefloats.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/morefloats.sty">macros/latex/contrib/misc/morefloats.sty</a>
+<dt><tt><i>placeins.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/placeins.zip">macros/latex/contrib/placeins</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/placeins/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=floats">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=floats</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-flushboth.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-flushboth.html
index 9627e742196..1cbd16ad8e0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-flushboth.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-flushboth.html
@@ -29,7 +29,7 @@ package has a <code>\</code><code>justifying</code> command to match its
package also provides a <code>justify</code> environment, which
permits areas of justified text in a larger area which is ragged.
<dl>
-<dt><tt><i>ragged2e.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ms/">browse</a>)
+<dt><tt><i>ragged2e.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms/">browse the directory</a>)
</dl>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fmtconv.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fmtconv.html
index 347f62ff2ff..f75dad32b2d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fmtconv.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fmtconv.html
@@ -25,8 +25,8 @@
converting Microsoft&rsquo;s Rich Text Format to TeX. There is also a
converter to LaTeX by Erwin Wechtl, called <i>rtf2latex</i>.
The latest converter, by Ujwal Sathyam and Scott Prahl, is
- <i>rtf2latex2e</i>; this system seems rather good already, and
- is still being improved.
+ <i>rtf2latex2e</i> which seems rather good, though development
+ of it seems to have stalled.
<p/> Translation <em>to</em> RTF may be done (for a somewhat
constrained set of LaTeX documents) by TeX2RTF, which
can produce ordinary RTF, Windows Help RTF (as well as
@@ -78,19 +78,19 @@ translated to or from this one. <i>FrameMaker</i> provides
&ldquo;import filters&rdquo; to aid translation from alien formats
(presumably including TeX) to <i>FrameMaker</i>&rsquo;s own.
<dl>
-<dt><tt><i>excel2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/excel2latex.zip">support/excel2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/excel2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/excel2latex/">browse</a>)
-<dt><tt><i>pcwritex.arc</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/pcwritex.zip">support/pcwritex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/pcwritex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/pcwritex/">browse</a>)
-<dt><tt><i>refer and tib tools</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/refer-tools.zip">biblio/bibtex/utils/refer-tools</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/refer-tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/refer-tools/">browse</a>)
-<dt><tt><i>rnototex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/rnototex.zip">support/rnototex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/rnototex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/rnototex/">browse</a>)
-<dt><tt><i>rtf2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/rtf2latex.zip">support/rtf2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/rtf2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/rtf2latex/">browse</a>)
-<dt><tt><i>rtf2latex2e</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/rtf2latex2e.zip">support/rtf2latex2e</a> (<a href="ftp://cam.ctan.org/tex-archive/support/rtf2latex2e.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/rtf2latex2e/">browse</a>)
-<dt><tt><i>rtf2tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/rtf2tex.zip">support/rtf2tex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/rtf2tex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/rtf2tex/">browse</a>)
-<dt><tt><i>tex2rtf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/tex2rtf.zip">support/tex2rtf</a> (<a href="ftp://cam.ctan.org/tex-archive/support/tex2rtf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/tex2rtf/">browse</a>)
-<dt><tt><i>tr2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/tr2latex.zip">support/tr2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/tr2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/tr2latex/">browse</a>)
-<dt><tt><i>wd2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/wd2latex.zip">support/wd2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/wd2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/wd2latex/">browse</a>)
-<dt><tt><i>wp2latex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/wp2latex.zip">support/wp2latex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/wp2latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/wp2latex/">browse</a>)
+<dt><tt><i>excel2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/excel2latex.zip">support/excel2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/excel2latex/">browse the directory</a>)
+<dt><tt><i>pcwritex.arc</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pcwritex.zip">support/pcwritex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pcwritex/">browse the directory</a>)
+<dt><tt><i>refer and tib tools</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/refer-tools.zip">biblio/bibtex/utils/refer-tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/refer-tools/">browse the directory</a>)
+<dt><tt><i>rnototex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rnototex.zip">support/rnototex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rnototex/">browse the directory</a>)
+<dt><tt><i>rtf2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2latex.zip">support/rtf2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2latex/">browse the directory</a>)
+<dt><tt><i>rtf2latex2e</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2latex2e.zip">support/rtf2latex2e</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2latex2e/">browse the directory</a>)
+<dt><tt><i>rtf2tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2tex.zip">support/rtf2tex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/rtf2tex/">browse the directory</a>)
+<dt><tt><i>tex2rtf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tex2rtf.zip">support/tex2rtf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tex2rtf/">browse the directory</a>)
+<dt><tt><i>tr2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tr2latex.zip">support/tr2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tr2latex/">browse the directory</a>)
+<dt><tt><i>wd2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/wd2latex.zip">support/wd2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/wd2latex/">browse the directory</a>)
+<dt><tt><i>wp2latex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/wp2latex.zip">support/wp2latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/wp2latex/">browse the directory</a>)
<dt><tt><i>Word processor FAQ (source)</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/help/wp-conv.zip">help/wp-conv</a> (<a href="ftp://cam.ctan.org/tex-archive/help/wp-conv.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/wp-conv/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/wp-conv.zip">help/wp-conv</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/wp-conv/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fmtconv">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fmtconv</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontname.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontname.html
index 0b6f33c0f47..9180524dba7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontname.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontname.html
@@ -1,7 +1,7 @@
<head>
<title>UK TeX FAQ -- question label fontname</title>
</head><body>
-<h3>What is the &ldquo;Berry naming scheme&rdquo;</h3>
+<h3>What is the &ldquo;Berry naming scheme&rdquo;?</h3>
<p/>In the olden days, (La)TeX distributions were limited by the
feebleness of file systems&rsquo; ability to represent long names. (The
MSDOS file system was a particular bugbear: fortunately any current
@@ -27,7 +27,7 @@ outlined in the <i>fontname</i> distribution, which includes
extensive documentation and a set of tables of fonts whose names have
been systematised.
<dl>
-<dt><tt><i>fontname distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/fontname.zip">info/fontname</a> (<a href="ftp://cam.ctan.org/tex-archive/info/fontname.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/fontname/">browse</a>)
+<dt><tt><i>fontname distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/fontname.zip">info/fontname</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/fontname/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontname">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontname</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fonts-pln.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fonts-pln.html
index da8f8a82f2b..f0d23969a8d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fonts-pln.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fonts-pln.html
@@ -27,7 +27,7 @@ The name you use (<code>nonstdfont</code>, above) is the name of the
Text set using nonstdfont italic...
</pre>
</blockquote><p>
-<p/>This is all very elementary stuff, and serves for simple use of fonts.
+This is all very elementary stuff, and serves for simple use of fonts.
However, there are wrinkles, the most important of which is the matter
of <a href="FAQ-whatenc.html">font encodings</a>. Unfortunately, many fonts that
have appeared recently simply don&rsquo;t come in versions using Knuth&rsquo;s
@@ -84,13 +84,21 @@ document is going to use, and the package provides commands to select
fonts as they&rsquo;re needed. The distribution includes a configuration to
use Adobe &lsquo;standard&rsquo; fonts for typesetting text. (Eplain itself
seems not to offer a font selection scheme.)
+<p/>Simply to change font <em>size</em> in a document (i.e., not changing
+the default font itself), may be done using the rather straightforward
+<i>varisize</i>, which offers font sizes ranging from 7 points to
+20 points (nominal sizes, all). Font size commands are generated when
+any of the package files is loaded, so the <i>11pt.tex</i> defines a
+command <code>\</code><code>elevenpoint</code>; each of the files ensures there&rsquo;s a &ldquo;way
+back&rdquo;, by defining a <code>\</code><code>tenpoint</code> command.
<dl>
-<dt><tt><i>ec-plain</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/ec-plain.zip">macros/ec-plain</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/ec-plain.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/ec-plain/">browse</a>)
-<dt><tt><i>fontch</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/fontch.zip">macros/plain/contrib/fontch</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/fontch.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/fontch/">browse</a>)
-<dt><tt><i>font_selection</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/font_selection.zip">macros/plain/contrib/font_selection</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/font_selection.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/font_selection/">browse</a>)
-<dt><tt><i>ofs</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/ofs.zip">macros/generic/ofs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/generic/ofs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/generic/ofs/">browse</a>)
-<dt><tt><i>pdcmac</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/pdcmac.zip">macros/plain/contrib/pdcmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/pdcmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/pdcmac/">browse</a>)
-<dt><tt><i>plnfss</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/plnfss/">macros/plain/contrib/plnfss/</a>
+<dt><tt><i>ec-plain</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/ec-plain.zip">macros/ec-plain</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/ec-plain/">browse the directory</a>)
+<dt><tt><i>fontch</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/fontch.zip">macros/plain/contrib/fontch</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/fontch/">browse the directory</a>)
+<dt><tt><i>font_selection</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/font_selection.zip">macros/plain/contrib/font_selection</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/font_selection/">browse the directory</a>)
+<dt><tt><i>ofs</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/ofs.zip">macros/generic/ofs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/ofs/">browse the directory</a>)
+<dt><tt><i>pdcmac</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/pdcmac.zip">macros/plain/contrib/pdcmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/pdcmac/">browse the directory</a>)
+<dt><tt><i>plnfss</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/plnfss.zip">macros/plain/plnfss</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/plnfss/">browse the directory</a>)
+<dt><tt><i>varisize</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/varisize.zip">macros/plain/contrib/varisize</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/varisize/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fonts-pln">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fonts-pln</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontsize.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontsize.html
index 73a6e47094e..ccddaafadeb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontsize.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontsize.html
@@ -41,11 +41,11 @@ December 2003 edition of LaTeX; if you have an older distribution,
the packages <i>type1cm</i> (for CM fonts) and
<i>type1ec</i> (for EC fonts) are available.
<dl>
-<dt><tt><i>fix-cm.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.zip">macros/latex/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/base/">browse</a>) (an unpacked
- version is available at <a href="ftp://cam.ctan.org/tex-archive/macros/latex/unpacked/fix-cm.sty">macros/latex/unpacked/fix-cm.sty</a>)
-<dt><tt><i>type1cm.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/type1cm.zip">macros/latex/contrib/type1cm</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/type1cm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/type1cm/">browse</a>)
-<dt><tt><i>type1ec.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super/type1ec.sty">fonts/ps-type1/cm-super/type1ec.sty</a> (the package is actually part of
- the <a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>) distribution, but it works happily in
+<dt><tt><i>fix-cm.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base.zip">macros/latex/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base/">browse the directory</a>) (an unpacked
+ version is available at <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/unpacked/fix-cm.sty">macros/latex/unpacked/fix-cm.sty</a>)
+<dt><tt><i>type1cm.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/type1cm.zip">macros/latex/contrib/type1cm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/type1cm/">browse the directory</a>)
+<dt><tt><i>type1ec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/ps-type1/cm-super/type1ec.sty">fonts/ps-type1/cm-super/type1ec.sty</a> (the package is actually part of
+ the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>) distribution, but it works happily in
the absence of the scaled fonts)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontsize">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontsize</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontunavail.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontunavail.html
index b14b1e7e089..a5e197ab006 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontunavail.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-fontunavail.html
@@ -60,8 +60,8 @@ information messages, that tell you what LaTeX has made of your
text. You should check what the messages say, but you will ordinarily
not be surprised at their content.
<dl>
-<dt><tt><i>type1cm.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/type1cm.zip">macros/latex/contrib/type1cm</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/type1cm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/type1cm/">browse</a>)
-<dt><tt><i>type1ec.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super/type1ec.sty">fonts/ps-type1/cm-super/type1ec.sty</a>
+<dt><tt><i>type1cm.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/type1cm.zip">macros/latex/contrib/type1cm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/type1cm/">browse the directory</a>)
+<dt><tt><i>type1ec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/ps-type1/cm-super/type1ec.sty">fonts/ps-type1/cm-super/type1ec.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontunavail">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=fontunavail</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footintab.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footintab.html
index b5cf890a453..c0822d221e9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footintab.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footintab.html
@@ -51,12 +51,12 @@ things you can do to fix the problem.
file itself; that of <i>ctable</i> is distributed as a PDF
file (for convenience&rsquo;s sake).
<dl>
-<dt><tt><i>ctable.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ctable.zip">macros/latex/contrib/ctable</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ctable.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ctable/">browse</a>)
-<dt><tt><i>footnote.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
-<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>mdwtab.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
-<dt><tt><i>threeparttable.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/threeparttable.sty">macros/latex/contrib/misc/threeparttable.sty</a>
-<dt><tt><i>tabularx.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>ctable.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ctable.zip">macros/latex/contrib/ctable</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ctable/">browse the directory</a>)
+<dt><tt><i>footnote.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
+<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>mdwtab.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
+<dt><tt><i>threeparttable.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/threeparttable.sty">macros/latex/contrib/misc/threeparttable.sty</a>
+<dt><tt><i>tabularx.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=footintab">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=footintab</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footnpp.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footnpp.html
index 160a51f0534..ed513725555 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footnpp.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-footnpp.html
@@ -6,12 +6,12 @@
page number is stepped, using the
<a href="FAQ-addtoreset.html">LaTeX internal mechanism</a>. Sadly, the place
in the document where the page number is stepped is unpredictable, not
-(&ldquo;tidily&rdquo;) at the end of the printed page; so the link only ever
-works by luck.
+(&ldquo;tidily&rdquo;) at the end of the printed page; so changing the footnote
+number only ever works by &lsquo;luck&rsquo;.
<p/>As a result, resetting footnotes is inevitably a complicated process,
using labels of some sort. It&rsquo;s nevertheless important, given the
common requirement for footnotes marked by symbols (with painfully
-small symbol sets). There are three packages that manage it, one way
+small symbol sets). There are four packages that manage it, one way
or another.
<p/>The <i>perpage</i> package provides a general mechanism for
resetting counters per page, so can obviously be used for this task.
@@ -19,7 +19,13 @@ The interface is pretty simple: <code>\</code><code>MakePerPage{footnote}</code>
do the job. If you want to restart the counter at something other
than 1 (for example to avoid something in the LaTeX footnote symbol
list), you can use: <code>\</code><code>MakePerPage[2]{footnote}</code>. It&rsquo;s a
-first-rate package, small and efficient
+first-rate package, small and efficient.
+<p/>The <i>zref</i> package provides the same facilities with its
+<code>perpage</code> module, which defines a command <code>\</code><code>zmakeperpage</code>
+whose syntax is identical to that of <i>perpage</i>, above. You can
+load the module by <code>\</code><code>usepackage[perpage]{zref}</code> (or as
+<code>\</code><code>usepackage{zref-perpage}</code>, if your needs so require &mdash;
+look at <i>zref</i>&rsquo;s documentation for details).
<p/>The <i>footmisc</i> package provides a variety of means of
controlling footnote appearance, among them a package option
<code>perpage</code> that adjusts the numbering per page; if you&rsquo;re
@@ -30,9 +36,12 @@ nothing else). With the competition from <i>perpage</i>, it&rsquo;s
probably not particularly useful any more. (Documentation is
<i>footnpag-user.pdf</i> in the distribution.)
<dl>
-<dt><tt><i>footmisc.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footmisc/">browse</a>)
-<dt><tt><i>footnpag.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footnpag.zip">macros/latex/contrib/footnpag</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footnpag.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footnpag/">browse</a>)
-<dt><tt><i>perpage.sty</i></tt><dd>Distributed as part <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bigfoot/">browse</a>)
+<dt><tt><i>footmisc.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc/">browse the directory</a>)
+<dt><tt><i>footnpag.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footnpag.zip">macros/latex/contrib/footnpag</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footnpag/">browse the directory</a>)
+<dt><tt><i>perpage.sty</i></tt><dd>Distributed as part <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot/">browse the directory</a>)
+<dt><tt><i>zref.sty</i></tt><dd>Distributed as a collection member in <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>zref-perpage.sty</i></tt><dd>Distributed as a collection member in
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=footnpp">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=footnpp</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-formbiblabel.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-formbiblabel.html
index aa9b41b0c40..bdfd3545bd0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-formbiblabel.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-formbiblabel.html
@@ -29,7 +29,7 @@ LaTeX commands, in the preamble of your document, will do the job:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>natbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/natbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/natbib/">browse</a>)
+<dt><tt><i>natbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib.zip">macros/latex/contrib/natbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/natbib/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=formbiblabel">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=formbiblabel</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftncapt.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftncapt.html
index f02c5ebd728..878f094aa45 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftncapt.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftncapt.html
@@ -4,12 +4,17 @@
<h3>Footnotes in captions</h3>
<p/>Footnotes in captions are especially tricky: they present problems of
their own, on top of the problems one experiences with
-<a href="FAQ-ftnsect.html">footnotes in section titles</a> and with
-<a href="FAQ-footintab.html">footnotes in tables</a>. Fortunately, the
-requirement for footnotes in captions is extremely rare: if you are
-experiencing problems, it is worth reviewing what you are trying to
-say by placing this footnote. Note that the <i>threeparttable</i>
-scheme (see, again,
+<a href="FAQ-ftnsect.html">footnotes in section titles</a> (footnotes migrating to
+to the list of figures or tables, or
+<a href="FAQ-extrabrace.html">apparently random errors</a> because
+<code>\</code><code>footnote</code> is a fragile command), and with
+<a href="FAQ-footintab.html">footnotes in tables</a> (typically, the footnote
+simply disappears). Fortunately, the requirement for footnotes in
+captions is extremely rare: if you are experiencing problems, it is
+worth reviewing what you are trying to say by placing this footnote:
+other options are to place text at the bottom of the float, or to
+place a footnote at the point where you refer to the float.
+<p/>Note that the <i>threeparttable</i> scheme (see, again,
<a href="FAQ-footintab.html">footnotes in tables</a>) also applies
to notes in captions, and may very well be preferable to whatever you
were thinking of.
@@ -42,12 +47,12 @@ command in a <code>minipage</code> environment within a float (as
in the example above) can produce <em>two</em> copies of the footnote
body &ldquo;blah&rdquo;. (In fact, the effect only occurs with captions that are
long enough to require two lines to be typeset, and so wouldn&rsquo;t appear
-with such a short caption.)
+with such a short caption as that in the example above.)
<p/>The documentation of the <i>ccaption</i> package describes a really
-rather awful work-around.
+rather awful work-around for this problem.
<dl>
-<dt><tt><i>ccaption.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ccaption/">browse</a>)
-<dt><tt><i>threeparttable.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/threeparttable.sty">macros/latex/contrib/misc/threeparttable.sty</a>
+<dt><tt><i>ccaption.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption/">browse the directory</a>)
+<dt><tt><i>threeparttable.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/threeparttable.sty">macros/latex/contrib/misc/threeparttable.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ftncapt">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ftncapt</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftnsect.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftnsect.html
index 5461d389a4b..4b11f9fe6ed 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftnsect.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ftnsect.html
@@ -31,7 +31,7 @@ of contents, so the footnote may only appear in the section heading itself.
</pre>
</ul>
<dl>
-<dt><tt><i>footmisc.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footmisc/">browse</a>)
+<dt><tt><i>footmisc.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ftnsect">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ftnsect</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-getbitmap.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-getbitmap.html
index dac8d715163..129669ce9c1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-getbitmap.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-getbitmap.html
@@ -45,12 +45,12 @@ if even then.
<a href="FAQ-uselmfonts.html">Latin Modern fonts</a> are both close relatives of
Computer Modern with wider ranges of glyphs to offer.
<dl>
-<dt><tt><i>BaKoMa fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma.zip">fonts/cm/ps-type1/bakoma</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/ps-type1/bakoma/">browse</a>)
-<dt><tt><i>Bluesky fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
-<dt><tt><i>CM fonts (write-black printers)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/pk/pk300.zip">fonts/cm/pk/pk300.zip</a>
-<dt><tt><i>CM fonts (write-white printers)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/pk/pk300w.zip">fonts/cm/pk/pk300w.zip</a>
-<dt><tt><i>EC fonts (Type 1 format)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>)
-<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/lm.zip">fonts/lm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/lm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/lm/">browse</a>)
+<dt><tt><i>BaKoMa fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/ps-type1/bakoma.zip">fonts/cm/ps-type1/bakoma</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/ps-type1/bakoma/">browse the directory</a>)
+<dt><tt><i>Bluesky fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
+<dt><tt><i>CM fonts (write-black printers)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/cm/pk/pk300.zip">fonts/cm/pk/pk300.zip</a>
+<dt><tt><i>CM fonts (write-white printers)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/cm/pk/pk300w.zip">fonts/cm/pk/pk300w.zip</a>
+<dt><tt><i>EC fonts (Type 1 format)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>)
+<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm.zip">fonts/lm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=getbitmap">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=getbitmap</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-gethelp.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-gethelp.html
index eaa0377987e..112b14ca90a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-gethelp.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-gethelp.html
@@ -9,8 +9,8 @@ don&rsquo;t know what to do.
<p/>If you are seeking a particular package or program, look on your own
system first: you might already have it &mdash; the better TeX
distributions contain a wide range of supporting material. The
-CTAN Catalogue can also help: you can
-<a href="http://www.tex.ac.uk/search">search it</a>, or you can browse it
+CTAN Catalogue can also identify packages that might help: you
+can <a href="http://www.tex.ac.uk/search">search it</a>, or you can browse it
&ldquo;<a href="http://www.tex.ac.uk/tex-archive/help/Catalogue/bytopic.html">by topic</a>&rdquo;.
A catalogue entry has a brief description of the package, and links to
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-graphicspath.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-graphicspath.html
index b0f03e19b76..b6ab0dad344 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-graphicspath.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-graphicspath.html
@@ -56,8 +56,8 @@ in the question &ldquo;
<a href="FAQ-docotherdir.html">bits of document in other directories</a>
&rdquo;.
<dl>
-<dt><tt><i>graphics bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>)
-<dt><tt><i>import.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/import.sty">macros/latex/contrib/misc/import.sty</a>
+<dt><tt><i>graphics bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
+<dt><tt><i>import.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/import.sty">macros/latex/contrib/misc/import.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=graphicspath">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=graphicspath</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-grffilenames.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-grffilenames.html
new file mode 100644
index 00000000000..b7f2c80ced2
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-grffilenames.html
@@ -0,0 +1,50 @@
+<head>
+<title>UK TeX FAQ -- question label grffilenames</title>
+</head><body>
+<h3>&ldquo;Modern&rdquo; graphics file names</h3>
+<p/>TeX was designed in a world where file names were very simple
+indeed, typically strictly limited both in character set and length.
+In modern systems, such restrictions have largely disappeared, which
+leaves TeX rather at odds with its environment. Particular
+problems arise with spaces in file names, but things like multiple
+period characters can seriously confuse the <i>graphics</i>
+package.
+<p/>The specification of TeX leaves some leeway for distributions to
+adopt file access appropriate to their operating system, but this
+hasn&rsquo;t got us very far. Many modern distributions allow you to
+specify a file name as <code>"file name.tex"</code> (for example), which
+helps somewhat, but while this allows us to say
+<blockquote>
+<pre>
+\input "foo bar.tex"
+</pre>
+</blockquote><p>
+the analogous usage
+<blockquote>
+<pre>
+\includegraphics{"gappy graphics.eps"}
+</pre>
+</blockquote><p>
+using &ldquo;ordinary&rdquo; LaTeX causes confusion in <i>xdvi</i> and
+<i>dvips</i>, even though it works at compilation time. Sadly,
+even within such quotes, multiple dots give <code>\</code><code>includegraphics</code>
+difficulties. Note that
+<blockquote>
+<pre>
+\includegraphics{"gappy graphics.pdf"}
+</pre>
+</blockquote><p>
+works in a similar version of PDFTeX.
+<p/>If you&rsquo;re using the <i>graphics</i> package, the <i>grffile</i>
+package will help. The package offers several options, the simplest
+of which are <code>multidot</code> (allowing more than one dot in a
+file name) and <code>space</code> (allowing space in a file name). The
+<code>space</code> option requires that you&rsquo;re running on a
+sufficiently recent version of PDFTeX, in PDF mode &mdash; and
+even then it won&rsquo;t work for MetaPost files, which are read as TeX
+input, and therefore use the standard input mechanism).
+<dl>
+<dt><tt><i>grffile.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+</dl>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=grffilenames">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=grffilenames</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-howmanypp.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-howmanypp.html
index 1ebcaea92f0..010e0711c2e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-howmanypp.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-howmanypp.html
@@ -26,10 +26,10 @@ to the equivalent of the <code>LastPage</code> label and the
the <i>everyshi</i> package.
<dl>
<dt><tt><i>count1to.sty and everyshi.sty</i></tt><dd>
- Distributed in <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ms/">browse</a>)
-<dt><tt><i>lastpage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lastpage.zip">macros/latex/contrib/lastpage</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lastpage.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/lastpage/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>totpages.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/totpages.zip">macros/latex/contrib/totpages</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/totpages.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/totpages/">browse</a>)
+ Distributed in <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms/">browse the directory</a>)
+<dt><tt><i>lastpage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lastpage.zip">macros/latex/contrib/lastpage</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lastpage/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>totpages.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/totpages.zip">macros/latex/contrib/totpages</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/totpages/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=howmanypp">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=howmanypp</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-htmlbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-htmlbib.html
index 1ea5aaf2e27..a6e059153f5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-htmlbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-htmlbib.html
@@ -18,9 +18,9 @@ styles, and post-process the output so produced using a
a sample of the script&rsquo;s output may be viewed on the web, at
<a href="http://rikblok.cjb.net/lib/refs.html">http://rikblok.cjb.net/lib/refs.html</a>
<dl>
-<dt><tt><i>bbl2html.awk</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/misc/bbl2html.awk">biblio/bibtex/utils/misc/bbl2html.awk</a>
-<dt><tt><i>bib2xhtml</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/bib2xhtml.zip">biblio/bibtex/utils/bib2xhtml</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/bib2xhtml.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/utils/bib2xhtml/">browse</a>)
-<dt><tt><i>noTeX.bst</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/misc/noTeX.bst">biblio/bibtex/utils/misc/noTeX.bst</a>
+<dt><tt><i>bbl2html.awk</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/misc/bbl2html.awk">biblio/bibtex/utils/misc/bbl2html.awk</a>
+<dt><tt><i>bib2xhtml</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/bib2xhtml.zip">biblio/bibtex/utils/bib2xhtml</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/utils/bib2xhtml/">browse the directory</a>)
+<dt><tt><i>noTeX.bst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/misc/noTeX.bst">biblio/bibtex/utils/misc/noTeX.bst</a>
</dl>
<p/>
<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=htmlbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=htmlbib</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphen.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphen.html
index a7bf8f25ab3..56cff3ca9dc 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphen.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphen.html
@@ -12,8 +12,10 @@ different. As a result, a typesetting system that is not restricted
to a single language at a single locale needs to be able to change its
hyphenation rules from time to time.
<p/>TeX uses a pretty good system for hyphenation (originally designed
-by Frank Liang), and while it&rsquo;s capable of missing &ldquo;sensible&rdquo;
-hyphenation points, it seldom selects grossly wrong ones. The
+by Frank Liang &mdash; you may view his
+<a href="http://tug.org/docs/liang/">Ph.D. thesis online</a>), and while
+it&rsquo;s capable of missing &ldquo;sensible&rdquo; hyphenation points, it seldom
+selects grossly wrong ones. The
algorithm matches candidates for hyphenation against a set of
&ldquo;hyphenation patterns&rdquo;. The candidates for hyphenation must be
sequences of letters (or other single characters that TeX may be
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphoff.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphoff.html
index a2da4df0c21..1a3a813f310 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphoff.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-hyphoff.html
@@ -72,7 +72,7 @@ appeal to the specifiers of eccentric document layouts (such as those
for dissertations), but for once their sense conforms with typographic
style. (Or at least, style constrained in this curious way.)
<dl>
-<dt><tt><i>hyphenat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyphenat.zip">macros/latex/contrib/hyphenat</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyphenat.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyphenat/">browse</a>)
+<dt><tt><i>hyphenat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyphenat.zip">macros/latex/contrib/hyphenat</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyphenat/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=hyphoff">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=hyphoff</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-i18nbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-i18nbib.html
index 7376c7dfe99..55b31c2e079 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-i18nbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-i18nbib.html
@@ -40,14 +40,14 @@ language, you are asked whether you want the style to interact with
worlds &mdash; formatting freedom from <i>custom-bib</i> and linguistic
freedom via the extensibility of <i>babelbib</i>
<dl>
-<dt><tt><i>babelbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/babelbib.zip">biblio/bibtex/contrib/babelbib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/babelbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/babelbib/">browse</a>)
-<dt><tt><i>bib-fr bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/bib-fr.zip">biblio/bibtex/contrib/bib-fr</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/bib-fr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/bib-fr/">browse</a>)
-<dt><tt><i>bibgerm bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/germbib.zip">biblio/bibtex/contrib/germbib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/germbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/germbib/">browse</a>)
-<dt><tt><i>custom-bib bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/custom-bib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/custom-bib/">browse</a>)
-<dt><tt><i>finplain.bst</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/misc/finplain.bst">biblio/bibtex/contrib/misc/finplain.bst</a>
-<dt><tt><i>norbib bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/norbib.zip">biblio/bibtex/contrib/norbib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/norbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/norbib/">browse</a>)
-<dt><tt><i>spain</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/spain.zip">biblio/bibtex/contrib/spain</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/spain.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/spain/">browse</a>)
-<dt><tt><i>swebib bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/swebib.zip">biblio/bibtex/contrib/swebib</a> (<a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/contrib/swebib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/swebib/">browse</a>)
+<dt><tt><i>babelbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/babelbib.zip">biblio/bibtex/contrib/babelbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/babelbib/">browse the directory</a>)
+<dt><tt><i>bib-fr bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/bib-fr.zip">biblio/bibtex/contrib/bib-fr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/bib-fr/">browse the directory</a>)
+<dt><tt><i>bibgerm bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/germbib.zip">biblio/bibtex/contrib/germbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/germbib/">browse the directory</a>)
+<dt><tt><i>custom-bib bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib.zip">macros/latex/contrib/custom-bib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/custom-bib/">browse the directory</a>)
+<dt><tt><i>finplain.bst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/contrib/misc/finplain.bst">biblio/bibtex/contrib/misc/finplain.bst</a>
+<dt><tt><i>norbib bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/norbib.zip">biblio/bibtex/contrib/norbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/norbib/">browse the directory</a>)
+<dt><tt><i>spain</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/spain.zip">biblio/bibtex/contrib/spain</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/spain/">browse the directory</a>)
+<dt><tt><i>swebib bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/swebib.zip">biblio/bibtex/contrib/swebib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/biblio/bibtex/contrib/swebib/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=i18nbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=i18nbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ifpdf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ifpdf.html
index 7f26397e5c5..8c175c4600a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ifpdf.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ifpdf.html
@@ -13,9 +13,9 @@ was present in the very first releases of PDFTeX) is
<blockquote>
<pre>
\ifx\pdfoutput\undefined
- &lt;not running PDFTeX&gt;
+ ... % not running PDFTeX
\else
- &lt;running PDFTeX&gt;
+ ... % running PDFTeX
\fi
</pre>
</blockquote><p>
@@ -37,12 +37,12 @@ test may need to be elaborated:
<blockquote>
<pre>
\ifx\pdfoutput\undefined
- &lt;not running PDFTeX&gt;
+ ... % not running PDFTeX
\else
\ifx\pdfoutput\relax
- &lt;not running PDFTeX&gt;
+ ... % not running PDFTeX
\else
- &lt;running PDFTeX&gt;
+ ... % running PDFTeX
\fi
\fi
</pre>
@@ -55,16 +55,16 @@ output, you also need to know about the value of <code>\</code><code>pdfoutput</
<blockquote>
<pre>
\ifx\pdfoutput\undefined
- &lt;not running PDFTeX&gt;
+ ... % not running PDFTeX
\else
\ifx\pdfoutput\relax
- &lt;not running PDFTeX&gt;
+ ... % not running PDFTeX
\else
- &lt;running PDFTeX, with...&gt;
+ % running PDFTeX, with...
\ifnum\pdfoutput&gt;0
- &lt;...PDF output&gt;
+ ... % PDF output
\else
- &lt;...DVI output&gt;
+ ... % DVI output
\fi
\fi
\fi
@@ -73,8 +73,16 @@ output, you also need to know about the value of <code>\</code><code>pdfoutput</
The above is, in essence, what Heiko Oberdiek&rsquo;s <i>ifpdf</i>
package does; the reasoning is the FAQ&rsquo;s interpretation of
Heiko&rsquo;s explanation.
+<p/>As an aside: there are now analogous packages <i>ifxetex</i> and
+<i>ifluatex</i>, for the two up-and-coming TeX-like engines (see
+the &ldquo;TeX project&rdquo; answers covering
+<a href="FAQ-xetex.html">XeTeX</a>, and
+<a href="FAQ-luatex.html">LuaTeX</a>).
<dl>
-<dt><tt><i>ifpdf.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
+<dt><tt><i>ifpdf.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>ifluatex.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>ifxetex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/ifxetex.zip">macros/generic/ifxetex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/ifxetex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ifpdf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ifpdf</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-impgraph.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-impgraph.html
index 2f7959add31..4d8e300ccba 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-impgraph.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-impgraph.html
@@ -29,10 +29,12 @@ tied to a particular DVI driver (<i>dvips</i>, in
the above two cases), but their code could be configured for others.
<p/>The obvious next step was to make the code configurable dynamically.
The LaTeX standard <i>graphics</i> package and its derivatives
-made this step: it is strongly preferred for all current work. It can
-also be used (with the help of the <i>miniltx</i> &ldquo;LaTeX
-emulator&rdquo; and the <i>graphicx.tex</i> front-end) in documents
-written in Plain TeX.
+made this step: it is strongly preferred for all current work.
+<p/>Users of Plain TeX have two options allowing them to use
+<i>graphicx</i>: the <i>miniltx</i> &ldquo;LaTeX emulator&rdquo; and
+the <i>graphicx.tex</i> front-end allow you to load
+<i>graphicx</i>, and <a href="FAQ-eplain.html">\Eplain</a> allows you to load
+it (using the full LaTeX syntax) direct.
<p/>The <i>graphics</i> package takes a variety of &ldquo;driver
options&rdquo; &mdash; package options that select code to generate the
commands appropriate to the DVI driver in use. In most cases,
@@ -83,14 +85,14 @@ but may also be
<a href="http://silas.psfc.mit.edu/elec_fig/">browsed on the Web</a>.
<dl>
-<dt><tt><i>epsf.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/epsf/epsf.tex">macros/generic/epsf/epsf.tex</a>
-<dt><tt><i>epsfig.sty</i></tt><dd>Part of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>) bundle
-<dt><tt><i>epslatex.pdf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/epslatex/english/epslatex.pdf">info/epslatex/english/epslatex.pdf</a>; the document is also available
- in PostScript format as <a href="ftp://cam.ctan.org/tex-archive/info/epslatex/english/epslatex.ps">info/epslatex/english/epslatex.ps</a>
-<dt><tt><i>graphics.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>)
-<dt><tt><i>graphicx.sty</i></tt><dd>Part of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>) bundle
-<dt><tt><i>miniltx.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/graphics/">browse</a>)
-<dt><tt><i>psfig.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/graphics/psfig.zip">nonfree/graphics/psfig</a> (<a href="ftp://cam.ctan.org/tex-archive/nonfree/graphics/psfig.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/nonfree/graphics/psfig/">browse</a>)
+<dt><tt><i>epsf.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/generic/epsf/epsf.tex">macros/generic/epsf/epsf.tex</a>
+<dt><tt><i>epsfig.sty</i></tt><dd>Part of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>) bundle
+<dt><tt><i>epslatex.pdf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/epslatex/english/epslatex.pdf">info/epslatex/english/epslatex.pdf</a>; the document is also available
+ in PostScript format as <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/epslatex/english/epslatex.ps">info/epslatex/english/epslatex.ps</a>
+<dt><tt><i>graphics.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
+<dt><tt><i>graphicx.sty</i></tt><dd>Part of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>) bundle
+<dt><tt><i>miniltx.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics/">browse the directory</a>)
+<dt><tt><i>psfig.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/psfig.zip">graphics/psfig</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/psfig/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=impgraph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=impgraph</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inclplain.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inclplain.html
index 2cccad6434f..21ccf5980ae 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inclplain.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inclplain.html
@@ -25,7 +25,7 @@ AMSTeX; no doubt it would also fail if asked to load Eplain.
All these things can be overcome (although it&rsquo;s not often easy), but
the environment saves a lot of work on many occasions.
<dl>
-<dt><tt><i>plain.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/carlisle/">browse</a>)
+<dt><tt><i>plain.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inclplain">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inclplain</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst-tds-zip.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst-tds-zip.html
index b5317c52051..986973f8542 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst-tds-zip.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst-tds-zip.html
@@ -1,7 +1,7 @@
<head>
<title>UK TeX FAQ -- question label inst-tds-zip</title>
</head><body>
-<h3>Installing using preformatted ZIP files</h3>
+<h3>Installing using ready-built ZIP files</h3>
<p/>Installing packages, as they (&ldquo;traditionally&rdquo;) appear on
CTAN, involves:
<ul>
@@ -12,14 +12,14 @@ CTAN, involves:
</ul>
Most people, for most packages, find the first two steps onerous, the
last being easy (unless it is forgotten!).
-<p/>Preformatted ZIP files (also known as
-<a href="FAQ-tds-zip.html">TDS ZIP files</a>) are designed to lighten
+<p/>Ready-built ZIP files &mdash; also known as
+<a href="FAQ-tds-zip.html">TDS-ZIP files</a> &mdash; are designed to lighten
the load of performing the first two steps of installation: they
contain all the files that are that&rsquo;s to be installed for a given
package, in their &ldquo;correct&rdquo; locations in a
<a href="FAQ-tds.html">TDS tree</a>.
<p/>To install such a file on a Unix system (we assume that you&rsquo;ll install
-into the local TEXMF tree):
+into the local TEXMF tree, at <code>$TEXMFLOCAL</code>):
<blockquote>
<pre>
cd $TEXMFLOCAL
@@ -37,10 +37,5 @@ remaining chore is to update the file indexes &mdash; as in
the package provides a font, you also need to enable the font&rsquo;s map,
which is discussed in
&ldquo;<a href="FAQ-instt1font.html">Installing a Type 1 font</a>&rdquo;
-<p/>At the time of writing, there are rather few <code>.tds.zip</code>
-files (by comparison with the huge number of packages that are
-available). As packages are updated, the number of files is
-steadily increasing, but it will be a long time before the whole set
-is covered.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-tds-zip">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-tds-zip</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst1cm.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst1cm.html
index 468e2e503e7..164577980c1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst1cm.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-inst1cm.html
@@ -64,9 +64,9 @@ loaded by the command
<p/>Remember, after all such changes, the
<a href="FAQ-inst-wlcf.html">file-name database must be refreshed</a>.
<dl>
-<dt><tt><i>AMS fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
-<dt><tt><i>CM fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
-<dt><tt><i>CM font maps</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/ps-type1/bluesky-contrib/dvips.zip">fonts/cm/ps-type1/bluesky-contrib/dvips</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/cm/ps-type1/bluesky-contrib/dvips.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/ps-type1/bluesky-contrib/dvips/">browse</a>)
+<dt><tt><i>AMS fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
+<dt><tt><i>CM fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
+<dt><tt><i>CM font maps</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/ps-type1/bluesky-contrib/dvips.zip">fonts/cm/ps-type1/bluesky-contrib/dvips</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/ps-type1/bluesky-contrib/dvips/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst1cm">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst1cm</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-install-find.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-install-find.html
index cf04c651947..b264f5bf18c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-install-find.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-install-find.html
@@ -6,8 +6,9 @@
<p/>If the information came from these FAQs, you should already
have a link to the file (there are lists at the end of each answer):
- click on that link,
-and you can get the file, one way or another.
+ click on one of the links associated with the package, and you can
+ get the package (which may be one file or several).
+
<p/>If you heard about the file somewhere else, it&rsquo;s possible that the
source told you where to look; if not, try the CTAN searching
facilities, such as <a href="http://www.tex.ac.uk/search/">http://www.tex.ac.uk/search/</a>. That (rather
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instprinterfont.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instprinterfont.html
index 34d170f7891..a2e204a0b99 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instprinterfont.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instprinterfont.html
@@ -36,7 +36,7 @@ TDS, so in principle, installation consists simply of
<dl>
<dt><tt><i>mathpazo.sty</i></tt><dd>Part of the <i>psnfss</i> bundle
<dt><tt><i>mathptmx.sty</i></tt><dd>Part of the <i>psnfss</i> bundle
-<dt><tt><i>psnfss bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/psnfss/">browse</a>)
+<dt><tt><i>psnfss bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instprinterfont">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instprinterfont</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instt1font.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instt1font.html
index 06e84384215..b114ce432fb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instt1font.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-instt1font.html
@@ -67,8 +67,8 @@ Both processes (preparing and installing a font) are very well (and
thoroughly) described in Philipp Lehman&rsquo;s guide to font installation,
which may be found on CTAN.
<dl>
-<dt><tt><i>fontinst.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/fontinst/">browse</a>)
-<dt><tt><i>Type 1 installation guide</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide/fontinstallationguide.pdf">info/Type1fonts/fontinstallationguide/fontinstallationguide.pdf</a>
+<dt><tt><i>fontinst.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst/">browse the directory</a>)
+<dt><tt><i>Type 1 installation guide</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/Type1fonts/fontinstallationguide/fontinstallationguide.pdf">info/Type1fonts/fontinstallationguide/fontinstallationguide.pdf</a>
</dl>
<p/>
<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instt1font">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instt1font</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-interruptlist.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-interruptlist.html
index 419d3f8d472..27d26d315f1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-interruptlist.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-interruptlist.html
@@ -132,10 +132,10 @@ However, the &lsquo;nested comment&rsquo; interpolated in the nested enumeration
appears as if it were a second paragraph to &ldquo;outer item 2&rdquo;, which is
hardly satisfactory.
<dl>
-<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>enumitem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/enumitem/">browse</a>)
-<dt><tt><i>expdlist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/expdlist/">browse</a>)
-<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
+<dt><tt><i>enumerate.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>enumitem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem/">browse the directory</a>)
+<dt><tt><i>expdlist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist/">browse the directory</a>)
+<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=interruptlist">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=interruptlist</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-isitanum.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-isitanum.html
index b45422f401c..4cd7934b701 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-isitanum.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-isitanum.html
@@ -132,7 +132,7 @@ thus using TeX&rsquo;s own integer-parsing code to do the check. It&rsquo;s a
pity that such a mechanism was never defined (it could be that it&rsquo;s
impossible to program within TeX!).
<dl>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=isitanum">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=isitanum</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-journalpaper.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-journalpaper.html
index b3da3be3629..7d2786c5114 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-journalpaper.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-journalpaper.html
@@ -8,8 +8,8 @@ submissions in (La)TeX, they don&rsquo;t often submit recommended macros to
public archives.
<p/>Nevertheless, there are considerable numbers of macros of one sort or
another available on CTAN; searching for your journal name in
-the CTAN catalogue (see
-<a href="FAQ-findfiles.html">searching CTAN</a>)
+the CTAN catalogue &mdash; see
+<a href="FAQ-findfiles.html">searching CTAN</a>) &mdash;
may well turn up what you&rsquo;re seeking.
<p/>Failing that, you may be well advised to contact the prospective
publisher of your paper; many publishers have macros on their own web
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-keyval.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-keyval.html
new file mode 100644
index 00000000000..6ca8497270c
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-keyval.html
@@ -0,0 +1,157 @@
+<head>
+<title>UK TeX FAQ -- question label keyval</title>
+</head><body>
+<h3>Key-value input for macros and package options</h3>
+<p/>When we discussed
+<a href="FAQ-moren9.html">extending the number of arguments to a macro</a>, we
+suggested that large numbers of arguments, distinguished only by their
+position, aren&rsquo;t very kind to the user, and that a package such as
+<i>keyval</i> offers a more attractive user interface. We now
+consider the packages that the macro programmer might use, to create
+such a user interface.
+<p/>The simplest key-value processor remains <i>keyval</i>; it has a
+command <code>\</code><code>define@key</code> to declare a key and a <em>handler</em> to
+process it, and a macro <code>\</code><code>setkeys</code> to offer values to the handler
+of one or more keys. Thus:
+<blockquote>
+<pre>
+\define@key{my}{foo}{Foo is #1\par}
+\define@key{my}{bar}[99]{Bar is #1\par}
+...
+\setkeys{my}{foo=3,bar}
+</pre>
+</blockquote><p>
+will produce output saying:
+<blockquote>
+ Foo is 3<br/>
+ Bar is 99
+</blockquote><p>
+This has defined two keys &lsquo;<code>foo</code>&rsquo; and &lsquo;<code>bar</code>&rsquo; in family
+&lsquo;<code>my</code>&rsquo;, and then executed them, the first with argument
+&lsquo;<code>3</code>&rsquo; and the second with no argument, so that the default
+value of &lsquo;<code>99</code>&rsquo; is picked up. In effect, the two calls to
+<code>\</code><code>define@key</code> are simply defining commands, as (for example):
+<blockquote>
+<pre>
+\newcommand{\KV@my@foo}[1]{Foo is #1}
+</pre>
+</blockquote><p>
+(the definition of <code>\</code><code>KV@my@bar</code> is similar, but trickier). The
+command <code>\</code><code>setkeys</code> knows how to find those commands when it needs to
+process each key &mdash; it is easy to regurgitate the structure of the
+command name, with family name (&lsquo;<code>my</code>&rsquo;, here) after the first
+&lsquo;<code>@</code>&rsquo;, and the key name after the second &lsquo;<code>@</code>&rsquo;. (The
+&lsquo;<code>KV</code>&rsquo; part is fixed, in <i>keyval</i>.)
+<p/>These simple commands are enough, in fact, to process the botanical
+example offered as replacement for multi-argument commands in
+<a href="FAQ-moren9.html">the question mentioned above</a>, or the
+optional arguments of the <code>\</code><code>includegraphics</code> command of the
+<i>graphicx</i> package. (The last is, in fact, what
+<i>keyval</i> was designed to do.)
+<p/>However, we need more if we&rsquo;re to to have package options in
+&lsquo;key-value&rsquo; form. Packages like <i>hyperref</i> have enormously
+complicated package options which need key-value processing at
+<code>\</code><code>ProcessOptions</code> time: <i>keyval</i> can&rsquo;t do that on its own.
+<p/>Heiko Oberdiek&rsquo;s <i>kvoptions</i> package comes to our help: it
+enables the programmer to declare class or package options that
+operate as key and value pairs. The package defines commands
+<code>\</code><code>DeclareBoolOption</code> for options whose value should be either
+<em>true</em> or <em>false</em>, and <code>\</code><code>DeclareStringOption</code> for all
+other options that have a value. Keys are declared using
+<i>keyval</i> and may remain available for use within the document,
+or may be &lsquo;cancelled&rsquo; to avoid confusion. If you have loaded
+<i>kvoptions</i>, the LaTeX kernel&rsquo;s <code>\</code><code>DeclareOption</code> becomes
+<code>\</code><code>DeclareVoidOption</code> (it&rsquo;s an option with no value), and
+<code>\</code><code>DeclareOption*</code> becomes <code>\</code><code>DeclareDefaultOption</code>.
+<p/>Heiko also provides <i>kvsetkeys</i> which is a more robust version
+of <i>setkeys</i>, with some of the rough edges made smoother.
+<p/>Hendri Adriaens&rsquo; <i>xkeyval</i> offers more flexibility than
+the original <i>keyval</i> and is more robust than the original,
+too. Like <i>kvoptions</i>, the package also has mechanisms to
+allow class and package options in key-value form (macros
+<code>\</code><code>DeclareOptionX</code>, <code>\</code><code>ExecuteOptionsX</code> and <code>\</code><code>ProcessOptionsX</code>.
+<i>Pstricks</i> bundle packages use a <i>xkeyval</i> derivative
+called <i>pst-xkey</i> for their own key-value manipulation.
+
+<p/>The (widely-respected) <i>pgf</i> graphics package has its own
+key-value package called <i>pgfkeys</i>. The documentation of the
+package (part of the huge <i>pgf</i> manual, in part 5,
+&ldquo;utilities&rdquo;) contains a useful comparison with other key-value
+systems; some notable differences are:
+<ul>
+<li> key organisation: <i>pgfkeys</i> uses a tree structure, while
+ <i>keyval</i> and <i>xkeyval</i> both associate keys with a family;
+<li> <i>pgfkeys</i> supports multi-argument key code; and
+<li> <i>pgfkeys</i> can support call-backs when an unknown key
+ appears (these things are called <em>handlers</em>.
+</ul>
+Keys are organized in a tree that is reminiscent of the Unix fille
+tree. A typical key might be, <i>/tikz/coordinate system/x</i> or
+just <i>/x</i>. When you specify keys you can provide the complete
+path of the key, but you usually just provide the name of the key
+(corresponding to the file name without any path) and the path is
+added automatically. So a <code>\</code><code>pgfkeys</code> command might be:
+<blockquote>
+<pre>
+\pgfkeys{/my key=hello,/your keys/main key=something\strange,
+ key name without path=something else}
+</pre>
+</blockquote><p>
+
+and for each key mentioned, the associated code will be executed.
+... and that code is also set up using <code>\</code><code>pgfkeys</code>:
+<blockquote>
+<pre>
+\pgfkeys{/my key/.code=The value is '#1'.}
+</pre>
+</blockquote><p>
+after which
+<blockquote>
+<pre>
+\pgfkeys{/my key=hi!}
+</pre>
+</blockquote><p>
+will produce just
+<blockquote>
+ The value is &rsquo;hi!&rsquo;.
+</blockquote><p>
+The manual goes on, showing how to define a key with two arguments,
+how to provide default value for a key, and how to define aliases for
+particular key sequences (which are called &ldquo;styles&rdquo;). All in all,
+it seems a well thought-out system, offering a lot of flexibility that
+isn&rsquo;t available with the other keys packages. However, there seems to
+be no mechanism for using <i>pgfkeys</i> keys as part of the
+options of another package, in the way that <i>kvoptions</i> does.
+<p/>Another key-value system that&rsquo;s part of larger set of macros is
+<i>scrbase</i>, which uses the facilities of <i>keyval</i> to
+build a larger set of facilities, originally for use within the
+<i>KOMA-script</i> bundle. For English-speaking authors, there are
+difficulties from the German-only documentation; however, from a
+partial translation available to the author of this answer, a summary
+is possible. The package may build on the facilities either of
+<i>kyeval</i> or of <i>xkeyval</i>, and builds its functionality
+on the structure of the &lsquo;key family&rsquo;. The user may define family
+&lsquo;members&rsquo; and keys are defined relative to the members. (For example,
+the package <i>scrbase</i> is part of the <i>KOMA-script</i>
+bundle; so its keys are all members of the <i>scrbase.sty</i>
+family within the <i>KOMA</i> family. The function
+<code>\</code><code>FamilyProcessOptions</code> allows the programmer to decode the options
+of the package in terms of the package&rsquo;s key family. Note that there
+is no special provision made for &ldquo;traditional&rdquo; package options, as
+in the <i>kvoptions</i> package.
+<p/>This brief summary was guided by input from two sources: a draft article
+for <i>TUGboat</i> by Joseph Wright, and the partial translation of the
+documentation of package <i>scrbase</i> prepared by Philipp
+Stephani. At Joseph&rsquo;s suggestion, discussion of his <i>keys3</i>
+package, which is designed for use with the experimental LaTeX3,
+has been omitted.
+<dl>
+<dt><tt><i>keyval.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
+<dt><tt><i>kvoptions.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>kvsetkeys.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>pgfkeys.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf.zip">graphics/pgf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf/">browse the directory</a>)
+<dt><tt><i>scrbase.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>xkeyval.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xkeyval.zip">macros/latex/contrib/xkeyval</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xkeyval/">browse the directory</a>)
+</dl>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=keyval">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=keyval</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelfig.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelfig.html
index 2c0757af447..123112b3383 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelfig.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelfig.html
@@ -60,14 +60,14 @@ environment which itself includes the graphic. I would recommend
are plainly little more than a convenience over what is achievable
with the do-it-yourself approach.
<dl>
-<dt><tt><i>auto-pst-pdf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/auto-pst-pdf.zip">macros/latex/contrib/auto-pst-pdf</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/auto-pst-pdf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/auto-pst-pdf/">browse</a>)
-<dt><tt><i>iTe</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/ite.zip">support/ite</a> (<a href="ftp://cam.ctan.org/tex-archive/support/ite.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/ite/">browse</a>)
-<dt><tt><i>laprint</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfragx.zip">macros/latex/contrib/psfragx</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfragx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/psfragx/">browse</a>)
-<dt><tt><i>overpic.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/overpic.zip">macros/latex/contrib/overpic</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/overpic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/overpic/">browse</a>)
-<dt><tt><i>psfrag.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfrag.zip">macros/latex/contrib/psfrag</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfrag.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/psfrag/">browse</a>)
-<dt><tt><i>psfragx.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfragx.zip">macros/latex/contrib/psfragx</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psfragx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/psfragx/">browse</a>)
-<dt><tt><i>pstricks.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pstricks/">browse</a>)
-<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pst-pdf/">browse</a>)
+<dt><tt><i>auto-pst-pdf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/auto-pst-pdf.zip">macros/latex/contrib/auto-pst-pdf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/auto-pst-pdf/">browse the directory</a>)
+<dt><tt><i>iTe</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/ite.zip">support/ite</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/ite/">browse the directory</a>)
+<dt><tt><i>laprint</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfragx.zip">macros/latex/contrib/psfragx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfragx/">browse the directory</a>)
+<dt><tt><i>overpic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/overpic.zip">macros/latex/contrib/overpic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/overpic/">browse the directory</a>)
+<dt><tt><i>psfrag.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfrag.zip">macros/latex/contrib/psfrag</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfrag/">browse the directory</a>)
+<dt><tt><i>psfragx.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfragx.zip">macros/latex/contrib/psfragx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psfragx/">browse the directory</a>)
+<dt><tt><i>pstricks.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks/">browse the directory</a>)
+<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labelfig">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labelfig</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelformat.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelformat.html
index 1a34c99d57e..707c10f802d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelformat.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labelformat.html
@@ -67,8 +67,8 @@ has been rendered obsolete by the appearance of the <i>enumitem</i>
package, which is discussed in the answer about
<a href="FAQ-enumerate.html">decorating enumeration lists</a>.
<dl>
-<dt><tt><i>enumitem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/enumitem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/enumitem/">browse</a>)
-<dt><tt><i>fncylab.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/fncylab.sty">macros/latex/contrib/misc/fncylab.sty</a>
+<dt><tt><i>enumitem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem.zip">macros/latex/contrib/enumitem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/enumitem/">browse the directory</a>)
+<dt><tt><i>fncylab.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/fncylab.sty">macros/latex/contrib/misc/fncylab.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labelformat">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labelformat</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labundef.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labundef.html
index ba3c6c803b8..45066f0d621 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labundef.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-labundef.html
@@ -33,7 +33,7 @@ of a single label, or the states of a list of labels. The package&rsquo;s
definition is a bit complicated, but the package itself is pretty
powerful.
<dl>
-<dt><tt><i>labelcas.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/labelcas.zip">macros/latex/contrib/labelcas</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/labelcas.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/labelcas/">browse</a>)
+<dt><tt><i>labelcas.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/labelcas.zip">macros/latex/contrib/labelcas</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/labelcas/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labundef">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=labundef</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-landscape.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-landscape.html
index f2b910ffd23..d74fadd2f12 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-landscape.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-landscape.html
@@ -68,16 +68,16 @@ rotation requests in DVI files.
Your best bet is to convert your output to PostScript or to PDF, and
to view these &lsquo;final&rsquo; forms with an appropriate viewer.
<dl>
-<dt><tt><i>geometry.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/geometry/">browse</a>)
-<dt><tt><i>graphics.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>)
-<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>lscape.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>geometry.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry/">browse the directory</a>)
+<dt><tt><i>graphics.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
+<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>lscape.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
<dt><tt><i>pdflscape.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
-<dt><tt><i>rotating.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rotating.zip">macros/latex/contrib/rotating</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rotating.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/rotating/">browse</a>)
-<dt><tt><i>rotfloat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rotfloat.zip">macros/latex/contrib/rotfloat</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/rotfloat.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/rotfloat/">browse</a>)
-<dt><tt><i>supertabular.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/supertabular.zip">macros/latex/contrib/supertabular</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/supertabular.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supertabular/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>rotating.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rotating.zip">macros/latex/contrib/rotating</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rotating/">browse the directory</a>)
+<dt><tt><i>rotfloat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rotfloat.zip">macros/latex/contrib/rotfloat</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/rotfloat/">browse the directory</a>)
+<dt><tt><i>supertabular.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/supertabular.zip">macros/latex/contrib/supertabular</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/supertabular/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=landscape">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=landscape</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latex2e.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latex2e.html
index 52101cdbfe6..1eff11d50a3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latex2e.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latex2e.html
@@ -7,20 +7,25 @@ was superseded in 1994 by a new version (LaTeX2e) provided by
<a href="FAQ-LaTeX3.html">the LaTeX team</a>.
LaTeX2e is now the only readily-available version of
LaTeX, and draws together several threads of LaTeX development
-from the later days of LaTeX 2.09.
+from the later days of LaTeX 2.09. The &ldquo;e&rdquo; of the name is (in the
+
+<a href="FAQ-logos.html">official logo</a>)
+
+a single-stroke epsilon
+(&epsilon;, supposedly
+indicative of no more than a small change.
<p/>LaTeX2e has several enhancements over LaTeX 2.09, but they were all
rather minor, with a view to continuity and stability rather than the
&ldquo;big push&rdquo; that some had expected from the team. LaTeX2e
continues to this day to offer a compatibility mode in which most
files prepared for use with LaTeX 2.09 will run (albeit with somewhat
-reduced performance, and subject to bitter complaints in the log
+reduced performance, and subject to voluminous complaints in the log
file). Differences between LaTeX2e and LaTeX 2.09 are
outlined in a series of &lsquo;guide&rsquo; files that are available in every
LaTeX distribution (the same directory also contains &ldquo;news&rdquo; about
each new release of LaTeX2e).
<dl>
-<dt><tt><i>LaTeX guides and news</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc.zip">macros/latex/doc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/doc/">browse</a>)
+<dt><tt><i>LaTeX guides and news</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/doc.zip">macros/latex/doc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/doc/">browse the directory</a>)
</dl>
-<p/><p/>
-<p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latex2e">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latex2e</a>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latex2e">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latex2e</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexpronounce.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexpronounce.html
index d06cf474cee..a2496a1705f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexpronounce.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexpronounce.html
@@ -2,14 +2,14 @@
<title>UK TeX FAQ -- question label latexpronounce</title>
</head><body>
<h3>How should I pronounce &ldquo;LaTeX(2e)&rdquo;?</h3>
-
<p/>Lamport never recommended how one should pronounce LaTeX, but a lot
of people pronounce it &lsquo;Lay TeX&rsquo; or perhaps &lsquo;Lah TeX&rsquo; (with
TeX pronounced as the program itself; see
<a href="FAQ-TeXpronounce.html">the rules for TeX</a>). It is definitely
-<em>not</em> to be pronounced in the same way as the rubber-tree gum.
-<p/>The &lsquo;epsilon&rsquo; in &lsquo;LaTeX2e&rsquo; is supposed to be suggestive of a small
-improvement over the old LaTeX 2.09. Nevertheless, most people
-pronounce the name as &lsquo;LaTeX-two-ee&rsquo;.
+<em>not</em> to be pronounced in the same way as the rubber-tree gum
+(which would be &lsquo;lay teks&rsquo;).
+<p/>The LaTeX2e logo is supposed to end with an
+&epsilon;; nevertheless, most
+people pronounce the name as &lsquo;LaTeX-two-ee&rsquo;.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexpronounce">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexpronounce</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexqual.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexqual.html
index a13f693fe96..880d273f99e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexqual.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-latexqual.html
@@ -29,9 +29,9 @@ doesn&rsquo;t seem as comprehensive as <i>nag</i>, but it allows you to
download its script, which you can then juggle with to make it more
draconian.
<dl>
-<dt><tt><i>l2tabu</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/info/l2tabu/">info/l2tabu/</a> for a copy in a language that&rsquo;s
+<dt><tt><i>l2tabu</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/l2tabu/">info/l2tabu/</a> for a copy in a language that&rsquo;s
convenient for you
-<dt><tt><i>nag.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/nag.zip">macros/latex/contrib/nag</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/nag.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/nag/">browse</a>)
+<dt><tt><i>nag.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/nag.zip">macros/latex/contrib/nag</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/nag/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexqual">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexqual</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterclass.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterclass.html
index 3daf4d5a2fa..b2051c36aa4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterclass.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterclass.html
@@ -34,11 +34,11 @@ only) bundles. While these are probably good (since the bundles
themselves inspire trust) they&rsquo;ve not been specifically recommended by
any users.
<dl>
-<dt><tt><i>akletter.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/akletter.zip">macros/latex/contrib/akletter</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/akletter.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/akletter/">browse</a>)
-<dt><tt><i>brief.cls</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ntgclass/">browse</a>)
-<dt><tt><i>dinbrief.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dinbrief.zip">macros/latex/contrib/dinbrief</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/dinbrief.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/dinbrief/">browse</a>)
-<dt><tt><i>newlfm.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/newlfm.zip">macros/latex/contrib/newlfm</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/newlfm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/newlfm/">browse</a>)
-<dt><tt><i>scrlttr2.cls</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>akletter.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/akletter.zip">macros/latex/contrib/akletter</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/akletter/">browse the directory</a>)
+<dt><tt><i>brief.cls</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass/">browse the directory</a>)
+<dt><tt><i>dinbrief.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dinbrief.zip">macros/latex/contrib/dinbrief</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/dinbrief/">browse the directory</a>)
+<dt><tt><i>newlfm.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/newlfm.zip">macros/latex/contrib/newlfm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/newlfm/">browse the directory</a>)
+<dt><tt><i>scrlttr2.cls</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=letterclass">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=letterclass</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterspace.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterspace.html
index d20e191d767..4d1670c468e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterspace.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-letterspace.html
@@ -36,9 +36,9 @@ will destroy ligatures; however, this is <em>wrong</em> if the font is
of a fraktur style, and the package provides a means of protecting the
ligatures in a letter-spaced text.
<dl>
-<dt><tt><i>letterspacing.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/misc/letterspacing.tex">macros/generic/misc/letterspacing.tex</a>
-<dt><tt><i>microtype.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/microtype.zip">macros/latex/contrib/microtype</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/microtype.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/microtype/">browse</a>)
-<dt><tt><i>soul.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/soul/">browse</a>)
+<dt><tt><i>letterspacing.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/generic/misc/letterspacing.tex">macros/generic/misc/letterspacing.tex</a>
+<dt><tt><i>microtype.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/microtype.zip">macros/latex/contrib/microtype</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/microtype/">browse the directory</a>)
+<dt><tt><i>soul.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=letterspace">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=letterspace</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linenos.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linenos.html
index ac06276ba38..866a3e6fd94 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linenos.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linenos.html
@@ -5,11 +5,14 @@
<p/>For general numbering of lines, there are two packages for use with
LaTeX, <i>lineno</i> (which permits labels attached to
individual lines of typeset output) and <i>numline</i>.
+(<i>Numline</i> is considered obsolete, but remains available from
+the archive.)
<p/>Both of these packages play fast and loose with the LaTeX output
routine, which can cause problems: the user should beware...
<p/>If the requirement is for numbering verbatim text, <i>moreverb</i>,
-<i>memoir</i> or <i>fancyvrb</i> (see
+or <i>fancyvrb</i> (see
<a href="FAQ-verbfile.html">including files verbatim</a>) may be used.
+Class <i>memoir</i> also provides the necessary facilities.
<p/>One common use of line numbers is in critical editions of texts, and
for this the <i>edmac</i> package offers comprehensive support;
<i>ledmac</i> is a LaTeX port of <i>edmac</i>.
@@ -21,14 +24,14 @@ interpolated mathematics or figures. Documentation of the package, in
the package itself, is pretty tough going, though there is an example
(also inside the package file).
<dl>
-<dt><tt><i>edmac</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/edmac.zip">macros/plain/contrib/edmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/edmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/edmac/">browse</a>)
-<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyvrb/">browse</a>)
-<dt><tt><i>ledmac.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ledmac/">browse</a>)
-<dt><tt><i>lineno.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lineno.zip">macros/latex/contrib/lineno</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lineno.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/lineno/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>moreverb.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moreverb.zip">macros/latex/contrib/moreverb</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moreverb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/moreverb/">browse</a>)
-<dt><tt><i>numline.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/numline/numline.sty">macros/latex/contrib/numline/numline.sty</a>
-<dt><tt><i>vruler.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/vruler.sty">macros/latex/contrib/misc/vruler.sty</a>
+<dt><tt><i>edmac</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/edmac.zip">macros/plain/contrib/edmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/edmac/">browse the directory</a>)
+<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb/">browse the directory</a>)
+<dt><tt><i>ledmac.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac/">browse the directory</a>)
+<dt><tt><i>lineno.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lineno.zip">macros/latex/contrib/lineno</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lineno/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>moreverb.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moreverb.zip">macros/latex/contrib/moreverb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moreverb/">browse the directory</a>)
+<dt><tt><i>numline.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveobsolete/macros/latex/contrib/numline/numline.sty">obsolete/macros/latex/contrib/numline/numline.sty</a>
+<dt><tt><i>vruler.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/vruler.sty">macros/latex/contrib/misc/vruler.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linenos">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linenos</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespace.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespace.html
index 459a395ed47..ad76a5fba16 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespace.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespace.html
@@ -35,7 +35,7 @@ becoming less common.
<p/>Documentation of <i>setspace</i> appears as TeX comments in the
package file itself.
<dl>
-<dt><tt><i>setspace.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/setspace/setspace.sty">macros/latex/contrib/setspace/setspace.sty</a>
+<dt><tt><i>setspace.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/setspace/setspace.sty">macros/latex/contrib/setspace/setspace.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linespace">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linespace</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespread.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespread.html
index 79c57fffa0e..d08a9a6717f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespread.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linespread.html
@@ -33,7 +33,7 @@ you want to avoid <i>setspace</i>, beware the behaviour of
linespread changes within a paragraph: read
&ldquo;<a href="FAQ-baselinepar.html"><code>\</code><code>baselineskip</code> is a paragraph parameter</a>&rdquo;.
<dl>
-<dt><tt><i>setspace.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/setspace/setspace.sty">macros/latex/contrib/setspace/setspace.sty</a>
+<dt><tt><i>setspace.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/setspace/setspace.sty">macros/latex/contrib/setspace/setspace.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linespread">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linespread</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linmacnames.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linmacnames.html
new file mode 100644
index 00000000000..af245d94c84
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-linmacnames.html
@@ -0,0 +1,147 @@
+<head>
+<title>UK TeX FAQ -- question label linmacnames</title>
+</head><body>
+<h3>Non-letters in macro names</h3>
+<p/>New LaTeX users are often suprised that macro definitions
+containing non-letters, such as
+<blockquote>
+<pre>
+\newcommand{\cul8r}{Goodbye!}
+</pre>
+</blockquote><p>
+fail to compile. The reason is that the TeX macro language, unlike
+most programming languages, allows
+<a href="FAQ-whatmacros.html">nothing but letters in macro names</a>.
+<p/>There are a number of techniques for defining a macro with a name like
+<code>\</code><code>cul8r</code>. Unfortunately, none of the techniques is particularly
+good:
+<ol>
+<li> Use <code>\</code><code>csname</code>\dots<code>\</code><code>endcsname</code> to define and invoke the
+ macro:
+ <blockquote>
+
+<pre>
+\expandafter\newcommand\csname cul8r\endcsname{Goodbye!}
+I said, ``\csname cul8r\endcsname''.
+</pre>
+ </blockquote><p>
+ <dl>
+ <dt>Pro:<dd> No unexpected side effects
+ <dt>Con:<dd> So verbose as to be unusable
+ </dl>
+<li> Define a &ldquo;special-command generator&rdquo;, and use the resulting
+ commands:
+<blockquote>
+
+<pre>
+\newcommand{\DefineRemark}[2]{%
+ \expandafter\newcommand\csname rmk-#1\endcsname{#2}%
+}
+\newcommand{\Remark}[1]{\csname rmk-#1\endcsname}
+...
+\DefineRemark{cul8r}{Goodbye!}
+...
+\Remark{cul8r}
+</pre>
+</blockquote><p>
+ <dl>
+ <dt>Pro:<dd> Straightforward to use, not too untidy
+ <dt>Con:<dd> It&rsquo;s hardly doing what we set out to do (experts will
+ see that you are defining a macro, but others likely won&rsquo;t)
+ </dl>
+<li> Convince TeX that &ldquo;<code>8</code>&rdquo; is a letter:
+ <blockquote>
+<pre>
+\catcode`8 = 11
+\newcommand{\cul8r}{Goodbye!}
+I said, ``\cul8r''.
+</pre>
+ </blockquote><p>
+ <dl>
+ <dt>Pro:<dd> <code>\</code><code>cul8r</code> can be used directly
+ <dt>Con:<dd> Likely to break other uses of &ldquo;<code>8</code>&rdquo; (such as
+ numbers or dimensions; so
+ <code>\</code><code>setlength{<code>\</code><code>paperwidth</code>}{8in}</code> tells us:
+ <blockquote>
+<pre>
+! Missing number, treated as zero.
+&lt;to be read again&gt;
+ 8
+</pre>
+ </blockquote><p>
+ </dl>
+ As a general rule, changing category codes is something to use
+ <em>in extremis</em>, after detailed examination of options. It is
+ conceivable that such drastic action could be useful for you, but
+ most ordinary users are well advised not even to try such a
+ technique.
+<li> Define a macro <code>\</code><code>cul</code> which must always be followed by
+ &ldquo;<code>8r</code>&rdquo;:
+ <blockquote>
+<pre>
+\def\cul8r{Goodbye!}
+I said, ``\cul8r''.
+</pre>
+ </blockquote><p>
+ <dl>
+ <dt>Pro:<dd> <code>\</code><code>cul8r</code> can be used directly
+ <dt>Con #1:<dd> Breaks if <code>\</code><code>cul</code> is followed by anything other
+ than &ldquo;<code>8r</code>&rdquo;, with a confusing diagnostic &mdash;
+ <code>\</code><code>cul99</code> produces:
+ <blockquote>
+<pre>
+! Use of \cul doesn't match its definition.
+&lt;*&gt; \cul9
+ 9
+</pre>
+
+ </blockquote><p>
+ (which would confuse someone who hadn&rsquo;t even realised there
+ <em>was</em> a definition of <code>\</code><code>cul</code> in the document).
+ <dt>Con #2:<dd> Silently redefines existing <code>\</code><code>cul</code>, if any;
+ as a result, the technique cannot be used to define both a
+ <code>\</code><code>cul8r</code> and, say, a <code>\</code><code>cul123</code> macro in the same
+ document.
+ </dl>
+</ol>
+Technique 3 is in fact commonly used &mdash; in a limited form &mdash; within
+most LaTeX packages and within LaTeX itself. The convention is to
+use &ldquo;<code>@</code>&rdquo; within the names of internal macros to hide them
+from the user and thereby prevent naming conflicts. To this end,
+LaTeX automatically treats &ldquo;<code>@</code>&rdquo; as a letter while
+processing classes and packages and as a non-letter while processing
+the user&rsquo;s document. The key to this technique is the separation:
+internally a non-letter is used for macro names, and the user doesn&rsquo;t
+see anything of it, while the status remains &ldquo;frozen&rdquo; in all the
+definitions created within the class or package. See
+<a href="FAQ-atsigns.html"><code>\</code><code>@</code> and <code>@</code> in macro names</a> for
+more information.
+<p/>Note that analogous use of technique 3 in this example would give us
+<blockquote>
+<pre>
+\begingroup
+ \catcode`8 = 11
+ \gdef\cul8r{Goodbye!}
+ \gdef\later{\cul8r}
+\endgroup
+I said, ``\later''.
+</pre>
+</blockquote><p>
+which works, but rather defeats the object of the exercise.
+(<code>\</code><code>later</code> has the &ldquo;frozen&rdquo; catcode for &lsquo;8&rsquo;, even though the value
+has reverted to normal by the time it&rsquo;s used; note, also, the use of
+the primitive command <code>\</code><code>gdef</code>, since <code>\</code><code>newcommand</code> can&rsquo;t make a
+macro that&rsquo;s available outside the group.)
+<p/><em>Recommendation</em>: Either choose another mechanism (such as
+<code>\</code><code>DefineRemark</code> above), or choose another name for your macro, one
+that contains only ordinary letters. A common approach is to use
+roman numerals in place of arabic ones:
+<blockquote>
+<pre>
+\newcommand{\culVIIIr}{Goodbye!}
+</pre>
+</blockquote><p>
+which rather spoils the intent of the joke implicit in the example
+<code>\</code><code>cul8r</code>!
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linmacnames">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=linmacnames</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lit.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lit.html
index 539033c4fd6..4a0fddf3502 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lit.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lit.html
@@ -19,7 +19,7 @@ CTAN. Another good source of information is
<a href="http://www.literateprogramming.com/">http://www.literateprogramming.com/</a>
<dl>
<dt><tt><i>Literate Programming FAQ</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/help/comp.programming.literate_FAQ">help/comp.programming.literate_FAQ</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivehelp/comp.programming.literate_FAQ">help/comp.programming.literate_FAQ</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=lit">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=lit</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-logos.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-logos.html
index f0e08fac9cc..5a3df91fe7d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-logos.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-logos.html
@@ -5,17 +5,14 @@
<p/>Knuth was making a particular point about the capabilities of TeX
when he defined the logo. Unfortunately, many believe, he thereby
opened floodgates to give the world a whole range of rather silly
-&lsquo;bumpy road&rsquo; logos such as AMSTeX, PicTeX, BibTeX, and so on,
-produced in a flurry of different fonts, sizes, and baselines &mdash; indeed,
-everything one might hope to cause them to obstruct the reading process.
-In particular, Lamport invented LaTeX
-
- (silly enough in itself, with a raised small &lsquo;A&rsquo; and a lowered &lsquo;E&rsquo;)
-and marketing input from Addison-Wesley led to the even
-stranger current logo
-
- LaTeX2e, which appends a lowered single-stroke Greek letter
- epsilon.
+&lsquo;bumpy road&rsquo; logos for TeX entities such as AMSTeX, PicTeX,
+BibTeX, and so on, produced in a flurry of different fonts, sizes,
+and baselines &mdash; indeed, everything one might hope to cause them to
+obstruct the reading process. In particular, Lamport invented
+LaTeX (silly enough in itself, with a raised small &lsquo;A&rsquo; and a
+lowered &lsquo;E&rsquo;) and marketing input from Addison-Wesley led to the even
+stranger current logo for LaTeX2e, which appends a lowered
+single-stroke Greek letter &epsilon;.
<p/>Sensible users don&rsquo;t have to follow this stuff wherever it goes,
but, for those who insist, a large collection of logos is defined in
the <i>texnames</i> package (but note that this set of macros isn&rsquo;t
@@ -28,19 +25,18 @@ use of the Knuthian font for MetaPost (you might get
- something like &lsquo;META&nbsp;O&nbsp;T&rsquo;).
-You needn&rsquo;t despair, however &mdash; the author himself uses just &lsquo;MetaPost&rsquo;.
+ something like &lsquo;META&amp;nbsp;&amp;nbsp;O&amp;nbsp;&amp;nbsp;T&rsquo;).
+You needn&rsquo;t despair, however &mdash; most versions of the logo font
+distributed nowadays contain the missing letters, and the author
+himself uses just &lsquo;MetaPost&rsquo;.
<p/>For those who don&rsquo;t wish to acquire the &lsquo;proper&rsquo; logos, the canonical
thing to do is to say <code>AMS-</code><code>\</code><code>TeX</code>
-
for AMSTeX, <code>Pic</code><code>\</code><code>TeX</code>
-
for PicTeX, <code>Bib</code><code>\</code><code>TeX</code>
-
for BibTeX, and so on.
<dl>
-<dt><tt><i>mflogo.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mflogo.zip">macros/latex/contrib/mflogo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mflogo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mflogo/">browse</a>)
-<dt><tt><i>texnames.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/biblio/texnames.sty">info/biblio/texnames.sty</a>
+<dt><tt><i>mflogo.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mflogo.zip">macros/latex/contrib/mflogo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mflogo/">browse the directory</a>)
+<dt><tt><i>texnames.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/biblio/texnames.sty">info/biblio/texnames.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=logos">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=logos</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lollipop.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lollipop.html
index ec9d1b7a1a8..224689ca94d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lollipop.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-lollipop.html
@@ -25,7 +25,7 @@ LaTeX market share&rdquo;; it&rsquo;s a very witty package, but little sign of
it taking over from LaTeX is detectable...
An article about Lollipop appeared in <i>TUGboat</i> 13(3).
<dl>
-<dt><tt><i>Lollipop distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/lollipop.zip">macros/lollipop</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/lollipop.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/lollipop/">browse</a>)
+<dt><tt><i>Lollipop distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/lollipop.zip">macros/lollipop</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/lollipop/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=lollipop">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=lollipop</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-longtab.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-longtab.html
index a749efd9b5c..294c0fc71c8 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-longtab.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-longtab.html
@@ -56,12 +56,12 @@ the end of a page; it also has usability extensions, but doesn&rsquo;t have
the head- and footline capabilities of the major packages.
<p/>Documentation of <i>ltablex</i> is to be found in the package file.
<dl>
-<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>ltablex.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ltablex/ltablex.sty">macros/latex/contrib/ltablex/ltablex.sty</a>
-<dt><tt><i>ltxtable.sty</i></tt><dd>Generate by running <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle/ltxtable.tex">macros/latex/contrib/carlisle/ltxtable.tex</a>
-<dt><tt><i>stabular.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sttools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sttools/">browse</a>)
-<dt><tt><i>supertabular.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/supertabular.zip">macros/latex/contrib/supertabular</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/supertabular.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supertabular/">browse</a>)
-<dt><tt><i>xtab.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xtab.zip">macros/latex/contrib/xtab</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xtab.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/xtab/">browse</a>)
+<dt><tt><i>longtable.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>ltablex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/ltablex/ltablex.sty">macros/latex/contrib/ltablex/ltablex.sty</a>
+<dt><tt><i>ltxtable.sty</i></tt><dd>Generate by running <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/carlisle/ltxtable.tex">macros/latex/contrib/carlisle/ltxtable.tex</a>
+<dt><tt><i>stabular.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools.zip">macros/latex/contrib/sttools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sttools/">browse the directory</a>)
+<dt><tt><i>supertabular.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/supertabular.zip">macros/latex/contrib/supertabular</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/supertabular/">browse the directory</a>)
+<dt><tt><i>xtab.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xtab.zip">macros/latex/contrib/xtab</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xtab/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=longtab">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=longtab</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ltxcmds.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ltxcmds.html
index af41f3f0733..7f51a835ea0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ltxcmds.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ltxcmds.html
@@ -116,7 +116,7 @@ context.
<p/>All these .dtx files are on CTAN as part of the main LaTeX
distribution.
<dl>
-<dt><tt><i>LaTeX distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.zip">macros/latex/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/base/">browse</a>)
+<dt><tt><i>LaTeX distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base.zip">macros/latex/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ltxcmds">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ltxcmds</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-luatex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-luatex.html
index bd8af31be3b..117d75553b7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-luatex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-luatex.html
@@ -1,28 +1,38 @@
<head>
<title>UK TeX FAQ -- question label luatex</title>
</head><body>
-<h3>PDFTeX becomes LuaTeX</h3>
+<h3>PDFTeX and LuaTeX</h3>
<p/>As is said elsewhere in these FAQs, development of
<a href="FAQ-whatpdftex.html">PDFTeX</a> is &ldquo;in essence&rdquo; complete &mdash;
-development of new facilities continues, but the limitations of the
-present structure impose a strong limit on what facilities are
-possible. (The PDFTeX team has announced that no further
+no new facilities are being developed, since the limitations of the
+present structure mean that the returns on effort invested are
+diminishing. The PDFTeX team has announced that no further
developments will be added after the release of PDFTeX 1.50.0,
-which will be the next major release.)
-<p/>In this context, the idea of LuaTeX arose.
+which will be the next major release.
+<p/>In parallel with the running-down of PDFTeX development,
+development of a new system, LuaTeX is under way.
<a href="http://www.lua.org/"><i>Lua</a></i> is a script
-language, designed to offer an interpreter with a very small
-&ldquo;footprint&rdquo;, so it is rather easy to build it into other
-applications. So LuaTeX was launched as a PDFTeX
-executable with a <i>Lua</i> interpreter built into it.
-<p/>A <a href="http://www.luatex.org/">LuaTeX project</a> is now proceeding
-(with monetary support from various sources) and is pursuing avenues
-that many of the other
+language, designed to offer an interpreter that may be incorporated
+into other applications. LuaTeX consists of a TeX-like engine
+with a <i>lua</i> interpreter built into it; the <i>lua</i>
+interpreter has access to many of the data structures used for
+typesetting, and the user may also interpolate chunks of
+<i>lua</i> code into their (La)TeX macros, or as &lsquo;call-backs&rsquo;
+for use when the TeX-like engine does certain operations.
+<p/>This arrangement offers the prospect of a &ldquo;semi-soft&rdquo; typesetting
+engine: it will have its basic behaviour, but the user gets to
+redefine functionality if an idea occurs &mdash; there will be no need to
+persuade the world first, and then find a willing developer to work on
+the sources of of the distribution.
+<p/>The <a href="http://www.luatex.org/">LuaTeX project</a> is (with monetary
+support from various sources) pursuing avenues that many of the other
current projects have in their sights, notably Unicode character
-representations and support for OpenType fonts. Work is also in hand
+representations and support for OpenType fonts. The intention is
to integrate the extensions pioneered by <a href="FAQ-omegaleph.html">Aleph</a>.
-<p/>The next release of TeX Live (due in July 2008) and MiKTeX
-version 2.8 (no current release date) will incorporate LuaTeX.
-ConTeXt distributions can already make use of it.
+<p/>A release of LuaTeX whose functionality is declared (version 0.50)
+has recently appeared. TeX Live 2008 incorporates an early release
+of LuaTeX, and the upcoming MiKTeX version 2.8 (no current
+release date) will probably incorporate LuaTeX. ConTeXt
+distributions can already make use of LuaTeX.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=luatex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=luatex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-make.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-make.html
index 18971011cad..c70e2f5d5f3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-make.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-make.html
@@ -40,11 +40,11 @@ as necessary.
FAQ through LaTeX: we don&rsquo;t present them as a complete
solution, but some of the tricks employed are surely re-usable.
<dl>
-<dt><tt><i>AutoLaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/autolatex.zip">support/autolatex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/autolatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/autolatex/">browse</a>)
-<dt><tt><i>FAQ distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (<a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/uk-tex-faq/">browse</a>)
-<dt><tt><i>latexmake</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/latexmake.zip">support/latexmake</a> (<a href="ftp://cam.ctan.org/tex-archive/support/latexmake.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/latexmake/">browse</a>)
-<dt><tt><i>latexmk</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/latexmk.zip">support/latexmk</a> (<a href="ftp://cam.ctan.org/tex-archive/support/latexmk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/latexmk/">browse</a>)
-<dt><tt><i>texi2dvi</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/texinfo/texinfo/">browse</a>)
+<dt><tt><i>AutoLaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/autolatex.zip">support/autolatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/autolatex/">browse the directory</a>)
+<dt><tt><i>FAQ distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq/">browse the directory</a>)
+<dt><tt><i>latexmake</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexmake.zip">support/latexmake</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexmake/">browse the directory</a>)
+<dt><tt><i>latexmk</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexmk.zip">support/latexmk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/latexmk/">browse the directory</a>)
+<dt><tt><i>texi2dvi</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=make">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=make</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makebib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makebib.html
index 80fafa4181e..22370d51f09 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makebib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makebib.html
@@ -15,8 +15,8 @@ styles.
not usually destroy information, it can quite reasonably mislabel it.
<p/>Documentation of the script is to be found in the file <i>tex2bib.readme</i>
<dl>
-<dt><tt><i>tex2bib</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/tex2bib/tex2bib">biblio/bibtex/utils/tex2bib/tex2bib</a>
-<dt><tt><i>tex2bib.readme</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/utils/tex2bib/README">biblio/bibtex/utils/tex2bib/README</a>
+<dt><tt><i>tex2bib</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/tex2bib/tex2bib">biblio/bibtex/utils/tex2bib/tex2bib</a>
+<dt><tt><i>tex2bib.readme</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/utils/tex2bib/README">biblio/bibtex/utils/tex2bib/README</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=makebib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=makebib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
index f0a1f6ca76d..e9acda63103 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-makeindex.html
@@ -38,16 +38,16 @@ to be included into the document at the next run.
highly flexible. Sadly, its take-up is proving rather slow.
</dl>
<dl>
-<dt><tt><i>idxtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/indexing/glo+idxtex.zip">indexing/glo+idxtex</a> (<a href="ftp://cam.ctan.org/tex-archive/indexing/glo+idxtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/indexing/glo+idxtex/">browse</a>)
-<dt><tt><i>ltxindex.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ltxindex.zip">macros/latex/contrib/ltxindex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ltxindex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ltxindex/">browse</a>)
-<dt><tt><i>makeindex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/indexing/makeindex.zip">indexing/makeindex</a> (<a href="ftp://cam.ctan.org/tex-archive/indexing/makeindex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/indexing/makeindex/">browse</a>)
-<dt><tt><i>makeindex (Macintosh)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/mac/macmakeindex2.12.sea.hqx">systems/mac/macmakeindex2.12.sea.hqx</a>
-<dt><tt><i>texindex (the script)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/indexing/texindex.zip">indexing/texindex</a> (<a href="ftp://cam.ctan.org/tex-archive/indexing/texindex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/indexing/texindex/">browse</a>)
+<dt><tt><i>idxtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/glo+idxtex.zip">indexing/glo+idxtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/glo+idxtex/">browse the directory</a>)
+<dt><tt><i>ltxindex.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ltxindex.zip">macros/latex/contrib/ltxindex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ltxindex/">browse the directory</a>)
+<dt><tt><i>makeindex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/makeindex.zip">indexing/makeindex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/makeindex/">browse the directory</a>)
+<dt><tt><i>makeindex (Macintosh)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/mac/macmakeindex2.12.sea.hqx">systems/mac/macmakeindex2.12.sea.hqx</a>
+<dt><tt><i>texindex (the script)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/texindex.zip">indexing/texindex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/indexing/texindex/">browse the directory</a>)
<dt><tt><i>texindex (the program)</i></tt><dd>Distributed
- with <a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/texinfo/texinfo/">browse</a>)
-<dt><tt><i>texsis (system)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/texsis.zip">macros/texsis</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/texsis.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/texsis/">browse</a>)
-<dt><tt><i>texsis (makeindex support)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/texsis/index/index.tex">macros/texsis/index/index.tex</a>
-<dt><tt><i>xindy</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/support/xindy/">support/xindy/</a>
+ with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo/">browse the directory</a>)
+<dt><tt><i>texsis (system)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texsis.zip">macros/texsis</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texsis/">browse the directory</a>)
+<dt><tt><i>texsis (makeindex support)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/texsis/index/index.tex">macros/texsis/index/index.tex</a>
+<dt><tt><i>xindy</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveindexing/xindy/">indexing/xindy/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=makeindex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=makeindex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-latex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-latex.html
index 2840ad9104c..bab58558eec 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-latex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-latex.html
@@ -2,11 +2,15 @@
<title>UK TeX FAQ -- question label man-latex</title>
</head><body>
<h3>Online introductions: LaTeX</h3>
+<p/>A pleasing little document, &ldquo;Getting something out of LaTeX&rdquo; is
+designed to give a feel of LaTeX to someone who&rsquo;s never used it at
+all. It&rsquo;s not a tutorial, merely helps the user to decide whether to
+go on to a tutorial, and to &lsquo;real&rsquo; use of LaTeX.
<p/>Tobias Oetiker&rsquo;s &lsquo;(Not so) Short Introduction to LaTeX2e&rsquo;, is
regularly updated, as people suggest better ways of explaining things,
etc. The introduction is available on CTAN, together with
translations into a rather large set of languages.
-<p/>Peter Flynn&rsquo;s &ldquo;Beginner&rsquo;s LaTeX&rdquo; (which also started as course
+<p/>Peter Flynn&rsquo;s &ldquo;Beginner&rsquo;s LaTeX&rdquo; (which started life as course
material) is a pleasing read. A complete copy may be found on
CTAN, but it may also be browsed over the web
(<a href="http://www.tex.ac.uk/tex-archive/info/beginlatex/html/">http://www.tex.ac.uk/tex-archive/info/beginlatex/html/</a>).
@@ -46,15 +50,16 @@ Trettin, translated into English by J&uuml;rgen Fenn. The
tutorial is available from CTAN as a PDF file (though
the source is also available).
<dl>
-<dt><tt><i>Beginner&rsquo;s LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/beginlatex/beginlatex-3.6.pdf">info/beginlatex/beginlatex-3.6.pdf</a>
-<dt><tt><i>Not so Short Introduction</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/lshort/english/lshort.pdf">info/lshort/english/lshort.pdf</a>
+<dt><tt><i>Beginner&rsquo;s LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/beginlatex/beginlatex-3.6.pdf">info/beginlatex/beginlatex-3.6.pdf</a>
+<dt><tt><i>First LaTeX document</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/first-latex-doc.zip">info/first-latex-doc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/first-latex-doc/">browse the directory</a>)
+<dt><tt><i>Not so Short Introduction</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/lshort/english/lshort.pdf">info/lshort/english/lshort.pdf</a>
(in English, you may browse for sources and other language versions at
- <a href="http://www.tex.ac.uk/tex-archive/info/lshort/">info/lshort/</a>)
-<dt><tt><i>Simplified LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/simplified-latex/simplified-intro.ps">info/simplified-latex/simplified-intro.ps</a>
-<dt><tt><i>Short Course in LaTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/Math_into_LaTeX-4/Short_Course.pdf">info/Math_into_LaTeX-4/Short_Course.pdf</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/lshort/">info/lshort/</a>)
+<dt><tt><i>Simplified LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/simplified-latex/simplified-intro.ps">info/simplified-latex/simplified-intro.ps</a>
+<dt><tt><i>Short Course in LaTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/Math_into_LaTeX-4/Short_Course.pdf">info/Math_into_LaTeX-4/Short_Course.pdf</a>
-<dt><tt><i>The sins of LaTeX users</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/l2tabu/english/l2tabuen.pdf">info/l2tabu/english/l2tabuen.pdf</a>;
- source also available: <a href="ftp://cam.ctan.org/tex-archive/info/l2tabu/english/l2tabuen.tex">info/l2tabu/english/l2tabuen.tex</a>
+<dt><tt><i>The sins of LaTeX users</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/l2tabu/english/l2tabuen.pdf">info/l2tabu/english/l2tabuen.pdf</a>;
+ source also available: <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/l2tabu/english/l2tabuen.tex">info/l2tabu/english/l2tabuen.tex</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-latex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-tex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-tex.html
index 7b021ea561e..457aee3f638 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-tex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-man-tex.html
@@ -7,7 +7,7 @@
<p/>Another recommendable document is D. R. Wilkins &lsquo;Getting started with TeX&rsquo;,
available on the web at <a href="http://www.ntg.nl/doc/wilkins/pllong.pdf">http://www.ntg.nl/doc/wilkins/pllong.pdf</a>
<dl>
-<dt><tt><i>Gentle Introduction</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/gentle/gentle.pdf">info/gentle/gentle.pdf</a>
+<dt><tt><i>Gentle Introduction</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/gentle/gentle.pdf">info/gentle/gentle.pdf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-tex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=man-tex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-manymathalph.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-manymathalph.html
index 349ad41cd8d..f35a28a3247 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-manymathalph.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-manymathalph.html
@@ -35,7 +35,7 @@ and then steadily reduce the bold families, starting with
</blockquote><p>
until (with a bit of luck) the error goes away.
<dl>
-<dt><tt><i>bm.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>bm.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=manymathalph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=manymathalph</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginparside.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginparside.html
index 2746486f12f..fd4f38b0dd7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginparside.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginparside.html
@@ -24,8 +24,8 @@ of the page each <code>\</code><code>marginpar</code> <em>should</em> be on. Th
<i>mparhack</i> package does this, using label-like marks stored in
the <code>.aux</code> file; the <i>memoir</i> class does likewise.
<dl>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>mparhack.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mparhack.zip">macros/latex/contrib/mparhack</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mparhack.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mparhack/">browse</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>mparhack.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mparhack.zip">macros/latex/contrib/mparhack</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mparhack/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=marginparside">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=marginparside</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginpkgs.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginpkgs.html
index a8a81d47fe4..1a5fca7b229 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginpkgs.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-marginpkgs.html
@@ -19,12 +19,12 @@ canned set of paper sizes (a superset of that provided in LaTeX2e),
provision for custom paper, margin adjustments and provision for
two-sided printing.
<dl>
-<dt><tt><i>geometry.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/geometry/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>layout.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>typearea.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>vmargin.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/vmargin.zip">macros/latex/contrib/vmargin</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/vmargin.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/vmargin/">browse</a>)
+<dt><tt><i>geometry.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>layout.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>typearea.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>vmargin.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/vmargin.zip">macros/latex/contrib/vmargin</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/vmargin/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=marginpkgs">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=marginpkgs</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-matchbrak.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-matchbrak.html
index 1f7f5f25f3b..8f9d04cf2cd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-matchbrak.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-matchbrak.html
@@ -53,5 +53,5 @@ argument is enclosed in parentheses, as in:
parentheses, but the issue seldom arises since such arguments rarely
contain text. If it were to arise, the same solution (enclosing the
confused characters in braces) would solve the problem.
-<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=matchbrak">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=matchbrak</a>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=matchbrak">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=matchbrak</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathlips.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathlips.html
index 6308b2a33a8..6c621cdea64 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathlips.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathlips.html
@@ -35,11 +35,11 @@ distribution (thus saving you the bother of installing the package
before being able to read the documentation). Documentation of
<i>mathdots</i> appears at the end the package file itself.
<dl>
-<dt><tt><i>amslatex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
-<dt><tt><i>graphics.sty</i></tt><dd>Part of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>) bundle
-<dt><tt><i>mathdots.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/mathdots.zip">macros/generic/mathdots</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/generic/mathdots.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/generic/mathdots/">browse</a>)
-<dt><tt><i>yhmath (fonts)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/yhmath.zip">fonts/yhmath</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/yhmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/yhmath/">browse</a>)
-<dt><tt><i>yhmath (macros)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/yhmath.zip">macros/latex/contrib/yhmath</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/yhmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/yhmath/">browse</a>)
+<dt><tt><i>amslatex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
+<dt><tt><i>graphics.sty</i></tt><dd>Part of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>) bundle
+<dt><tt><i>mathdots.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/mathdots.zip">macros/generic/mathdots</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/generic/mathdots/">browse the directory</a>)
+<dt><tt><i>yhmath (fonts)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/yhmath.zip">fonts/yhmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/yhmath/">browse the directory</a>)
+<dt><tt><i>yhmath (macros)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/yhmath.zip">macros/latex/contrib/yhmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/yhmath/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathlips">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathlips</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathml.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathml.html
index 39bdeb00df9..331b1c4109f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathml.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathml.html
@@ -85,20 +85,22 @@ support for new Web standards.
onus on the browser user; and however technically proficient
<em>you</em> are, it&rsquo;s never safe to assume too much of your readers.
An interesting alternative is
- <a href="http://www.forkosh.com/mimetex.html">MimeTeX</a>, which sits
+ <a href="http://www.forkosh.com/mathtex.html">MathTeX</a>, which sits
on your server as a CGI script, and you use it to include
your TeX, in your HTML, as if it were an image:
<blockquote>
<pre>
-&lt;img src="../cgi-bin/mimetex.cgi?f(x)=\int\limits_{-\infty}^xe^{-t^2}dt"&gt;
+&lt;img src="/cgi-bin/mimetex.cgi?f(x)=\int\limits_{-\infty}^xe^{-t^2}dt"&gt;
</pre>
</blockquote><p>
+(<i>Mathtex</i> supersedes the author&rsquo;s earlier <i>mimetex</i>.)
</dl>
<dl>
-<dt><tt><i>GELLMU</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/gellmu.zip">support/gellmu</a> (<a href="ftp://cam.ctan.org/tex-archive/support/gellmu.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/gellmu/">browse</a>)
-<dt><tt><i>MimeTeX</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/mimetex.zip">support/mimetex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/mimetex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/mimetex/">browse</a>)
-<dt><tt><i>TeX4HT</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/TeX4ht/tex4ht-all.zip">support/TeX4ht/tex4ht-all.zip</a>
+<dt><tt><i>GELLMU</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/gellmu.zip">support/gellmu</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/gellmu/">browse the directory</a>)
+<dt><tt><i>MathTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/mimetex/">support/mimetex/</a>
+<dt><tt><i>MimeTeX</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/mimetex/">support/mimetex/</a>
+<dt><tt><i>TeX4HT</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/TeX4ht/tex4ht-all.zip">support/TeX4ht/tex4ht-all.zip</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathml">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathml</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathonlyref.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathonlyref.html
index 317eb2cd798..1f280e7c9d2 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathonlyref.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathonlyref.html
@@ -19,7 +19,7 @@ operation, only those equations to which you make reference will be
numbered in the final output. See the package&rsquo;s documentation for
details of how to make references when the switch is in effect.
<dl>
-<dt><tt><i>mathtools.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mh.zip">macros/latex/contrib/mh</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mh.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mh/">browse</a>)
+<dt><tt><i>mathtools.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mh.zip">macros/latex/contrib/mh</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mh/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathonlyref">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathonlyref</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathsize.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathsize.html
index c24a7c06895..ed50a94dcdc 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathsize.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathsize.html
@@ -51,8 +51,8 @@ Beware simply copying (parts of) the LaTeX definitions &mdash; since
they contain those internal abbreviations, they need to be treated as
<a href="FAQ-atsigns.html">internal commands</a>.
<dl>
-<dt><tt><i>fontdef.dtx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base/fontdef.dtx">macros/latex/base/fontdef.dtx</a>
-<dt><tt><i>fontmath.ltx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/unpacked/fontmath.ltx">macros/latex/unpacked/fontmath.ltx</a>
+<dt><tt><i>fontdef.dtx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/base/fontdef.dtx">macros/latex/base/fontdef.dtx</a>
+<dt><tt><i>fontmath.ltx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/unpacked/fontmath.ltx">macros/latex/unpacked/fontmath.ltx</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathsize">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathsize</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathstext.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathstext.html
index 777930ef9f9..872da227970 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathstext.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mathstext.html
@@ -112,13 +112,13 @@ signs):
at <a href="ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf">ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf</a>
<dl>
<dt><tt><i>amsldoc.tex</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
<dt><tt><i>amsmath.sty</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
<dt><tt><i>amstext.sty</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
<dt><tt><i>mathtools.sty</i></tt><dd>Distributed as part of the <i>mh</i> bundle
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mh.zip">macros/latex/contrib/mh</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mh.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mh/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mh.zip">macros/latex/contrib/mh</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mh/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathstext">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mathstext</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcfloat.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcfloat.html
index 8184f2d9ad3..7dae8d65509 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcfloat.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcfloat.html
@@ -28,8 +28,8 @@ won&rsquo;t &lsquo;float&rsquo;, and exhibit other strange behaviours (such as s
running off the end of the column at the end of the
<code>multicols</code> environment).
<dl>
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
-<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
+<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mcfloat">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mcfloat</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcite.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcite.html
index 4a577b1dabc..64504221f1d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcite.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mcite.html
@@ -5,8 +5,8 @@
<p/>A convention sometimes used in physics journals is to &ldquo;collapse&rdquo; a group of
related citations into a single entry in the bibliography. BibTeX,
by default, can&rsquo;t cope with this arrangement, but the <i>mcite</i>
-package deals with the problem.
-<p/>The package overloads the <code>\</code><code>cite</code> command to recognise a
+and <i>mciteplus</i> packages deal with the problem.
+<p/><i>mcite</i> overloads the <code>\</code><code>cite</code> command to recognise a
&ldquo;<code>*</code>&rdquo; at the start of a key, so that citations of the form
<blockquote>
<pre>
@@ -29,20 +29,31 @@ paper 3.
<p/>You need to make a small change to the bibliography style
(<code>.bst</code>) file you use; the <i>mcite</i> package
documentation tells you how to do that.
-<p/>Unfortunately, the <i>revtex</i> system doesn&rsquo;t play with
-<i>mcite</i>. As a result, for that (primarily physics-targeted
-system) you need to play silly games like:
+<p/>(Despite these multiple citations being primarily a physics-oriented
+requirement, the <i>RevTeX</i> (Physics support) class doesn&rsquo;t work
+with <i>mcite</i>.
+<p/>The <i>mciteplus</i> package adresses many of the infelicites of
+<i>mcite</i>, and <em>does</em> work with <i>RevTeX</i>. Again,
+&lsquo;ordinary&rsquo; <code>.bst</code> files will not work with
+<i>mciteplus</i>, but the package documentation explains how to
+patch an existing BibTeX style.
+<p/>The <i>collref</i> package takes a rather different approach to the
+problem, and will work with most (if not all) BibTeX packages.
+<i>Collref</i> spots common subsets of the references, so if it
+sees a sequence
<blockquote>
<pre>
-\cite{paper0,paper1,paper3}
-\nocite{paper2}
+\cite{paper0,paper1,paper2,paper3}
+...
+\cite{some_other_paper,paper1,paper2,and_another}
</pre>
</blockquote><p>
-and then edit the <code>.bbl</code> file to merge the two citations, to
-achieve the effects of <i>mcite</i>.
+it will collect <code>paper1</code> and <code>paper2</code> as a multiple reference.
<dl>
-<dt><tt><i>mcite.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mcite.zip">macros/latex/contrib/mcite</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mcite.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mcite/">browse</a>)
-<dt><tt><i>revtex bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/revtex.zip">macros/latex/contrib/revtex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/revtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/revtex/">browse</a>)
+<dt><tt><i>collref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/collref.zip">macros/latex/contrib/collref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/collref/">browse the directory</a>)
+<dt><tt><i>mcite.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mcite.zip">macros/latex/contrib/mcite</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mcite/">browse the directory</a>)
+<dt><tt><i>mciteplus.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mciteplus.zip">macros/latex/contrib/mciteplus</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mciteplus/">browse the directory</a>)
+<dt><tt><i>revtex bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/revtex.zip">macros/latex/contrib/revtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/revtex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mcite">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mcite</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-metrics.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-metrics.html
index 06dd0d2de82..402bf048b4d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-metrics.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-metrics.html
@@ -48,10 +48,10 @@ software, and is available on CTAN.
<dl>
-<dt><tt><i>dvips</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvips.zip">dviware/dvips</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvips.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvips/">browse</a>)
-<dt><tt><i>EdMetrics</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/mac/textures/utilities/EdMetrics.sea.hqx">systems/mac/textures/utilities/EdMetrics.sea.hqx</a>
-<dt><tt><i>fontinst</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/fontinst/">browse</a>)
-<dt><tt><i>LY1 support</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psnfssx/ly1.zip">macros/latex/contrib/psnfssx/ly1</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psnfssx/ly1.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/psnfssx/ly1/">browse</a>)
+<dt><tt><i>dvips</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvips.zip">dviware/dvips</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvips/">browse the directory</a>)
+<dt><tt><i>EdMetrics</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/mac/textures/utilities/EdMetrics.sea.hqx">systems/mac/textures/utilities/EdMetrics.sea.hqx</a>
+<dt><tt><i>fontinst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst/">browse the directory</a>)
+<dt><tt><i>LY1 support</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psnfssx/ly1.zip">macros/latex/contrib/psnfssx/ly1</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psnfssx/ly1/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=metrics">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=metrics</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mfptutorials.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mfptutorials.html
index a43366b900e..5e527618748 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mfptutorials.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mfptutorials.html
@@ -40,10 +40,9 @@ most certainly valuable learning material. Urs Oswald presents a
<a href="http://www.ursoswald.ch/metapost/tutorial.pdf">similar document</a>,
written more as a document, and presented in PDF.
<dl>
-<dt><tt><i>Beginners&rsquo; guide</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/metafont/beginners/metafont-for-beginners.pdf">info/metafont/beginners/metafont-for-beginners.pdf</a>
-<dt><tt><i>Peter Wilson&rsquo;s &ldquo;experiences&rdquo;</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/metafont/metafp/metafp.pdf">info/metafont/metafp/metafp.pdf</a>
- (PDF format)
-<dt><tt><i>Vincent Zoonekynd&rsquo;s examples</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/metapost/examples.zip">info/metapost/examples</a> (<a href="ftp://cam.ctan.org/tex-archive/info/metapost/examples.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/metapost/examples/">browse</a>)
+<dt><tt><i>Beginners&rsquo; guide</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/metafont/beginners/metafont-for-beginners.pdf">info/metafont/beginners/metafont-for-beginners.pdf</a>
+<dt><tt><i>Peter Wilson&rsquo;s &ldquo;experiences&rdquo;</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/metafont/metafp/metafp.pdf">info/metafont/metafp/metafp.pdf</a>
+<dt><tt><i>Vincent Zoonekynd&rsquo;s examples</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/metapost/examples.zip">info/metapost/examples</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/metapost/examples/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mfptutorials">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mfptutorials</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-minitoc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-minitoc.html
index 75fec2d9e7a..4ab91c8f3b7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-minitoc.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-minitoc.html
@@ -34,9 +34,9 @@ version of the <i>hyperref</i> package does know about
<i>minitoc</i> and treats <code>\</code><code>minitoc</code> tables in the
same way as &ldquo;real&rdquo; tables of contents.
<dl>
-<dt><tt><i>babel.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/babel.zip">macros/latex/required/babel</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/babel.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/babel/">browse</a>)
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>minitoc.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/minitoc.zip">macros/latex/contrib/minitoc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/minitoc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/minitoc/">browse</a>)
+<dt><tt><i>babel.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/babel.zip">macros/latex/required/babel</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/babel/">browse the directory</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>minitoc.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/minitoc.zip">macros/latex/contrib/minitoc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/minitoc/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minitoc">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minitoc</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-misssymb.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-misssymb.html
index 24165ca886b..d9b2e197b70 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-misssymb.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-misssymb.html
@@ -10,8 +10,8 @@ the LaTeX distribution), and in the <i>amsfonts</i> package
(which is part of the AMS distribution, and requires AMS
symbol fonts).
<dl>
-<dt><tt><i>amsfonts.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/latex.zip">fonts/amsfonts/latex</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/latex/">browse</a>)
-<dt><tt><i>AMS symbol fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/sources/symbols/">browse</a>)
+<dt><tt><i>amsfonts.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/latex.zip">fonts/amsfonts/latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/latex/">browse the directory</a>)
+<dt><tt><i>AMS symbol fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=misssymb">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=misssymb</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-moren9.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-moren9.html
index 20669160583..03732af2bad 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-moren9.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-moren9.html
@@ -58,7 +58,7 @@ doesn&rsquo;t have to remember that argument twelve is <code>soiltype</code>, an
on: the commands may be copied from field notes quickly and
accurately.
<dl>
-<dt><tt><i>keyval.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/graphics/">browse</a>)
+<dt><tt><i>keyval.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics.zip">macros/latex/required/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/graphics/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=moren9">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=moren9</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mpprologues.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mpprologues.html
index 848e6932446..6ff755deea3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mpprologues.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-mpprologues.html
@@ -76,9 +76,9 @@ set up to look like a proof sheet.
PDF from MetaPost, so may reasonably be considered an answer to
the question...
<dl>
-<dt><tt><i>mps2eps</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/mps2eps.zip">support/mps2eps</a> (<a href="ftp://cam.ctan.org/tex-archive/support/mps2eps.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/mps2eps/">browse</a>)
-<dt><tt><i>mpsproof.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/metapost/contrib/misc/mpsproof.tex">graphics/metapost/contrib/misc/mpsproof.tex</a>
-<dt><tt><i>mptopdf</i></tt><dd>Part of <a href="ftp://cam.ctan.org/tex-archive/macros/pdftex/graphics.zip">macros/pdftex/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/pdftex/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/pdftex/graphics/">browse</a>)
+<dt><tt><i>mps2eps</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/mps2eps.zip">support/mps2eps</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/mps2eps/">browse the directory</a>)
+<dt><tt><i>mpsproof.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivegraphics/metapost/contrib/misc/mpsproof.tex">graphics/metapost/contrib/misc/mpsproof.tex</a>
+<dt><tt><i>mptopdf</i></tt><dd>Part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/pdftex/graphics.zip">macros/pdftex/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/pdftex/graphics/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mpprologues">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=mpprologues</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-msxy.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-msxy.html
index c6ab8fb6c7f..d163eb59b3a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-msxy.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-msxy.html
@@ -22,8 +22,8 @@ letter in the font names).
<p/>If you have a DVI file that requests the fonts, there is a package
of <a href="FAQ-virtualfonts.html">virtual fonts</a> to map the old to the new series.
<dl>
-<dt><tt><i>msa and msb fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/sources/symbols/">browse</a>)
-<dt><tt><i>virtual font set</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/vf-files/msx2msa.zip">fonts/vf-files/msx2msa</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/vf-files/msx2msa.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/vf-files/msx2msa/">browse</a>)
+<dt><tt><i>msa and msb fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols/">browse the directory</a>)
+<dt><tt><i>virtual font set</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/vf-files/msx2msa.zip">fonts/vf-files/msx2msa</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/vf-files/msx2msa/">browse the directory</a>)
</dl>
<p/>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=msxy">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=msxy</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multbib.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multbib.html
index 1105a43ecc9..01a09a98fc7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multbib.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multbib.html
@@ -135,10 +135,10 @@ sorting process.) A code example appears in the package documentation
which you can browse to, from the link, below).
<dl>
-<dt><tt><i>bibtopic.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bibtopic.zip">macros/latex/contrib/bibtopic</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bibtopic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bibtopic/">browse</a>)
-<dt><tt><i>multibbl.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multibbl.zip">macros/latex/contrib/multibbl</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multibbl.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multibbl/">browse</a>)
-<dt><tt><i>multibib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multibib.zip">macros/latex/contrib/multibib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multibib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multibib/">browse</a>)
-<dt><tt><i>splitbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/splitbib.zip">macros/latex/contrib/splitbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/splitbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/splitbib/">browse</a>)
+<dt><tt><i>bibtopic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bibtopic.zip">macros/latex/contrib/bibtopic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bibtopic/">browse the directory</a>)
+<dt><tt><i>multibbl.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multibbl.zip">macros/latex/contrib/multibbl</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multibbl/">browse the directory</a>)
+<dt><tt><i>multibib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multibib.zip">macros/latex/contrib/multibib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multibib/">browse the directory</a>)
+<dt><tt><i>splitbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/splitbib.zip">macros/latex/contrib/splitbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/splitbib/">browse the directory</a>)
</dl>
<p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multbib">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multbib</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multfoot.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multfoot.html
index 0d2441aa7df..cea1dcc0dbd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multfoot.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multfoot.html
@@ -17,11 +17,11 @@ presentation options, as well. Another critical edition
its highly sophisticated structure of footnote facilities, which was
also designed to support typesetting critical editions.
<dl>
-<dt><tt><i>bigfoot</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bigfoot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bigfoot/">browse</a>)
-<dt><tt><i>edmac</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/edmac.zip">macros/plain/contrib/edmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/contrib/edmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/contrib/edmac/">browse</a>)
-<dt><tt><i>ednotes</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ednotes.zip">macros/latex/contrib/ednotes</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ednotes.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ednotes/">browse</a>)
-<dt><tt><i>ledmac</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ledmac/">browse</a>)
-<dt><tt><i>manyfoot.sty</i></tt><dd>Distributed as part of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ncctools.zip">macros/latex/contrib/ncctools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ncctools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ncctools/">browse</a>)
+<dt><tt><i>bigfoot</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot.zip">macros/latex/contrib/bigfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bigfoot/">browse the directory</a>)
+<dt><tt><i>edmac</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/edmac.zip">macros/plain/contrib/edmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/contrib/edmac/">browse the directory</a>)
+<dt><tt><i>ednotes</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ednotes.zip">macros/latex/contrib/ednotes</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ednotes/">browse the directory</a>)
+<dt><tt><i>ledmac</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac/">browse the directory</a>)
+<dt><tt><i>manyfoot.sty</i></tt><dd>Distributed as part of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ncctools.zip">macros/latex/contrib/ncctools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ncctools/">browse the directory</a>)
bundle
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multfoot">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multfoot</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multidoc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multidoc.html
index f5ee627147b..e729a4bbd0a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multidoc.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multidoc.html
@@ -41,14 +41,14 @@ optional argument of the command, you can specify which pages you want
to be included from the file named, and various details of the layout
of the included pages.
<dl>
-<dt><tt><i>combine.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/combine.zip">macros/latex/contrib/combine</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/combine.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/combine/">browse</a>)
-<dt><tt><i>combinet.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/combine.zip">macros/latex/contrib/combine</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/combine.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/combine/">browse</a>)
+<dt><tt><i>combine.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/combine.zip">macros/latex/contrib/combine</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/combine/">browse the directory</a>)
+<dt><tt><i>combinet.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/combine.zip">macros/latex/contrib/combine</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/combine/">browse the directory</a>)
<dt><tt><i>includex.sty</i></tt><dd>Distributed in the &ldquo;unsupported&rdquo; part of
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/frankenstein/">browse</a>)
-<dt><tt><i>moredefs.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/frankenstein/">browse</a>)
-<dt><tt><i>newclude.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/frankenstein.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/frankenstein/">browse</a>)
-<dt><tt><i>pdfpages.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdfpages.zip">macros/latex/contrib/pdfpages</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdfpages.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pdfpages/">browse</a>)
-<dt><tt><i>subfiles.cls, etc.</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/subfiles.zip">macros/latex/contrib/subfiles</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/subfiles.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/subfiles/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein/">browse the directory</a>)
+<dt><tt><i>moredefs.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein/">browse the directory</a>)
+<dt><tt><i>newclude.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein.zip">macros/latex/contrib/frankenstein</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/frankenstein/">browse the directory</a>)
+<dt><tt><i>pdfpages.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdfpages.zip">macros/latex/contrib/pdfpages</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdfpages/">browse the directory</a>)
+<dt><tt><i>subfiles.cls, etc.</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/subfiles.zip">macros/latex/contrib/subfiles</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/subfiles/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multidoc">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multidoc</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multind.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multind.html
index 8dad6c9943a..1c5d7a50083 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multind.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multind.html
@@ -114,12 +114,12 @@ the documentation.
well as its own index layout options, which other packages delegate to
the index style used by <i>makeindex</i>).
<dl>
-<dt><tt><i>index.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/index.zip">macros/latex/contrib/index</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/index.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/index/">browse</a>)
+<dt><tt><i>index.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/index.zip">macros/latex/contrib/index</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/index/">browse the directory</a>)
<dt><tt><i>makeidx.sty</i></tt><dd>Part of the LaTeX distribution
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>multind.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/misc/multind.sty">macros/latex209/contrib/misc/multind.sty</a>
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>multind.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex209/contrib/misc/multind.sty">macros/latex209/contrib/misc/multind.sty</a>
<dt><tt><i>splitidx.sty and splitindex</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/splitindex.zip">macros/latex/contrib/splitindex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/splitindex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/splitindex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/splitindex.zip">macros/latex/contrib/splitindex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/splitindex/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multind">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multind</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multirow.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multirow.html
index 4c651bfec35..a36fa952086 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multirow.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-multirow.html
@@ -91,8 +91,8 @@ rows in the multi-row have been opened up with <code>\</code><code>bigstrut</cod
<p/>The documentation of both <i>multirow</i> and <i>bigstrut</i> is
to be found, as comments, in the package files themselves.
<dl>
-<dt><tt><i>bigstrut.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multirow/">browse</a>)
-<dt><tt><i>multirow.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multirow/">browse</a>)
+<dt><tt><i>bigstrut.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow/">browse the directory</a>)
+<dt><tt><i>multirow.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multirow">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=multirow</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-music.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-music.html
index 5b29906117c..3c799ce6564 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-music.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-music.html
@@ -47,15 +47,15 @@ less cryptic than is MusixTeX&rsquo;s, and it handles much more stuff
automatically, yielding the same or better quality with less effort.
Lilypond can also produce basic MIDI output.
<dl>
-<dt><tt><i>abc2mtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/abc2mtex.zip">support/abc2mtex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/abc2mtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/abc2mtex/">browse</a>)
-<dt><tt><i>M-Tx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/mtx.zip">support/mtx</a> (<a href="ftp://cam.ctan.org/tex-archive/support/mtx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/mtx/">browse</a>)
-<dt><tt><i>midi2tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/midi2tex.zip">support/midi2tex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/midi2tex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/midi2tex/">browse</a>)
-<dt><tt><i>musictex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/musictex.zip">macros/musictex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/musictex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/musictex/">browse</a>)
+<dt><tt><i>abc2mtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/abc2mtex/">support/abc2mtex/</a>
+<dt><tt><i>M-Tx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/mtx.zip">support/mtx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/mtx/">browse the directory</a>)
+<dt><tt><i>midi2tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/midi2tex.zip">support/midi2tex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/midi2tex/">browse the directory</a>)
+<dt><tt><i>musictex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musictex.zip">macros/musictex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musictex/">browse the directory</a>)
-<dt><tt><i>musixtex (Taupin&rsquo;s version)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/musixtex/taupin.zip">macros/musixtex/taupin</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/musixtex/taupin.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/musixtex/taupin/">browse</a>)
-<dt><tt><i>musixtex (Egler&rsquo;s version)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/musixtex/egler.zip">macros/musixtex/egler</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/musixtex/egler.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/musixtex/egler/">browse</a>)
-<dt><tt><i>mutex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/mtex.zip">macros/mtex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/mtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/mtex/">browse</a>)
-<dt><tt><i>pmx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/pmx.zip">support/pmx</a> (<a href="ftp://cam.ctan.org/tex-archive/support/pmx.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/pmx/">browse</a>)
+<dt><tt><i>musixtex (Taupin&rsquo;s version)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musixtex/taupin.zip">macros/musixtex/taupin</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musixtex/taupin/">browse the directory</a>)
+<dt><tt><i>musixtex (Egler&rsquo;s version)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musixtex/egler.zip">macros/musixtex/egler</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/musixtex/egler/">browse the directory</a>)
+<dt><tt><i>mutex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/mtex.zip">macros/mtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/mtex/">browse the directory</a>)
+<dt><tt><i>pmx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pmx.zip">support/pmx</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pmx/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=music">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=music</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nameref.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nameref.html
index cc1f61d9071..4ac4c5e52fc 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nameref.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nameref.html
@@ -54,13 +54,13 @@ optional &lsquo;short&rsquo; title argument to the chapter and section commands.
(Although it comes from the same author, <i>zref</i> <em>doesn&rsquo;t</em>
define a short-name variant.)
<dl>
-<dt><tt><i>byname.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smartref.zip">macros/latex/contrib/smartref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smartref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/smartref/">browse</a>)
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>nameref.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>smartref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smartref.zip">macros/latex/contrib/smartref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/smartref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/smartref/">browse</a>)
-<dt><tt><i>titleref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/titleref.sty">macros/latex/contrib/misc/titleref.sty</a>
-<dt><tt><i>zref.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
+<dt><tt><i>byname.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smartref.zip">macros/latex/contrib/smartref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smartref/">browse the directory</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>nameref.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>smartref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smartref.zip">macros/latex/contrib/smartref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/smartref/">browse the directory</a>)
+<dt><tt><i>titleref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/titleref.sty">macros/latex/contrib/misc/titleref.sty</a>
+<dt><tt><i>zref.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nameref">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nameref</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newans.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newans.html
index 00b8df11947..ef30f7e75d9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newans.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newans.html
@@ -26,7 +26,7 @@ distribution: this isn&rsquo;t the code actually used on the Web site, but
it&rsquo;s a close relation and is kept
up to date for development purposes.
<dl>
-<dt><tt><i>FAQ distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (<a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/uk-tex-faq/">browse</a>)
+<dt><tt><i>FAQ distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newans">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newans</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newfunction.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newfunction.html
index 3e6065fe3b8..10bc3a4b4a3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newfunction.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newfunction.html
@@ -49,7 +49,7 @@ As with <code>\</code><code>DeclareMathOperator</code> there&rsquo;s a starred v
<p/>(It should be noted that &ldquo;log-like&rdquo; was reportedly a <em>joke</em> on
Lamport&rsquo;s part; it is of course clear what was meant.)
<dl>
-<dt><tt><i>amsopn.sty</i></tt><dd>In the AMSLaTeX distribution <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+<dt><tt><i>amsopn.sty</i></tt><dd>In the AMSLaTeX distribution <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newfunction">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newfunction</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newlang.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newlang.html
index 035348f0359..02178b00a16 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newlang.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-newlang.html
@@ -94,8 +94,8 @@ size is a fiddle. If you <em>do</em> find you&rsquo;ve run out of memory,
it may be worth scanning the list of languages in your
<i>language.dat</i> to see whether any could reasonably be removed.
<dl>
-<dt><tt><i>babel</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/babel.zip">macros/latex/required/babel</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/babel.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/babel/">browse</a>)
-<dt><tt><i>hyphenation patterns</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/language/hyphenation.zip">language/hyphenation</a> (<a href="ftp://cam.ctan.org/tex-archive/language/hyphenation.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/language/hyphenation/">browse</a>)
+<dt><tt><i>babel</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/babel.zip">macros/latex/required/babel</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/babel/">browse the directory</a>)
+<dt><tt><i>hyphenation patterns</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/language/hyphenation.zip">language/hyphenation</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/language/hyphenation/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newlang">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=newlang</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nocitestar.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nocitestar.html
index 3e0337627c9..edc1d6231d9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nocitestar.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nocitestar.html
@@ -24,8 +24,8 @@ was written for use under LaTeX 2.09, but seems to work well enough;
in the old days of LaTeX systems with very little free memory; this
problem is less significant now than it once was.)
<dl>
-<dt><tt><i>biblist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/biblist.zip">macros/latex209/contrib/biblist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/biblist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex209/contrib/biblist/">browse</a>)
-<dt><tt><i>listbib.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/listbib.zip">macros/latex/contrib/listbib</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/listbib.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/listbib/">browse</a>)
+<dt><tt><i>biblist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/biblist.zip">macros/latex209/contrib/biblist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/biblist/">browse the directory</a>)
+<dt><tt><i>listbib.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/listbib.zip">macros/latex/contrib/listbib</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/listbib/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nocite*">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nocite*</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nofm.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nofm.html
index 311acf2188a..c8f0a7a9736 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nofm.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nofm.html
@@ -13,8 +13,8 @@ defines a &ldquo;last page&rdquo; label.
how one might actually use this information to produce page numbering
as suggested in the question.
<dl>
-<dt><tt><i>fancyhdr documentation</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyhdr/">browse</a>)
-<dt><tt><i>lastpage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lastpage.zip">macros/latex/contrib/lastpage</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/lastpage.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/lastpage/">browse</a>)
+<dt><tt><i>fancyhdr documentation</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr/">browse the directory</a>)
+<dt><tt><i>lastpage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lastpage.zip">macros/latex/contrib/lastpage</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/lastpage/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nofm">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nofm</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nohyph.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nohyph.html
index 793582fa4f6..5e2b57939c7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nohyph.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nohyph.html
@@ -59,7 +59,7 @@ choice of hyphenation (ana-lysis is the British etymological
hyphenation; some feel the American hyphenation feels
&lsquo;unfortunate&rsquo;...).
<dl>
-<dt><tt><i>hyphenat.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyphenat.zip">macros/latex/contrib/hyphenat</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyphenat.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyphenat/">browse</a>)
+<dt><tt><i>hyphenat.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyphenat.zip">macros/latex/contrib/hyphenat</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyphenat/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nohyph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nohyph</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noline.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noline.html
index cd7e610c6c2..db215606036 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noline.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noline.html
@@ -76,8 +76,8 @@ be had by saying:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>expdlist.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/expdlist.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/expdlist/">browse</a>)
-<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
+<dt><tt><i>expdlist.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist.zip">macros/latex/contrib/expdlist</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/expdlist/">browse the directory</a>)
+<dt><tt><i>mdwlist.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
</dl>
<p/>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=noline">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=noline</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonfree.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonfree.html
index 4c62ea60570..97507d39d63 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonfree.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonfree.html
@@ -1,7 +1,7 @@
<head>
<title>UK TeX FAQ -- question label nonfree</title>
</head><body>
-<h3>What&rsquo;s the CTAN <code>nonfree</code> tree?</h3>
+<h3>What is the CTAN <code>nonfree</code> tree?</h3>
<p/>When CTAN was founded, in the 1990s, it was unusual to publish
the terms under which a TeX-related package was distributed (or, at
any rate, to publish those terms formally).
@@ -18,7 +18,7 @@ were candidates for distribution, and those that were in some sense
under which a package would be placed on the tree were hotly
contested, and the CTAN team were only able slowly to populate
the tree. It is now obvious to the team that the project would never
-be completed.
+have been completed.
<p/>The CTAN catalogue now records the nature of the licences of a
good proportion of the packages it describes (though there remain
several for which the licence is unknown, which is as good, for the
@@ -30,37 +30,21 @@ the general rule for distributors has become
whether you should distribute; if the package is not listed in the
catalogue, don&rsquo;t think of distributing it&rdquo;.
</blockquote><p>
-<p/>(The catalogue only has a modest
-<a href="http://www.tex.ac.uk/tex-archive/help/Catalogue/licenses.html">list of licences</a>, but it covers the set used
+(The catalogue only has a modest
+<a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/Catalogue/licenses.html">list of licences</a>, but it covers the set used
by packages on CTAN, with a wild-card &ldquo;<code>other-free</code>&rdquo;
which covers packages that the CTAN administrators believe to
be free even though the authors haven&rsquo;t used a standard licence.)
+<p/>There is a corollary to the &lsquo;general rule&rsquo;: if you notice something
+that ought to be in the distributions, for which there is no catalogue
+entry, please let the CTAN team (<a href="mailto:ctan@dante.de"><i>ctan@dante.de</i></a>) know.
+It may well be that the package has simply been missed, but some aren&rsquo;t
+catalogued because there&rsquo;s no documentation and the team just doesn&rsquo;t
+understand the package.
<p/>In the light of the above, the <code>nonfree</code> tree is being
-dismantled, and its contents moved to the main CTAN tree. So
-the answer to the question is, now, &ldquo;the nonfree tree is a part of
-CTAN, and is now being merged with the main tree&rdquo;.
-<p/><p/>
-
-
-
-
-
-
-
-
-
-
-
-<p/>
-
-
-
-
-<p/>
-
-
-
-
-
+dismantled, and its contents moved (or moved <em>back</em>) to the main
+CTAN tree. So the answer to the question is, now, &ldquo;the
+nonfree tree is a part of CTAN, and is now being merged with
+the main tree&rdquo;.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonfree">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonfree</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonpdfsp.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonpdfsp.html
index aa63ddd54c5..9b284aedc42 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonpdfsp.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonpdfsp.html
@@ -30,8 +30,8 @@ decide to try PDFLaTeX, you <em>must</em> remove the <code>dvips</code> or
<code>dvipdfm</code> driver specification from the package options, and let the
system recognise which driver is needed.
<dl>
-<dt><tt><i>pdftricks.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdftricks.zip">macros/latex/contrib/pdftricks</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdftricks.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pdftricks/">browse</a>)
-<dt><tt><i>pstricks.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pstricks.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pstricks/">browse</a>)
+<dt><tt><i>pdftricks.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdftricks.zip">macros/latex/contrib/pdftricks</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdftricks/">browse the directory</a>)
+<dt><tt><i>pstricks.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks.zip">graphics/pstricks</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pstricks/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonpdfsp">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonpdfsp</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonum.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonum.html
index 74783f3351c..22040acfee4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonum.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nonum.html
@@ -40,9 +40,9 @@ incorporates <i>Times</i>-like mathematics, and a sans-serif face
based on <i>Helvetica</i>, but scaled to match <i>Times</i>
text rather better.
<dl>
-<dt><tt><i>calc.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>Examples for LaTeX Companion</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (<a href="ftp://cam.ctan.org/tex-archive/info/examples/tlc2.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/examples/tlc2/">browse</a>)
-<dt><tt><i>The psnfss bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/psnfss/">browse</a>)
+<dt><tt><i>calc.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>Examples for LaTeX Companion</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2.zip">info/examples/tlc2</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/examples/tlc2/">browse the directory</a>)
+<dt><tt><i>The psnfss bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonum">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nonum</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopagebrk.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopagebrk.html
index 714fe06c855..69ca8a59ea2 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopagebrk.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopagebrk.html
@@ -104,8 +104,8 @@ added to the page you&rsquo;re typesetting. It depends on the document
whether this looks impossibly awful or entirely acceptable, but the
command remains a useful item in the armoury.
<dl>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>needspace.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/needspace.sty">macros/latex/contrib/misc/needspace.sty</a>
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>needspace.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/needspace.sty">macros/latex/contrib/misc/needspace.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nopagebrk">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nopagebrk</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopageno.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopageno.html
index b755174cb2b..91dfc3e326e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopageno.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-nopageno.html
@@ -41,10 +41,10 @@ the resetting; so one can say
to have the same effect as the <code>gobble</code> trick, without
resetting the page number.
<dl>
-<dt><tt><i>nopageno</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle/nopageno.sty">macros/latex/contrib/carlisle/nopageno.sty</a>
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>scrpage2.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>nopageno</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/carlisle/nopageno.sty">macros/latex/contrib/carlisle/nopageno.sty</a>
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>scrpage2.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nopageno">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=nopageno</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noroom.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noroom.html
index a1f154fd3c2..df07fef5dac 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noroom.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-noroom.html
@@ -29,23 +29,48 @@ whose use is &ldquo;hidden&rdquo; in LaTeX; the limit on the number of
<p/>There is nothing that can directly be done about this error, as you can&rsquo;t
extend the number of available registers without extending TeX
itself.
- Of course, <a href="FAQ-etex.html">e-TeX</a> and <a href="FAQ-omegaleph.html">Omega</a>
+ Of course, <a href="FAQ-etex.html">e-TeX</a>, <a href="FAQ-omegaleph.html">Omega</a> and
+ <a href="FAQ-luatex.html">LuaTeX</a>
- both do this, as does <a href="FAQ-commercial.html">MicroPress Inc&rsquo;s VTeX</a>.
-<p/>The commonest way to encounter one of these error messages is to have
+all do this, as does <a href="FAQ-commercial.html">MicroPress Inc&rsquo;s VTeX</a>.
+<p/>One common way to encounter one of these error messages is to have
broken macros of some sort, or incorrect usage of macros (an example
is discussed in <a href="FAQ-epsf.html">epsf problems</a>).
<p/>However, sometimes one just <em>needs</em> more than TeX can offer,
and when this happens, you&rsquo;ve just got to work out a different way of
doing things. An example is the
<a href="FAQ-usepictex.html">difficulty of loading PicTeX with LaTeX</a>.
-In cases like PicTeX, it may be possible to use
-<a href="FAQ-etex.html">e-TeX</a> (all modern distributions provide it). The
-LaTeX package <i>etex</i> modifies the register allocation
-mechanism to make use of e-TeX&rsquo;s extended register sets (it&rsquo;s a
+The more modern drawing package, <i>pgf</i> with its higher-level
+interface <i>TikZ</i> is a common problem.
+<p/>In such cases, it is usually possible to use the
+<a href="FAQ-etex.html">e-TeX</a> extensions (all modern distributions provide
+them). The LaTeX package <i>etex</i> modifies the register allocation
+mechanism to make use of e-TeX&rsquo;s extended register sets.
+<i>Etex</i> is a
derivative of the Plain TeX macro file <i>etex.src</i>, which is
used in building the e-TeX Plain format; both files are part of the
-e-TeX distribution). Unfortunately, e-TeX doesn&rsquo;t help with
-<code>\</code><code>read</code> or <code>\</code><code>write</code> objects.
+e-TeX distribution and are available in current distributions.
+<p/>It is possible that, even with <i>etex</i> loaded, you still find
+yourself running out of things. Problems could be caused by packages
+that use large numbers of &ldquo;inserts&rdquo; (combinations of counter, box,
+dimension and skip registers, used for storing floats and footnotes).
+<i>Morefloats</i> does this, of course (naturally enough,
+allocating new floats), and footnote packages such as
+<i>manyfoot</i> and <i>bigfoot</i> (which uses <i>manyfoot</i>
+can also give problems. The <i>etex</i> allows you to deal with
+these things: the command <code>\</code><code>reserveinserts{</code><em>n</em><code>}</code> ensures there
+is room for &lt;<i>n</i>&gt; more inserts. (Hint: <i>morefloats</i> needs
+18 inserts, and <i>manyfoot</i> seems to be happy with 10
+reserved.) Load <i>etex</i> before any others, and reserve the
+inserts immediately:
+<blockquote>
+<pre>
+\documentclass[...]{...}
+\usepackage{etex}
+\reserveinserts{28}
+</pre>
+</blockquote><p>
+<p/>Unfortunately, e-TeX doesn&rsquo;t help with <code>\</code><code>read</code> or <code>\</code><code>write</code>
+objects (and neither will the <i>etex</i> package).
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=noroom">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=noroom</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-numbersets.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-numbersets.html
index 57edaa32534..c49e8968f3d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-numbersets.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-numbersets.html
@@ -2,21 +2,23 @@
<title>UK TeX FAQ -- question label numbersets</title>
</head><body>
<h3>Symbols for the number sets</h3>
-<p/>It is a good idea to have commands such as <code>\</code><code>R</code> for the real numbers and
+<p/>Mathematicians commonly use special lettering for the real numbers and
other standard number sets. Traditionally these were typeset in bold.
Because, in the ordinary course of events, mathematicians do not have
-access to bold chalk, they invented the special symbols that are now
-often used for <code>\</code><code>R</code>, <code>\</code><code>C</code>, <em>etc</em>. These symbols are known
-as &ldquo;blackboard bold&rdquo;. Before insisting on using them, consider
-whether going back to the old system of ordinary bold might not be
-acceptable (it is certainly simpler).
+access to bold chalk, they invented special symbols that are now
+often used for the number sets; these symbols are known as
+&ldquo;blackboard bold&rdquo; (or double-stroked fonts); in place of the heavier
+strokes of a bold font, (some) strokes of the letters are doubled.
+The minimum useful set is upper-case letters &lsquo;I&rsquo;, &lsquo;N&rsquo;, &lsquo;R&rsquo;, &lsquo;Q&rsquo; and
+&lsquo;Z&rsquo;; some fonts offer a figure &lsquo;1&rsquo; (for a unit matrix &mdash; not a number
+set at all).
<p/>A set of blackboard bold capitals is available in the AMS
<i>msbm</i> fonts (<i>msbm</i> is available at a range of
-design sizes, with names such as <i>msbm10</i>). The pair of font
+design sizes, with names such as <i>msbm10</i>). The pair of font
families (the other is called <i>msam</i>) have a large number of
-mathematical symbols to supplement the ones in the standard TeX
-distribution, and are available in Type 1 format with most modern
-distributions. Support files for using the fonts, both under
+mathematical symbols to supplement those provided in the Knuth&rsquo;s
+original TeX distribution, and are available in Type 1 format in
+modern distributions. Support files for using the fonts, both under
Plain TeX and LaTeX (packages <i>amssymb</i> and
<i>amsfonts</i>), are available. The font shape is a rather
austere sans, which many people don&rsquo;t like (though it captures the
@@ -34,6 +36,10 @@ comes from a package by Torsten Hilbrich.
and sans shapes, at a single weight, and is available both as Metafont
sources and as Type 1; the font covers the uppercase latin letters,
lowercase &lsquo;h&rsquo; and &rsquo;k&rsquo;, and the digit &lsquo;1&rsquo;.
+<p/>A document that shows the <i>bbm</i>, <i>bbold</i>,
+<i>doublestroke</i> and <i>msbm</i> fonts, so that you can get
+a feel for their appearance, is available (CTAN package
+<i>blackboard</i>).
<p/>An alternative source of Type 1 fonts with blackboard bold characters
may be found in the steadily increasing set of complete families, both
commercial and free, that have been prepared for use with (La)TeX
@@ -49,36 +55,38 @@ the digit &lsquo;1&rsquo;, and lower-case &lsquo;k&rsquo;.
<p/>The &ldquo;lazy person&rsquo;s&rdquo; blackboard bold macros:
<blockquote>
<pre>
-\newcommand{\R}{{\sf R\hspace*{-0.9ex}%
+\newcommand{\R}{{\textsf{R}\hspace*{-0.9ex}%
\rule{0.15ex}{1.5ex}\hspace*{0.9ex}}}
-\newcommand{\N}{{\sf N\hspace*{-1.0ex}%
+\newcommand{\N}{{\textsf{N}\hspace*{-1.0ex}%
\rule{0.15ex}{1.3ex}\hspace*{1.0ex}}}
-\newcommand{\Q}{{\sf Q\hspace*{-1.1ex}%
+\newcommand{\Q}{{\textsf{Q}\hspace*{-1.1ex}%
\rule{0.15ex}{1.5ex}\hspace*{1.1ex}}}
-\newcommand{\C}{{\sf C\hspace*{-0.9ex}%
+\newcommand{\C}{{\textsf{C}\hspace*{-0.9ex}%
\rule{0.15ex}{1.3ex}\hspace*{0.9ex}}}
</pre>
</blockquote><p>
are almost acceptable at normal size if the surrounding text is
-<i>cmr10</i>. However, they are not part of a proper maths font,
-and so do not work in sub- and superscripts. Moreover, the size and
-position of the vertical bar can be affected by the font of the
-surrounding text. As we&rsquo;ve seen, there are plenty of alternatives:
-don&rsquo;t try the macros, or anything similar using capital &lsquo;I&rsquo; (which
-looks even worse!).
+<i>cmr10</i> (the position of the vertical bar can be affected by
+the surrounding font). However, they are not part of a proper maths font,
+and do not work in sub- and superscripts. As we&rsquo;ve seen, there are
+plenty of alternatives: that mythical &ldquo;lazy&rdquo; person can inevitably
+do better than the macros, or anything similar using capital &lsquo;I&rsquo;
+(which looks even worse!). Voluntary (La)TeX effort has redefined
+the meaning of laziness (in this respect!).
<dl>
-<dt><tt><i>AMS support files (Plain)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/plaintex.zip">fonts/amsfonts/plaintex</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/plaintex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/plaintex/">browse</a>)
-<dt><tt><i>AMS support files (LaTeX)</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/latex.zip">fonts/amsfonts/latex</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/latex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/latex/">browse</a>)
-<dt><tt><i>AMS symbol fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/symbols.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/sources/symbols/">browse</a>)
-<dt><tt><i>AMS symbol fonts in Type 1 format</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
-<dt><tt><i>bbm fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/cm/bbm.zip">fonts/cm/bbm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/cm/bbm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/bbm/">browse</a>)
-<dt><tt><i>bbm macros</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bbm.zip">macros/latex/contrib/bbm</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/bbm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/bbm/">browse</a>)
-<dt><tt><i>bbold fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/bbold.zip">fonts/bbold</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/bbold.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/bbold/">browse</a>)
-<dt><tt><i>doublestroke fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/doublestroke.zip">fonts/doublestroke</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/doublestroke.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/doublestroke/">browse</a>)
-<dt><tt><i>fourier fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/fourier-GUT.zip">fonts/fourier-GUT</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/fourier-GUT.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/fourier-GUT/">browse</a>)
-<dt><tt><i>mathpazo fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/mathpazo.zip">fonts/mathpazo</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/mathpazo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/mathpazo/">browse</a>)
-<dt><tt><i>pxfonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/pxfonts.zip">fonts/pxfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/pxfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/pxfonts/">browse</a>)
-<dt><tt><i>txfonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/txfonts/">browse</a>)
+<dt><tt><i>AMS support files (Plain)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/plaintex.zip">fonts/amsfonts/plaintex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/plaintex/">browse the directory</a>)
+<dt><tt><i>AMS support files (LaTeX)</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/latex.zip">fonts/amsfonts/latex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/latex/">browse the directory</a>)
+<dt><tt><i>AMS symbol fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols.zip">fonts/amsfonts/sources/symbols</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/symbols/">browse the directory</a>)
+<dt><tt><i>AMS symbol fonts in Type 1 format</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
+<dt><tt><i>bbm fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/bbm.zip">fonts/cm/bbm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cm/bbm/">browse the directory</a>)
+<dt><tt><i>bbm macros</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bbm.zip">macros/latex/contrib/bbm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/bbm/">browse the directory</a>)
+<dt><tt><i>bbold fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/bbold.zip">fonts/bbold</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/bbold/">browse the directory</a>)
+<dt><tt><i>blackboard evaluation set</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/symbols/blackboard.zip">info/symbols/blackboard</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/symbols/blackboard/">browse the directory</a>)
+<dt><tt><i>doublestroke fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/doublestroke.zip">fonts/doublestroke</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/doublestroke/">browse the directory</a>)
+<dt><tt><i>fourier fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fourier-GUT.zip">fonts/fourier-GUT</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fourier-GUT/">browse the directory</a>)
+<dt><tt><i>mathpazo fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mathpazo.zip">fonts/mathpazo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mathpazo/">browse the directory</a>)
+<dt><tt><i>pxfonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/pxfonts.zip">fonts/pxfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/pxfonts/">browse the directory</a>)
+<dt><tt><i>txfonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=numbersets">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=numbersets</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddhyphen.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddhyphen.html
index c7190c78a0a..0f63242f90a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddhyphen.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddhyphen.html
@@ -15,7 +15,7 @@ found on CTAN (see
<a href="FAQ-newlang.html">&ldquo;using a new language&rdquo;</a> for instructions
on adding this new &ldquo;language&rdquo;).
<dl>
-<dt><tt><i>UK patterns</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/language/hyphenation/ukhyphen.tex">language/hyphenation/ukhyphen.tex</a>
+<dt><tt><i>UK patterns</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivelanguage/hyphenation/ukhyphen.tex">language/hyphenation/ukhyphen.tex</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=oddhyphen">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=oddhyphen</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddpage.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddpage.html
index 2640db821fe..c282f3ac0b1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddpage.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-oddpage.html
@@ -30,20 +30,15 @@ then examined (in a <i>hyperref</i>-safe way) to set a conditional
<i>memoir</i> class has the same command setting a conditional
<code>\</code><code>ifoddpage</code>. Of course, the <code>\</code><code>label</code> contributes to LaTeX&rsquo;s
&ldquo;Rerun to get cross-references right&rdquo; error messages...
-<p/>The (older) <i>chngpage</i> provides the same facilities (though it
-provides a <code>\</code><code>ifcpoddpage</code> command; <i>changepage</i> (whose
-functions are extracted from the author&rsquo;s <i>memoir</i> class) is the
-designated successor to <i>chngpage</i>.
<p/>The Koma-Script classes have an <code>addmargin*</code> environment
-that also provides the sorts of facilities that the <i>chngpage</i>
+that also provides the sorts of facilities that the <i>changepage</i>
offers. Koma-Script&rsquo;s supporting command is
<code>\</code><code>ifthispageodd{&lt;true&gt;}{&lt;false&gt;}</code> executes different things
depending on the page number.
<dl>
-<dt><tt><i>changepage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/changepage.sty">macros/latex/contrib/misc/changepage.sty</a>
-<dt><tt><i>chngpage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/chngpage.sty">macros/latex/contrib/misc/chngpage.sty</a>
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>changepage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/changepage.sty">macros/latex/contrib/misc/changepage.sty</a>
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=oddpage">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=oddpage</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ol-books.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ol-books.html
index 84a65fde319..ed4aae119f5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ol-books.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ol-books.html
@@ -7,7 +7,10 @@ the web, and until relatively recently this demand went un-answered.
<p/>The first to appear was Victor Eijkhout&rsquo;s excellent &ldquo;TeX by
Topic&rdquo; in 2001 (it had been published by Addison-Wesley, but was long
out of print). The book is now available on CTAN; it&rsquo;s not a
-beginner&rsquo;s tutorial but it&rsquo;s a fine reference.
+beginner&rsquo;s tutorial but it&rsquo;s a fine reference. It&rsquo;s also available,
+as a printed copy, via the on-line publishers
+<a href="http://www.lulu.com/content/2555607/">Lulu</a> (not quite free, of
+course, but not a <em>bad</em> deal...).
<p/>Addison-Wesley have also released the copyright of &ldquo;TeX for the
Impatient&rdquo; by Paul W. Abrahams, Karl Berry and Kathryn A. Hargreaves,
another book whose unavailability many have lamented. The authors
@@ -21,9 +24,9 @@ its day, but while it is now somewhat dated, it still has its uses,
and is a welcome addition to the list of on-line resources. A project
to update it is believed to be under way.
<dl>
-<dt><tt><i>Making TeX Work</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/makingtexwork/mtw-1.0.1-html.tar.gz">info/makingtexwork/mtw-1.0.1-html.tar.gz</a>
-<dt><tt><i>TeX by Topic</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/texbytopic.zip">info/texbytopic</a> (<a href="ftp://cam.ctan.org/tex-archive/info/texbytopic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/texbytopic/">browse</a>)
-<dt><tt><i>TeX for the Impatient</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/impatient.zip">info/impatient</a> (<a href="ftp://cam.ctan.org/tex-archive/info/impatient.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/info/impatient/">browse</a>)
+<dt><tt><i>Making TeX Work</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/makingtexwork/mtw-1.0.1-html.tar.gz">info/makingtexwork/mtw-1.0.1-html.tar.gz</a>
+<dt><tt><i>TeX by Topic</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/texbytopic.zip">info/texbytopic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/texbytopic/">browse the directory</a>)
+<dt><tt><i>TeX for the Impatient</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/impatient.zip">info/impatient</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/impatient/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ol-books">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ol-books</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-omegaleph.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-omegaleph.html
index f8a4d6d829f..95e0577fb15 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-omegaleph.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-omegaleph.html
@@ -9,25 +9,26 @@ provides many innovative concepts, notably including the &ldquo;translation
process&rdquo; that takes a character stream and transforms it according to
various processes that may be internally specified, or be a separate
program.
-<p/>While Omega showed a lot of promise at its mid-1990s announcement, its
-development was slow, and development was essentially dead by the time
+<p/>While Omega showed a lot of promise at its mid-1990s announcement,
+progress was slow, and development was essentially dead by the time
that one of the original developers withdrew (taking with him a bunch
of research students).
-<p/>Before that distressing event, a separate thread of development was
-started, to produce a program called Aleph
-, which merged the facilities of
+<p/>Before that distressing event, a separate thread of development had
+started, to produce a program
+called Aleph, which merged the facilities of
<a href="FAQ-etex.html">e-TeX</a> into a stable Omega codebase and added other
extensions. Aleph also proved an attractive platform for many people;
but its development, too, has dried up.
-<p/>The latest news (from EuroTeX 2006) is that development of Omega is
-picking up again, in parallel with research into what the (new)
-authors consider a rational scheme for supporting TeX-style
-typesetting. The new system is to be known as Omega-2
-(Omega subscript 2), and is being
+<p/>A presentation at EuroTeX 2006 claimed that development of Omega
+was picking up again, in parallel with research into what the (new)
+developers consider a rational scheme for supporting TeX-style
+typesetting. The new system was to be known as Omega-2
+(Omega subscript 2), and was to be
designed in a modular fashion so that support of new facilities (such
-as use of advanced OpenType fonts) can be added in a relatively
-straightforward fashion.
-<p/>The work done in the Aleph project is also being carried forward in
-the <a href="FAQ-luatex.html">LuaTeX</a> project.
+as use of advanced OpenType fonts) could be added in a relatively
+straightforward fashion. A quick web search leads to a recommendation
+that potential users consider <a href="FAQ-luatex.html">LuaTeX</a> instead.
+Fortunately, lessons learned in Aleph project are being carried
+forward in the <a href="FAQ-luatex.html">LuaTeX</a> project.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=omegaleph">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=omegaleph</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-onecolabs.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-onecolabs.html
index 99f87bc3b2d..0ea836d3219 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-onecolabs.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-onecolabs.html
@@ -56,8 +56,8 @@ footnoting. They can be used like this:
</blockquote><p>
The <i>memoir</i> class offers all the facilities of <i>abstract</i>.
<dl>
-<dt><tt><i>abstract.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/abstract.zip">macros/latex/contrib/abstract</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/abstract.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/abstract/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>abstract.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/abstract.zip">macros/latex/contrib/abstract</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/abstract/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=onecolabs">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=onecolabs</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-osf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-osf.html
new file mode 100644
index 00000000000..52ac82cbca5
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-osf.html
@@ -0,0 +1,58 @@
+<head>
+<title>UK TeX FAQ -- question label osf</title>
+</head><body>
+<h3>Using &ldquo;old-style&rdquo; figures</h3>
+<p/>These numbers are also called medieval or lowercase figures and their
+use is mostly font-specific. Terminology is confusing since the
+lining figures (which are now the default) are a relatively recent
+development (19th century) and before they arrived, oldstyle figures
+were the norm, even when setting mathematics. (An example is Thomas
+Harriot&rsquo;s <em>Artis Analyticae Praxis</em> published in 1631). In a
+typical old style 3, 4, 5, 7 and 9 have descenders and 6 and 8 ascend
+above the x-height; sometimes 2 will also ascend (this last seems to
+be a variation associated with French typography).
+<p/>LaTeX provides a command <code>\</code><code>oldstylenums{</code><em>digits</em><code>}</code>, which
+by default uses an old-style set embedded in Knuth&rsquo;s &lsquo;math italic&rsquo;
+font. The command isn&rsquo;t sensitive to the font style of surrounding
+text: the glyphs are only available to match the normal medium weight
+Computer Modern Roman fonts.
+<p/>The <i>textcomp</i> package changes <code>\</code><code>oldstylenums</code> to use the
+glyphs in the Text Companion fonts (LaTeX TS1 encoding) when
+in text mode, and also makes them available using the macros of the
+form <code>\</code><code>text&lt;number&gt;oldstyle</code>, e.g., <code>\</code><code>textzerooldstyle</code>.
+(Of course, not all font families can provide this facility.)
+<p/>Some font packages (e.g., <i>mathpazo</i>) make old-style figures
+available and provide explicit support for making them the default:
+<code>\</code><code>usepackage[osf]{mathpazo}</code> selects a form where digits are
+always old-style in text. The <i>fontinst</i> package will
+automatically generate &ldquo;old-style versions&rdquo; of commercial Adobe Type
+1 font families for which &ldquo;expert&rdquo; sets are available.
+<p/>It&rsquo;s also possible to make virtual fonts, that offer old-style digits,
+from existing font packages. The <i>cmolddig</i> bundle provides
+a such a virtual version of Knuth&rsquo;s originals, and the <i>eco</i>
+or <i>hfoldsty</i> bundles both provide versions of the EC
+fonts. The <i>lm</i> family offers old-style figures to OpenType
+users (see below), but we have no stable mapping for <i>lm</i>
+with old-style digits from the Adobe Type 1 versions of the fonts.
+<p/>Originally, oldstyle figures were only to be found the expert sets of
+commercial fonts, but now they are increasingly widely available. An
+example is Matthew Carter&rsquo;s Georgia font, which has old-style figures
+as its normal form (the font was created for inclusion with certain
+Microsoft products and is intended for on-screen viewing).
+<p/>OpenType fonts have a pair of axes for number variations &mdash;
+proportional/tabular and lining/oldstyle selections are commonly
+available. &ldquo;Full feature access&rdquo; to OpenType fonts, making such
+options available to the (La)TeX user, is already supported by
+<a href="FAQ-xetex.html">XeTeX</a> using, for example, the <i>fontspec</i>
+package. Similar support is also in the works for
+<a href="FAQ-luatex.html">LuaTeX</a>.
+<dl>
+<dt><tt><i>cmolddig fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cmolddig.zip">fonts/cmolddig</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/cmolddig/">browse the directory</a>)
+<dt><tt><i>eco fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eco.zip">fonts/eco</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eco/">browse the directory</a>)
+<dt><tt><i>fontinst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst/">browse the directory</a>)
+<dt><tt><i>fontspec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xetex/latex/fontspec.zip">macros/xetex/latex/fontspec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xetex/latex/fontspec/">browse the directory</a>)
+<dt><tt><i>mathpazo fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mathpazo.zip">fonts/mathpazo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mathpazo/">browse the directory</a>)
+</dl>
+<p/>
+<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=osf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=osf</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-otherprinters.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-otherprinters.html
index 86dc97512a8..599e93559e0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-otherprinters.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-otherprinters.html
@@ -16,7 +16,7 @@ for the printer you actually have. If you are using a Unix system of
some sort, it&rsquo;s generally quite easy to insert <i>ghostscript</i>
into the print spooling process.
<dl>
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=otherprinters">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=otherprinters</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-outszwrng.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-outszwrng.html
deleted file mode 100644
index 9df037e476c..00000000000
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-outszwrng.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<head>
-<title>UK TeX FAQ -- question label outszwrng</title>
-</head><body>
-<h3>(La)TeX PDF output prints at wrong size</h3>
-<p/>Having got everything <em>else</em> right, you should be aware that the
-problem may have nothing to do with (La)TeX and everything to do
-with the program you use for printing. A regular cause for such
-problems lies with Acrobat Reader, which by default enables its option
-to scale pages to fit on the printable area of the paper. Since a
-printer can rarely print right to the edge, this means that pdf-files
-will be shrunk by some (small) factor (even if the pdf-file is
-formatted for A4, and your paper size is set to A4 as well).
-<p/>Correcting this silliness is not very hard, but the exact details
-depend on the version of Acrobat Reader (or "Adobe Reader" from
-version 6.0 onwards) you have installed:
-<ul>
-<li> Mac OS X, Adobe Reader 6:<br>
- in the print dialogue, on the &ldquo;copies &amp; pages&rdquo; pane, you&rsquo;ll find a
- popup menu titled &ldquo;Page Scaling&rdquo;. Make sure that the menu reads
- &ldquo;None&rdquo;.
-<li> Windows, Adobe Reader 6:<br>
- in the print dialogue, select &ldquo;None&rdquo; from the drop-down list
- &ldquo;Page Scaling&rdquo;.
-<li> Windows, Linux Acrobat (Reader) 5.0:<br>
- In the print dialog, make sure the &ldquo;Shrink oversized pages to fit&rdquo;
- checkbox is unchecked. It may also be useful to uncheck the
- &ldquo;Expand small pages to fit paper size&rdquo; checkbox as well.
-</ul>
-<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=outszwrng">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=outszwrng</a>
-</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overfull.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overfull.html
index b518a27bc39..9ca948128bd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overfull.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overfull.html
@@ -127,7 +127,7 @@ and how much to scale each font ... for the fonts the package
knows about; it&rsquo;s a good tool, and users who can take on the
specification of adjustments for yet more fonts are always welcome.
<dl>
-<dt><tt><i>microtype.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/microtype.zip">macros/latex/contrib/microtype</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/microtype.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/microtype/">browse</a>)
+<dt><tt><i>microtype.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/microtype.zip">macros/latex/contrib/microtype</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/microtype/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=overfull">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=overfull</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overstrike.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overstrike.html
index a167ee447d5..74571c32b9d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overstrike.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-overstrike.html
@@ -10,8 +10,8 @@ provide the necessary facilities.
by a different mechanism.
<p/>Documentation of <i>ulem</i> is in the package file.
<dl>
-<dt><tt><i>soul.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/soul/">browse</a>)
-<dt><tt><i>ulem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/ulem.sty">macros/latex/contrib/misc/ulem.sty</a>
+<dt><tt><i>soul.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul/">browse the directory</a>)
+<dt><tt><i>ulem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/ulem.sty">macros/latex/contrib/misc/ulem.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=overstrike">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=overstrike</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pagebychap.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pagebychap.html
index 6ab9fcfe881..802c17a1051 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pagebychap.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pagebychap.html
@@ -18,9 +18,8 @@ was written: it does the obvious things, and more.
<p/>Users have been known to ask for running page numbers within a
section, but this really doesn&rsquo;t make sense: you need to run page
numbers within document objects that always start on a fresh page.
-<p/>Documentation of <i>chappg</i> is to be found in the package file.
<dl>
-<dt><tt><i>chappg.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/chappg.zip">macros/latex/contrib/chappg</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/chappg.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/chappg/">browse</a>)
+<dt><tt><i>chappg.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/chappg.zip">macros/latex/contrib/chappg</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/chappg/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pagebychap">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pagebychap</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papergeom.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papergeom.html
index d02dc4cbce4..d9ec57144b7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papergeom.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papergeom.html
@@ -82,9 +82,9 @@ length registers <code>\</code><code>stockheight</code> and <code>\</code><code>
(for PDFLaTeX processing) then instruct the processor to produce
output that specifies the necessary paper size.
<dl>
-<dt><tt><i>geometry.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/geometry.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/geometry/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>typearea.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>geometry.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry.zip">macros/latex/contrib/geometry</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/geometry/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>typearea.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=papergeom">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=papergeom</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papersize.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papersize.html
index ab1fcabda32..60b3cb24ba9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papersize.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-papersize.html
@@ -28,7 +28,7 @@ expectations...
suite, that provides a detailed outline of the potential problems
together with a sample document and prototype outputs.
<dl>
-<dt><tt><i>testflow bundle</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
+<dt><tt><i>testflow bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=papersize">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=papersize</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parallel.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parallel.html
index b84159458b7..1c6f3a4255b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parallel.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parallel.html
@@ -50,10 +50,10 @@ setting carefully integrated with the needs of a scholarly text,
permitting translation, or notes, or both, to be set in parallel with
the &lsquo;base&rsquo; text of the document.
<dl>
-<dt><tt><i>ledpar.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ledmac.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ledmac/">browse</a>)
-<dt><tt><i>parallel.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/parallel.zip">macros/latex/contrib/parallel</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/parallel.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/parallel/">browse</a>)
-<dt><tt><i>parcolumns.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sauerj.zip">macros/latex/contrib/sauerj</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sauerj.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sauerj/">browse</a>)
-<dt><tt><i>pdfcolparallel.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
+<dt><tt><i>ledpar.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac.zip">macros/latex/contrib/ledmac</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ledmac/">browse the directory</a>)
+<dt><tt><i>parallel.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/parallel.zip">macros/latex/contrib/parallel</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/parallel/">browse the directory</a>)
+<dt><tt><i>parcolumns.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sauerj.zip">macros/latex/contrib/sauerj</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sauerj/">browse the directory</a>)
+<dt><tt><i>pdfcolparallel.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=parallel">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=parallel</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parskip.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parskip.html
index 2407453735b..61cf3c67f4c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parskip.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-parskip.html
@@ -29,8 +29,8 @@ with most problems.
equivalent (<i>rapport3</i>) whose design incorporates zero paragraph
indent and non-zero paragraph skip.
<dl>
-<dt><tt><i>NTG classes</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ntgclass/">browse</a>)
-<dt><tt><i>parskip.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/parskip.sty">macros/latex/contrib/misc/parskip.sty</a>
+<dt><tt><i>NTG classes</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass/">browse the directory</a>)
+<dt><tt><i>parskip.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/parskip.sty">macros/latex/contrib/misc/parskip.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=parskip">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=parskip</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-patch.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-patch.html
index 41ea39fc4c6..059f2bf68af 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-patch.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-patch.html
@@ -15,7 +15,7 @@ would naturally write:
</blockquote><p>
However, this would not work: a call to <code>\</code><code>splat</code> would execute
<code>\</code><code>mumble</code>, and the call the redefined <code>\</code><code>splat</code> again; this is an
-infinite recursive loop, that will quickly exhaust TeX&rsquo;s memory.
+unterminated recursion, that will quickly exhaust TeX&rsquo;s memory.
<p/>Fortunately, the TeX primitive <code>\</code><code>let</code> command comes to our
rescue; it allows us to take a &ldquo;snapshot&rdquo; of the current state of a
command, which we can then use in the redefinition of the command.
@@ -73,7 +73,12 @@ debugging tool.
programming facilities) provides a command <code>\</code><code>patchcmd</code> which will
perform a &ldquo;string substitution&rdquo; in a macro&rsquo;s definition. The
package also provides commands that prepend (<code>\</code><code>pretocmd</code>) or append
-(<code>\</code><code>apptocmd</code>) to the definition of a command.
+(<code>\</code><code>apptocmd</code>) to the definition of a command. Not all commands may
+be patched in this way; the package provides a command
+<code>\</code><code>ifpatchable</code> which checks the prerequisites, and checks that the
+target command&rsquo;s body does indeed include the patch string you propose
+to use. (The command <code>\</code><code>ifpatchable*</code> omits the test on the patch
+string.)
<p/>Finally, we&rsquo;ll briefly consider a package that is (just about)
usable, but not really recommendable. <i>Patch</i> gives you an
ingenious (and difficult to understand) mechanism, and comes as an
@@ -86,12 +91,12 @@ Fortunately, the file (<i>patch.doc</i>) may be input directly, and
Roughly speaking, one gives the command a set of instructions
analogous to <i>sed</i> substitutions, and it regenerates the
command thus amended. Unless you can&rsquo;t do your job any other way, you
-had probably best avoid <i>Patch</i>.
+had probably best avoid <i>patch</i>.
<dl>
-<dt><tt><i>etoolbox.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/etoolbox.zip">macros/latex/contrib/etoolbox</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/etoolbox.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/etoolbox/">browse</a>)
-<dt><tt><i>patch.doc</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/generic/misc/patch.doc">macros/generic/misc/patch.doc</a>
-<dt><tt><i>patchcommand.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/patchcmd.zip">macros/latex/contrib/patchcmd</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/patchcmd.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/patchcmd/">browse</a>)
-<dt><tt><i>ted.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ted.zip">macros/latex/contrib/ted</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ted.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ted/">browse</a>)
+<dt><tt><i>etoolbox.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/etoolbox.zip">macros/latex/contrib/etoolbox</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/etoolbox/">browse the directory</a>)
+<dt><tt><i>patch.doc</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/generic/misc/patch.doc">macros/generic/misc/patch.doc</a>
+<dt><tt><i>patchcommand.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/patchcmd.zip">macros/latex/contrib/patchcmd</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/patchcmd/">browse the directory</a>)
+<dt><tt><i>ted.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ted.zip">macros/latex/contrib/ted</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ted/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=patch">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=patch</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdf-fig-chars.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdf-fig-chars.html
new file mode 100644
index 00000000000..8d7487ad871
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdf-fig-chars.html
@@ -0,0 +1,41 @@
+<head>
+<title>UK TeX FAQ -- question label pdf-fig-chars</title>
+</head><body>
+<h3>Characters disappear from figures in PDFTeX</h3>
+<p/>You have a PDF figure, which you want to use in your
+PDFLaTeX document. When you compile the document, PDFTeX
+complains about &ldquo;missing glyphs&rdquo;, and some (or all) of the labelling
+text or symbols in the original figure is no longer visible.
+<p/>What has happened is:
+<ol>
+<li> Your figure file (say <i>fig.pdf</i>) has a font <i>font.pfb</i>
+ embedded in it.
+<li> PDFTeX notes that it has <i>font.pfb</i> on disc, and loads
+ that in place of the copy in <i>fig.pdf</i>.
+<li> It turns out that the copy in <i>fig.pdf</i> has glyphs that
+ aren&rsquo;t in <i>font.pfb</i> on disc, so that you get errors while
+ compiling and you see that characters are missing when you view the
+ output. (PDFTeX can&rsquo;t know that the fonts are different, since
+ they have the same name.)
+</ol>
+Which is all very undesirable.
+<p/>PDFTeX does this to keep file sizes down: suppose you have a
+document that loads figures <i>fig1.pdf</i> and <i>fig2.pdf</i>; both
+of those use font <i>font.pfb</i>. If PDFTeX takes no action,
+there will be <em>two</em> copies of <i>font.pfb</i> in the output.
+(If your document also uses the font, there could be three copies.)
+<p/>A real case is the URW font <i>NimbusRomNo9L-Regu</i> (a clone
+of Times Roman), which is available in a version with Cyrillic
+letters, while the version in TeX distributions doesn&rsquo;t have those
+letters. Both versions, as distributed, have the same name.
+<p/>The simple (&ldquo;quick and dirty&rdquo;) solution is to add the command
+<blockquote>
+ <code>\</code><code>pdfinclusioncopyfonts</code><code>=1</code>
+</blockquote><p>
+to the preamble of your document.
+<p/>The &ldquo;real&rdquo; solution is that one or other font should be renamed. In
+either case, this would require that you reconfigure some program&rsquo;s
+(TeX&rsquo;s or your drawing package&rsquo;s) font tables &mdash; inevitably a
+tiresome job.
+<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdf-fig-chars">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdf-fig-chars</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdfpagelabels.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdfpagelabels.html
index e217ac4db7f..afe786a8e73 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdfpagelabels.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdfpagelabels.html
@@ -30,7 +30,7 @@ an unnumbered title page, after which page numbers are reset: the
PDFTeX warning of &ldquo;<a href="FAQ-hyperdupdest.html">duplicate destinations</a>&rdquo;
will happen in this case, regardless of the options.
<dl>
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdfpagelabels">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdfpagelabels</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdftexgraphics.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdftexgraphics.html
index a82acae3585..69569e372a5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdftexgraphics.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pdftexgraphics.html
@@ -47,13 +47,13 @@ which is targeted at the use of <i>pstricks</i> in
PDFLaTeX, and also covers the <i>pstricks</i>-specific package
<i>pdftricks</i>.
<dl>
-<dt><tt><i>epstopdf</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/epstopdf/">support/epstopdf/</a>
+<dt><tt><i>epstopdf</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/epstopdf/">support/epstopdf/</a>
<dt><tt><i>epstopdf.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
-<dt><tt><i>pdftricks.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdftricks.zip">macros/latex/contrib/pdftricks</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pdftricks.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pdftricks/">browse</a>)
-<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pst-pdf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pst-pdf/">browse</a>)
-<dt><tt><i>pstoedit</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/pstoedit.zip">support/pstoedit</a> (<a href="ftp://cam.ctan.org/tex-archive/support/pstoedit.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/pstoedit/">browse</a>)
-<dt><tt><i>purifyeps</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/purifyeps.zip">support/purifyeps</a> (<a href="ftp://cam.ctan.org/tex-archive/support/purifyeps.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/purifyeps/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>pdftricks.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdftricks.zip">macros/latex/contrib/pdftricks</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pdftricks/">browse the directory</a>)
+<dt><tt><i>pst-pdf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf.zip">macros/latex/contrib/pst-pdf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pst-pdf/">browse the directory</a>)
+<dt><tt><i>pstoedit</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pstoedit.zip">support/pstoedit</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pstoedit/">browse the directory</a>)
+<dt><tt><i>purifyeps</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/purifyeps.zip">support/purifyeps</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/purifyeps/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdftexgraphics">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pdftexgraphics</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkfix.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkfix.html
index 71fcd491f40..5f92470c714 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkfix.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkfix.html
@@ -30,8 +30,8 @@ a try.
the PostScript it is distilling, and one option is to replace bitmap fonts
in the file with Type 1 versions.
<dl>
-<dt><tt><i>pkfix</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/pkfix.zip">support/pkfix</a> (<a href="ftp://cam.ctan.org/tex-archive/support/pkfix.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/pkfix/">browse</a>)
-<dt><tt><i>pkfix-helper</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/pkfix-helper.zip">support/pkfix-helper</a> (<a href="ftp://cam.ctan.org/tex-archive/support/pkfix-helper.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/pkfix-helper/">browse</a>)
+<dt><tt><i>pkfix</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pkfix.zip">support/pkfix</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pkfix/">browse the directory</a>)
+<dt><tt><i>pkfix-helper</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pkfix-helper.zip">support/pkfix-helper</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/pkfix-helper/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pkfix">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=pkfix</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkgdoc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkgdoc.html
index 31c10e1707f..ca4bdaa4a55 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkgdoc.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-pkgdoc.html
@@ -16,9 +16,9 @@ distributions, the <i>texdoc</i> command often helps, as in:
texdoc footmisc
</pre>
</blockquote><p>
-which opens a DVI viewer window showing documentation of the
+which opens a window showing documentation of the
<i>footmisc</i> package. According to the type of file
-<i>texdoc</i> finds, it will launch a DVI or PostScript viewer
+<i>texdoc</i> finds, it will launch a DVI viewer
or a PDF reader.
<p/>If <i>texdoc</i> can&rsquo;t find any documentation, it may launch a Web
browser to look at its copy of the CTAN catalogue. The
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-plainvltx.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-plainvltx.html
index ee2ed09f399..434e2c018a4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-plainvltx.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-plainvltx.html
@@ -7,11 +7,12 @@ by Plain TeX, and produce highly respectable documents using it
(Knuth is an example of this, of course). But equally, many people
are happy to let someone else take the design decisions for them,
accepting a small loss of flexibility in exchange for a saving of
-brain power.
+(mental) effort.
<p/>The arguments around this topic can provoke huge amounts of noise and
-heat, without offering much by way of light; your best bet is to find
-out what those around you are using, and to go with the crowd. Later
-on, you can always switch your allegiance; don&rsquo;t bother about it.
+heat, without offering much by way of light; your best bet may be to
+find out what those around you are using, and to follow them in the
+hope of some support. Later on, you can always switch your
+allegiance; don&rsquo;t bother about it.
<p/>If you are preparing a manuscript for a publisher or journal, ask them
what markup they want before you
develop your own; many big publishers have developed their own
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-poster.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-poster.html
index f94e4158f41..a7bce7e5a0f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-poster.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-poster.html
@@ -52,11 +52,11 @@ route):
but has hints which are generally useful.
</ul>
<dl>
-<dt><tt><i>a0poster.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/a0poster.zip">macros/latex/contrib/a0poster</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/a0poster.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/a0poster/">browse</a>)
-<dt><tt><i>flowfram.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/flowfram.zip">macros/latex/contrib/flowfram</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/flowfram.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/flowfram/">browse</a>)
-<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>sciposter.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sciposter.zip">macros/latex/contrib/sciposter</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sciposter.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sciposter/">browse</a>)
-<dt><tt><i>textpos.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textpos.zip">macros/latex/contrib/textpos</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/textpos.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">browse</a>)
+<dt><tt><i>a0poster.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/a0poster.zip">macros/latex/contrib/a0poster</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/a0poster/">browse the directory</a>)
+<dt><tt><i>flowfram.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/flowfram.zip">macros/latex/contrib/flowfram</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/flowfram/">browse the directory</a>)
+<dt><tt><i>multicol.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>sciposter.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sciposter.zip">macros/latex/contrib/sciposter</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sciposter/">browse the directory</a>)
+<dt><tt><i>textpos.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textpos.zip">macros/latex/contrib/textpos</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/textpos/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=poster">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=poster</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-previewers.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-previewers.html
index 85f53efa309..606aa9b70dc 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-previewers.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-previewers.html
@@ -26,7 +26,7 @@ include a version of <i>xdvik</i>.
<i>Acrobat</i> <i>Reader</i> or one of the substitutes for that.
</ul>
<dl>
-<dt><tt><i>xdvi</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/xdvi.zip">dviware/xdvi</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/xdvi.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/xdvi/">browse</a>)
+<dt><tt><i>xdvi</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivedviware/xdvi/">dviware/xdvi/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=previewers">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=previewers</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-proof.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-proof.html
index fcd2ef09876..aecf3b5318a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-proof.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-proof.html
@@ -32,8 +32,8 @@ The <code>\</code><code>tag*{<code>\</code><code>qedhere</code>}</code> construc
AMSLaTeX&rsquo;s numbering environments.
<dl>
<dt><tt><i>amsthm.sty</i></tt><dd>Distributed as part of the AMSLaTeX bundle
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
-<dt><tt><i>ntheorem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntheorem.zip">macros/latex/contrib/ntheorem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntheorem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ntheorem/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
+<dt><tt><i>ntheorem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntheorem.zip">macros/latex/contrib/ntheorem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntheorem/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=proof">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=proof</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-protect.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-protect.html
index dd0389f9118..15ae9918a62 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-protect.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-protect.html
@@ -79,7 +79,7 @@ current LaTeX mean that this is an expensive exercise. It remains
a long-term aim of the team to remove all need for <code>\</code><code>protect</code>ion.
<dl>
<dt><tt><i>makerobust.sty</i></tt><dd>Distributed with Heiko Oberdiek&rsquo;s packages
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=protect">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=protect</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psatempty.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psatempty.html
index 36d2b34284b..ec33fd35608 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psatempty.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psatempty.html
@@ -32,11 +32,11 @@ behaviour if the surrounding page style is &lsquo;empty&rsquo;.
&ldquo;<a href="FAQ-nopageno.html">no page numbers</a>&rdquo;.
</ul>
<dl>
-<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyhdr/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>nopageno.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle/nopageno.sty">macros/latex/contrib/carlisle/nopageno.sty</a>
-<dt><tt><i>scrpage2.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>nopageno.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/carlisle/nopageno.sty">macros/latex/contrib/carlisle/nopageno.sty</a>
+<dt><tt><i>scrpage2.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ps@empty">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ps@empty</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psfchoice.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psfchoice.html
index 290f4b4e55c..493d67bb0aa 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psfchoice.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-psfchoice.html
@@ -162,8 +162,9 @@ commercially, include:
set of files for use with LaTeX. The CM Bright fonts are
supplied in Type 1 format by MicroPress, Inc. The
<i>hfbright</i> bundle offers free Type 1 fonts for text using
- the OT1 encoding &mdash; the <i>cm-super</i> set for
- use with T1 texts doesn&rsquo;t (yet) offer support for mathematics.
+ the OT1 encoding &mdash; the <i>cm-super</i> fonts provide the
+ fonts in T1 text encoding but don&rsquo;t support CM bright
+ mathematics.
<p/>
For further details of Micropress&rsquo; offering (including samples) see<br>
<a href="http://www.micropress-inc.com/fonts/brmath/brmain.htm">http://www.micropress-inc.com/fonts/brmath/brmain.htm</a>
@@ -245,7 +246,7 @@ commercially, include:
The fonts are supported under both Plain TeX and LaTeX2e, and
are exclusively available for purchase from
<a href="FAQ-commercial.html">Personal TeX Inc</a>.
- par
+ <br/>
For further details and samples and fliers, see
<a href="http://www.pctex.com/mtpro2.html">http://www.pctex.com/mtpro2.html</a>
@@ -378,33 +379,33 @@ Many service bureaus don&rsquo;t care as long as you present them with a finishe
print file (PostScript or PDF) for their output device.
<dl>
<dt><tt><i>CM family collection</i></tt><dd>
- Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
+ Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/cm/ps-type1/bluesky/">fonts/cm/ps-type1/bluesky/</a>
<dt><tt><i>AMS font collection</i></tt><dd>
- Browse <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
+ Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
<dt><tt><i>Belleek fonts</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/fonts/belleek/belleek.zip">fonts/belleek/belleek.zip</a>
-<dt><tt><i>CM-super collection</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/belleek/belleek.zip">fonts/belleek/belleek.zip</a>
+<dt><tt><i>CM-super collection</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>)
<dt><tt><i>eulervm.sty and supporting metrics</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/fonts/eulervm.zip">fonts/eulervm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/eulervm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/eulervm/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eulervm.zip">fonts/eulervm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/eulervm/">browse the directory</a>)
<dt><tt><i>fourier (including metrics and other support for utopia</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/fonts/fourier-GUT.zip">fonts/fourier-GUT</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/fourier-GUT.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/fourier-GUT/">browse</a>)
-<dt><tt><i>fouriernc</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/fouriernc.zip">fonts/fouriernc</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/fouriernc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/fouriernc/">browse</a>)
-<dt><tt><i>hfbright collection</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/hfbright.zip">fonts/ps-type1/hfbright</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/hfbright.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/hfbright/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fourier-GUT.zip">fonts/fourier-GUT</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fourier-GUT/">browse the directory</a>)
+<dt><tt><i>fouriernc</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fouriernc.zip">fonts/fouriernc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/fouriernc/">browse the directory</a>)
+<dt><tt><i>hfbright collection</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/hfbright.zip">fonts/ps-type1/hfbright</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/hfbright/">browse the directory</a>)
<dt><tt><i>hvmath (free bitmapped version)</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/fonts/micropress/hvmath.zip">fonts/micropress/hvmath</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/micropress/hvmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/micropress/hvmath/">browse</a>)
-<dt><tt><i>kpfonts family</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/kpfonts.zip">fonts/kpfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/kpfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/kpfonts/">browse</a>)
-<dt><tt><i>Lucida Bright/Math metrics</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/psfonts/bh/lucida.zip">fonts/psfonts/bh/lucida</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/psfonts/bh/lucida.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/psfonts/bh/lucida/">browse</a>)
-<dt><tt><i>Lucida PSNFSS support</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psnfssx/lucidabr.zip">macros/latex/contrib/psnfssx/lucidabr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/psnfssx/lucidabr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/psnfssx/lucidabr/">browse</a>)
-<dt><tt><i>MathDesign collection</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/fonts/mathdesign/">fonts/mathdesign/</a>
-<dt><tt><i>Maths Font Survey</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/Free_Math_Font_Survey/en/survey.pdf">info/Free_Math_Font_Survey/en/survey.pdf</a>
- (PDF) or <a href="ftp://cam.ctan.org/tex-archive/info/Free_Math_Font_Survey/en/survey.html">info/Free_Math_Font_Survey/en/survey.html</a> (HTML)
-<dt><tt><i>Minion Pro support</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/minionpro.zip">fonts/minionpro</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/minionpro.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/minionpro/">browse</a>)
-<dt><tt><i>MnSymbol family</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/mnsymbol.zip">fonts/mnsymbol</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/mnsymbol.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/mnsymbol/">browse</a>)
-<dt><tt><i>pxfonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/pxfonts.zip">fonts/pxfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/pxfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/pxfonts/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/micropress/hvmath.zip">fonts/micropress/hvmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/micropress/hvmath/">browse the directory</a>)
+<dt><tt><i>kpfonts family</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/kpfonts.zip">fonts/kpfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/kpfonts/">browse the directory</a>)
+<dt><tt><i>Lucida Bright/Math metrics</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/psfonts/bh/lucida.zip">fonts/psfonts/bh/lucida</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/psfonts/bh/lucida/">browse the directory</a>)
+<dt><tt><i>Lucida PSNFSS support</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psnfssx/lucidabr.zip">macros/latex/contrib/psnfssx/lucidabr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/psnfssx/lucidabr/">browse the directory</a>)
+<dt><tt><i>MathDesign collection</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/mathdesign/">fonts/mathdesign/</a>
+<dt><tt><i>Maths Font Survey</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/Free_Math_Font_Survey/en/survey.pdf">info/Free_Math_Font_Survey/en/survey.pdf</a>
+ (PDF) or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/Free_Math_Font_Survey/en/survey.html">info/Free_Math_Font_Survey/en/survey.html</a> (HTML)
+<dt><tt><i>Minion Pro support</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/minionpro.zip">fonts/minionpro</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/minionpro/">browse the directory</a>)
+<dt><tt><i>MnSymbol family</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mnsymbol.zip">fonts/mnsymbol</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mnsymbol/">browse the directory</a>)
+<dt><tt><i>pxfonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/pxfonts.zip">fonts/pxfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/pxfonts/">browse the directory</a>)
<dt><tt><i>tmmath (free bitmapped version)</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/fonts/micropress/tmmath.zip">fonts/micropress/tmmath</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/micropress/tmmath.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/micropress/tmmath/">browse</a>)
-<dt><tt><i>txfonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/txfonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/txfonts/">browse</a>)
-<dt><tt><i>utopia fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utopia.zip">fonts/utopia</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utopia.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utopia/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/micropress/tmmath.zip">fonts/micropress/tmmath</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/micropress/tmmath/">browse the directory</a>)
+<dt><tt><i>txfonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts.zip">fonts/txfonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/txfonts/">browse the directory</a>)
+<dt><tt><i>utopia fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utopia.zip">fonts/utopia</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utopia/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=psfchoice">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=psfchoice</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ragright.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ragright.html
index bdfdc625eaa..1468c85c57a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ragright.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ragright.html
@@ -22,7 +22,7 @@ transformations of the LaTeX kernel originals. The documentation
discusses the issues and explains the significance of the various
parameters of <i>ragged2e</i>&rsquo;s operation.
<dl>
-<dt><tt><i>ragged2e.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ms/">browse</a>)
+<dt><tt><i>ragged2e.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ragright">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ragright</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readML.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readML.html
index eb8f31c7835..b690216648e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readML.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readML.html
@@ -11,8 +11,8 @@ processor for XSL formatting objects, serialized as XML.
Sebastian Rahtz&rsquo;s PassiveTeX uses <i>xmltex</i> to
achieve this end.
<dl>
-<dt><tt><i>xmltex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/xmltex/base.zip">macros/xmltex/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/xmltex/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/xmltex/base/">browse</a>)
-<dt><tt><i>passivetex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/xmltex/contrib/passivetex.zip">macros/xmltex/contrib/passivetex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/xmltex/contrib/passivetex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/xmltex/contrib/passivetex/">browse</a>)
+<dt><tt><i>xmltex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xmltex/base.zip">macros/xmltex/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xmltex/base/">browse the directory</a>)
+<dt><tt><i>passivetex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xmltex/contrib/passivetex.zip">macros/xmltex/contrib/passivetex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/xmltex/contrib/passivetex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=readML">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=readML</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readtex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readtex.html
index 1968c6d11d9..1501bc21095 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readtex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-readtex.html
@@ -12,7 +12,7 @@ systems are available, free, for most sorts of computer; the bad news
is that you need a pretty complete TeX system even to read a single
file, and complete TeX systems are pretty large.
<p/>TeX is a typesetting system that arose from a publishing project (see
-<a href="FAQ-whatTeX.html">what is TeX</a>),
+&ldquo;<a href="FAQ-whatTeX.html">what is TeX</a>&rdquo;),
and its basic source is available free from its author. However, at
its root, it is <em>just</em> a typesetting engine: even to view or to
print the typeset output, you will need ancillary programs. In short,
@@ -27,7 +27,7 @@ or
<p/>But beware &mdash; TeX makes no attempt to look like the sort of
WYSIWYG system you&rsquo;re probably used to (see
-<a href="FAQ-notWYSIWYG.html">why is TeX not WYSIWYG</a>):
+&ldquo;<a href="FAQ-notWYSIWYG.html">why is TeX not WYSIWYG</a>&rdquo;):
while many modern versions of TeX have a compile&ndash;view cycle that
rivals the best commercial word processors in its responsiveness, what
you type is usually <em>markup</em>, which typically defines a logical
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reallyblank.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reallyblank.html
index 47a0a9fe574..dc398f1dabe 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reallyblank.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reallyblank.html
@@ -52,10 +52,10 @@ being an equivalent of <code>\</code><code>cleardoublepage</code>). One can ach
commands will also serve if you want the surreal effect of &ldquo;This page
intentionally left blank&rdquo; in the centre of an otherwise empty page.
<dl>
-<dt><tt><i>fancyhdr</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyhdr/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>nextpage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/nextpage.sty">macros/latex/contrib/misc/nextpage.sty</a>
-<dt><tt><i>scrbook.cls, scrrept.cls</i></tt><dd>Part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>fancyhdr</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>nextpage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/nextpage.sty">macros/latex/contrib/misc/nextpage.sty</a>
+<dt><tt><i>scrbook.cls, scrrept.cls</i></tt><dd>Part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=reallyblank">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=reallyblank</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-recovertex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-recovertex.html
index 9d9ae11ad33..7cab595fe98 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-recovertex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-recovertex.html
@@ -42,11 +42,11 @@ also arise from the oddity of typical TeX font encodings (notably
those of the maths fonts), which <i>Acrobat</i> doesn&rsquo;t know how
to map to its standard Unicode representation.
<dl>
-<dt><tt><i>catdvi</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/catdvi.zip">dviware/catdvi</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/catdvi.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/catdvi/">browse</a>)
-<dt><tt><i>crudetype</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/crudetype.zip">dviware/crudetype</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/crudetype.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/crudetype/">browse</a>)
-<dt><tt><i>dvi2tty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2tty.zip">dviware/dvi2tty</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2tty.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvi2tty/">browse</a>)
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
-<dt><tt><i>xpdf</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/xpdf/">support/xpdf/</a>
+<dt><tt><i>catdvi</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/catdvi.zip">dviware/catdvi</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/catdvi/">browse the directory</a>)
+<dt><tt><i>crudetype</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/crudetype.zip">dviware/crudetype</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/crudetype/">browse the directory</a>)
+<dt><tt><i>dvi2tty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2tty.zip">dviware/dvi2tty</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2tty/">browse the directory</a>)
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>xpdf</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/xpdf/">support/xpdf/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=recovertex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=recovertex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ref-doc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ref-doc.html
index 6b55c4319d0..1e1ae0d85b3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ref-doc.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-ref-doc.html
@@ -12,12 +12,22 @@ link for each control sequence, that leads you to a detailed
description, which includes page references to the TeXbook.
<p/>There doesn&rsquo;t seem to be a reference that takes in Plain TeX as
well as the primitive commands.
+<p/>An interesting LaTeX &ldquo;cheat sheet&rdquo; is available from CTAN:
+it&rsquo;s a list of (more or less) everything you &lsquo;ought to&rsquo; remember, for
+basic LaTeX use. (It&rsquo;s laid out very compactly for printing on N.\
+American &lsquo;letter&rsquo;; printed on ISO A4, it strains aged eyes...)
<p/>Similarly, there&rsquo;s no completely reliable command-organised reference
-to LaTeX, but the NASA
+to LaTeX. The page (provided by NASA)
<a href="http://www.giss.nasa.gov/latex/">Hypertext Help with LaTeX</a> is
recently much improved. It still talks in LaTeX 2.09-isms in places,
-but it&rsquo;s been updated for current LaTeX; there are a number of
+but it&rsquo;s been updated for current LaTeX. There are a number of
mirrors of the site, and it may be worth choosing a &ldquo;local&rdquo; one if
you&rsquo;re going to use it a lot.
+<p/>Another LaTeX2e reference (provided by the Emerson Center of Emory
+University) is:
+<a href="http://www.emerson.emory.edu/services/latex/latex2e/latex2e_toc.html">LaTeXe help</a>
+<dl>
+<dt><tt><i>Cheat sheet</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/latexcheat/latexcheat/latexsheet.pdf">info/latexcheat/latexcheat/latexsheet.pdf</a>
+</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ref-doc">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=ref-doc</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repeatgrf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repeatgrf.html
index 8689aa5a640..f63d981ebfa 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repeatgrf.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repeatgrf.html
@@ -59,7 +59,7 @@ objects whether or not the PostScript has them amalgamated. PDFTeX does
the same job with graphics, automatically converting multiple uses
into references to graphics objects.
<dl>
-<dt><tt><i>graphicx-psmin.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/graphicx-psmin.zip">macros/latex/contrib/graphicx-psmin</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/graphicx-psmin.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/graphicx-psmin/">browse</a>)
+<dt><tt><i>graphicx-psmin.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/graphicx-psmin.zip">macros/latex/contrib/graphicx-psmin</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/graphicx-psmin/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=repeatgrf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=repeatgrf</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repfootnote.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repfootnote.html
index ae3ebeb8d5f..2ddf23e2dd4 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repfootnote.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-repfootnote.html
@@ -77,9 +77,9 @@ The package ensures that the repeated text appears at most once per
page: it will usually take more than one run of LaTeX to get rid of
the repeats.
<dl>
-<dt><tt><i>fixfoot.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fixfoot.zip">macros/latex/contrib/fixfoot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fixfoot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fixfoot/">browse</a>)
-<dt><tt><i>footmisc.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footmisc/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>fixfoot.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fixfoot.zip">macros/latex/contrib/fixfoot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fixfoot/">browse the directory</a>)
+<dt><tt><i>footmisc.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=repfootnote">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=repfootnote</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-replstdcls.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-replstdcls.html
index 2588d3fcc3f..7bec8911b26 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-replstdcls.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-replstdcls.html
@@ -28,10 +28,10 @@ and German (<i>scrguien</i> in the distribution for English,
spoken of, and its lengthy introductory section is regularly
recommended as a tutorial on typesetting.
<dl>
-<dt><tt><i>KOMA-script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>NTGclass bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntgclass.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ntgclass/">browse</a>)
-<dt><tt><i>sober.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/misc/sober.sty">macros/latex209/contrib/misc/sober.sty</a>
+<dt><tt><i>KOMA-script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>NTGclass bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass.zip">macros/latex/contrib/ntgclass</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntgclass/">browse the directory</a>)
+<dt><tt><i>sober.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex209/contrib/misc/sober.sty">macros/latex209/contrib/misc/sober.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=replstdcls">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=replstdcls</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rerun.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rerun.html
index 47c99b6788f..a4667839a70 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rerun.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rerun.html
@@ -25,8 +25,8 @@ can obviously not terminate.
document (something as small as adding or deleting a comma will often
be enough).
<dl>
-<dt><tt><i>footmisc.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/footmisc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/footmisc/">browse</a>)
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
+<dt><tt><i>footmisc.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc.zip">macros/latex/contrib/footmisc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/footmisc/">browse the directory</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=rerun">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=rerun</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-resolns.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-resolns.html
index f4e5bcebd24..633c4c3bac0 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-resolns.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-resolns.html
@@ -1,7 +1,7 @@
<head>
<title>UK TeX FAQ -- question label resolns</title>
</head><body>
-<h3>What are &ldquo;resolutions&rdquo;</h3>
+<h3>What are &ldquo;resolutions&rdquo;?</h3>
<p/>&ldquo;Resolution&rdquo; is a word that is used with little concern for its
multiple meanings, in computer equipment marketing. The word suggests
a measure of what an observer (perhaps the human eye) can resolve; yet
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reuseq.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reuseq.html
index 67f62f82ec1..46368c078b7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reuseq.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-reuseq.html
@@ -29,9 +29,9 @@ first instance.
at <a href="ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf">ftp://ftp.ams.org/pub/tex/doc/amsmath/amsldoc.pdf</a>
<dl>
<dt><tt><i>amsldoc.tex</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
<dt><tt><i>amsmath.sty</i></tt><dd>Distributed as part of AMSLaTeX
- <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=reuseq">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=reuseq</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rulethk.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rulethk.html
index 2f56abae1b7..469e996c22a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rulethk.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-rulethk.html
@@ -45,8 +45,8 @@ horizontal rules, and if their lack of configurability makes them
still less attractive, so much the better for the design of your
document.
<dl>
-<dt><tt><i>booktabs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/booktabs/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>booktabs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=rulethk">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=rulethk</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-run-fn-nos.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-run-fn-nos.html
index 452c465d1d5..535690ab9df 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-run-fn-nos.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-run-fn-nos.html
@@ -19,7 +19,7 @@ variant; the code:
</blockquote><p>
is all you need
<dl>
-<dt><tt><i>chngcntr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
+<dt><tt><i>chngcntr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=run-fn-nos">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=run-fn-nos</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-runheadtoobig.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-runheadtoobig.html
index dd45e61d98b..598c6c22cb2 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-runheadtoobig.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-runheadtoobig.html
@@ -75,10 +75,10 @@ example:
As a result, it is always possible for users of <i>memoir</i> to
tailor the header text to fit, with very little trouble.
<dl>
-<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyhdr.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyhdr/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>titlesec.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/titlesec/">browse</a>)
+<dt><tt><i>fancyhdr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr.zip">macros/latex/contrib/fancyhdr</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyhdr/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>titlesec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec/">browse the directory</a>)
</dl>
<p/>
<p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=runheadtoobig">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=runheadtoobig</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-running-nos.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-running-nos.html
index 35460003b8b..61fee569b15 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-running-nos.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-running-nos.html
@@ -68,12 +68,12 @@ numbered per chapter, try:
</blockquote><p>
(the command <code>\</code><code>@addtoreset</code> is a part of LaTeX itself).
<dl>
-<dt><tt><i>chngcntr.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>removefr.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fragments/removefr.tex">macros/latex/contrib/fragments/removefr.tex</a> (note, this is constructed as a
+<dt><tt><i>chngcntr.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/chngcntr.sty">macros/latex/contrib/misc/chngcntr.sty</a>
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>removefr.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/fragments/removefr.tex">macros/latex/contrib/fragments/removefr.tex</a> (note, this is constructed as a
&ldquo;fragment&rdquo; for use within other packages: load by
<code>\</code><code>input{removefr}</code>)
-<dt><tt><i>remreset.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/carlisle.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/carlisle/">browse</a>)
+<dt><tt><i>remreset.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle.zip">macros/latex/contrib/carlisle</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/carlisle/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=running-nos">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=running-nos</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-scriptfonts.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-scriptfonts.html
index f0b21c4a397..8e5a7800b34 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-scriptfonts.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-scriptfonts.html
@@ -14,10 +14,9 @@ modern TeX distributions.
distribution.
<dt>RSFS<dd> The <i>mathrsfs</i> package uses a really fancy script
font (the name stands for &ldquo;Ralph Smith&rsquo;s Formal Script&rdquo;) which is
- already part of most modern TeX distributions. The package
+ already part of most modern TeX distributions (Type 1 versions of
+ the font are also provided, courtesy of Taco Hoekwater). The package
creates a new command <code>\</code><code>mathscr</code>.
-<p/> Type 1 versions of the font have been made available by Taco
- Hoekwater.
<dt>Zapf Chancery<dd> is the standard PostScript calligraphic font. There
is no package but you can easily make it available by means of the
command
@@ -37,19 +36,20 @@ modern TeX distributions.
<p/> Adobe Zapf Chancery (which the above examples use) is distributed in
any but the most basic PostScript printers. A substantially identical
font (to the extent that the same metrics may be used) is
- available from URW and is distributed with
- <i>ghostscript</i>.
+ available from URW, called URW Chancery L: it is distributed
+ with Ghostscript, and as part of the &ldquo;URW base35&rdquo; bundle, which is
+ available in most distributions.
</dl>
Examples of the available styles are available on CTAN.
<dl>
-<dt><tt><i>eucal.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/latex/eucal.sty">fonts/amsfonts/latex/eucal.sty</a>
-<dt><tt><i>euler fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/euler.zip">fonts/amsfonts/sources/euler</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/amsfonts/sources/euler.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/sources/euler/">browse</a>)
-<dt><tt><i>euler fonts, in Type 1 format</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/fonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
-<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/ghostscript/">support/ghostscript/</a>
-<dt><tt><i>mathrsfs.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/jknappen.zip">macros/latex/contrib/jknappen</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/jknappen.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/jknappen/">browse</a>)
-<dt><tt><i>rsfs fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/rsfs.zip">fonts/rsfs</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/rsfs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/rsfs/">browse</a>)
-<dt><tt><i>rsfs fonts, in Type 1 format</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/rsfs/ps-type1/hoekwater.zip">fonts/rsfs/ps-type1/hoekwater</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/rsfs/ps-type1/hoekwater.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/rsfs/ps-type1/hoekwater/">browse</a>)
-<dt><tt><i>Script font examples</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/symbols/math/scriptfonts.pdf">info/symbols/math/scriptfonts.pdf</a>
+<dt><tt><i>eucal.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/amsfonts/latex/eucal.sty">fonts/amsfonts/latex/eucal.sty</a>
+<dt><tt><i>euler fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/euler.zip">fonts/amsfonts/sources/euler</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/amsfonts/sources/euler/">browse the directory</a>)
+<dt><tt><i>euler fonts, in Type 1 format</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/amsfonts/ps-type1/">fonts/amsfonts/ps-type1/</a>
+<dt><tt><i>ghostscript</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ghostscript/">support/ghostscript/</a>
+<dt><tt><i>mathrsfs.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/jknappen.zip">macros/latex/contrib/jknappen</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/jknappen/">browse the directory</a>)
+<dt><tt><i>rsfs fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/rsfs.zip">fonts/rsfs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/rsfs/">browse the directory</a>)
+<dt><tt><i>Script font examples</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/symbols/math/scriptfonts.pdf">info/symbols/math/scriptfonts.pdf</a>
+<dt><tt><i>URW Chancery L</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/urw/base35.zip">fonts/urw/base35</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/urw/base35/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=scriptfonts">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=scriptfonts</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-seccntfmt.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-seccntfmt.html
index 76dcaabad19..22620f9e201 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-seccntfmt.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-seccntfmt.html
@@ -65,7 +65,7 @@ changes to section number presentation: <code>\</code><code>partformat</code>,
<code>\</code><code>chapterformat</code> and <code>\</code><code>othersectionlevelsformat</code>, but otherwise
their facilities are similar to those of &ldquo;raw&rdquo; LaTeX.
<dl>
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=seccntfmt">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=seccntfmt</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secindent.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secindent.html
index ae503fd40c2..c8bd1d44fc1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secindent.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secindent.html
@@ -9,7 +9,7 @@ The <i>indentfirst</i> package
suppresses the mechanism, so that the first paragraph is
indented.
<dl>
-<dt><tt><i>indentfirst.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>indentfirst.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secindent">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secindent</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secnumdep.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secnumdep.html
index e708dbdc7ef..2e9acd39ec6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secnumdep.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secnumdep.html
@@ -49,11 +49,11 @@ aren&rsquo;t numbered. The <i>memoir</i> class incorporates the facilities
of all three of the <i>abstract</i>, <i>tocbibind</i> and
<i>tocvsec2</i> packages.
<dl>
-<dt><tt><i>abstract.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/abstract.zip">macros/latex/contrib/abstract</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/abstract.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/abstract/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>tocbibind.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tocbibind/">browse</a>)
-<dt><tt><i>tocvsec2.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocvsec2.zip">macros/latex/contrib/tocvsec2</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocvsec2.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tocvsec2/">browse</a>)
+<dt><tt><i>abstract.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/abstract.zip">macros/latex/contrib/abstract</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/abstract/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>tocbibind.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind/">browse the directory</a>)
+<dt><tt><i>tocvsec2.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocvsec2.zip">macros/latex/contrib/tocvsec2</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocvsec2/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secnumdep">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secnumdep</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secthead.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secthead.html
index fd1d5e84288..eecfc7e25df 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secthead.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-secthead.html
@@ -52,16 +52,16 @@ to program alternative
<a href="http://zoonek.free.fr/LaTeX/LaTeX_samples_chapter/0.html">chapter heading styles</a>
and
<a href="http://zoonek.free.fr/LaTeX/LaTeX_samples_section/0.html">section heading styles</a>.
-The web pages are not useful to users unless they are willing to do
-their own LaTeX programming.
+The web pages provide programming examples, and expect users to adapt
+them to their own LaTeX use.
<dl>
-<dt><tt><i>anonchap.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/anonchap.sty">macros/latex/contrib/misc/anonchap.sty</a>
-<dt><tt><i>fncychap.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fncychap.zip">macros/latex/contrib/fncychap</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fncychap.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fncychap/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>sectsty.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sectsty.zip">macros/latex/contrib/sectsty</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sectsty.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sectsty/">browse</a>)
-<dt><tt><i>titlesec.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/titlesec/">browse</a>)
-<dt><tt><i>tocbibind.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tocbibind/">browse</a>)
+<dt><tt><i>anonchap.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/anonchap.sty">macros/latex/contrib/misc/anonchap.sty</a>
+<dt><tt><i>fncychap.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fncychap.zip">macros/latex/contrib/fncychap</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fncychap/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>sectsty.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sectsty.zip">macros/latex/contrib/sectsty</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sectsty/">browse the directory</a>)
+<dt><tt><i>titlesec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec/">browse the directory</a>)
+<dt><tt><i>tocbibind.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secthead">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=secthead</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-setURL.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-setURL.html
index c9e444ad6a8..7c9dbac727d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-setURL.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-setURL.html
@@ -27,9 +27,16 @@ representation is awful.
maths mode. It can produce (LaTeX-style) &lsquo;robust&rsquo; commands
(see <a href="FAQ-protect.html">use of <code>\</code><code>protect</code></a>) for use
- within moving arguments. Note that, because the operation is
- conducted in maths mode, spaces within the URL argument are
- ignored unless special steps are taken.
+ within moving arguments.
+<p/> The package ordinarily ignores spaces in the URL, but
+ unfortunately URLs that contain spaces do exist; to typeset
+ them, call the package with the <code>obeyspaces</code> option. Two
+ other useful options allow line breaks in the URL in places
+ where they are ordinarily suppressed to avoid confusion:
+ <code>spaces</code> to allow breaks at spaces (note, this requires
+ <code>obeyspaces</code> as well, and <code>hyphens</code> to allow
+ breaks after hyphens. (Note that the package <em>never</em> does
+ &ldquo;ordinary&rdquo; hyphenation of names inside an URL.)
<p/> It is possible to use the <i>url</i> package in Plain TeX,
with the assistance of the <i>miniltx</i> package (which was
originally developed for using the LaTeX graphics package in
@@ -63,10 +70,10 @@ after which, <code>\</code><code>faqhome</code> is robust.
<p/>Documentation of both package <i>path</i> and package <i>url</i>
is in the package files.
<dl>
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>miniltx.tex</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/graphics.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/graphics/">browse</a>)
-<dt><tt><i>path.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/path.sty">macros/latex/contrib/misc/path.sty</a>
-<dt><tt><i>url.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>miniltx.tex</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics.zip">macros/plain/graphics</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/graphics/">browse the directory</a>)
+<dt><tt><i>path.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/path.sty">macros/latex/contrib/misc/path.sty</a>
+<dt><tt><i>url.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=setURL">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=setURL</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slashbox.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slashbox.html
index a209eb2eb06..cd6c11f1b96 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slashbox.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slashbox.html
@@ -46,7 +46,7 @@ go from corner to corner in the box: to correct this requires revision
of <i>slashbox</i> &mdash; <i>pict2e</i> alone doesn&rsquo;t help in this
regard.)
<dl>
-<dt><tt><i>slashbox.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/slashbox.zip">macros/latex/contrib/slashbox</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/slashbox.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/slashbox/">browse</a>)
+<dt><tt><i>slashbox.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/slashbox.zip">macros/latex/contrib/slashbox</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/slashbox/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=slashbox">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=slashbox</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slidecls.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slidecls.html
index 2cec4a4dcc4..d4992bafcd8 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slidecls.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-slidecls.html
@@ -68,20 +68,20 @@ available, with examples, in
<a href="http://wiki.contextgarden.net/Presentation_Styles">http://wiki.contextgarden.net/Presentation_Styles</a>
<dl>
-<dt><tt><i>beamer.cls</i></tt><dd>Download all of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/beamer.zip">macros/latex/contrib/beamer</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/beamer.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/beamer/">browse</a>)
-<dt><tt><i>foils.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/foiltex.zip">macros/latex/contrib/foiltex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/foiltex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/foiltex/">browse</a>)
-<dt><tt><i>greybars.sty</i></tt><dd>distributed with <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/talk.zip">macros/latex/contrib/talk</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/talk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/talk/">browse</a>)
-<dt><tt><i>HA-prosper.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ha-prosper.zip">macros/latex/contrib/ha-prosper</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ha-prosper.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ha-prosper/">browse</a>)
+<dt><tt><i>beamer.cls</i></tt><dd>Download all of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/beamer.zip">macros/latex/contrib/beamer</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/beamer/">browse the directory</a>)
+<dt><tt><i>foils.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/foiltex.zip">macros/latex/contrib/foiltex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/foiltex/">browse the directory</a>)
+<dt><tt><i>greybars.sty</i></tt><dd>distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/talk.zip">macros/latex/contrib/talk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/talk/">browse the directory</a>)
+<dt><tt><i>HA-prosper.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ha-prosper.zip">macros/latex/contrib/ha-prosper</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ha-prosper/">browse the directory</a>)
-<dt><tt><i>seminar.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/seminar.zip">macros/latex/contrib/seminar</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/seminar.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/seminar/">browse</a>)
-<dt><tt><i>pgf.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.zip">graphics/pgf</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pgf.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pgf/">browse</a>)
-<dt><tt><i>powerdot.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/powerdot.zip">macros/latex/contrib/powerdot</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/powerdot.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/powerdot/">browse</a>)
-<dt><tt><i>pp4</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/ppower4.zip">support/ppower4</a> (<a href="ftp://cam.ctan.org/tex-archive/support/ppower4.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/ppower4/">browse</a>)
-<dt><tt><i>ppr-prv.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ppr-prv.zip">macros/latex/contrib/ppr-prv</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ppr-prv.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ppr-prv/">browse</a>)
-<dt><tt><i>prosper.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/prosper.zip">macros/latex/contrib/prosper</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/prosper.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/prosper/">browse</a>)
-<dt><tt><i>talk.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/talk.zip">macros/latex/contrib/talk</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/talk.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/talk/">browse</a>)
-<dt><tt><i>texpower</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/texpower.zip">macros/latex/contrib/texpower</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/texpower.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/texpower/">browse</a>)
-<dt><tt><i>xcolor.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xcolor.zip">macros/latex/contrib/xcolor</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xcolor.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/xcolor/">browse</a>)
+<dt><tt><i>seminar.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/seminar.zip">macros/latex/contrib/seminar</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/seminar/">browse the directory</a>)
+<dt><tt><i>pgf.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf.zip">graphics/pgf</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pgf/">browse the directory</a>)
+<dt><tt><i>powerdot.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/powerdot.zip">macros/latex/contrib/powerdot</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/powerdot/">browse the directory</a>)
+<dt><tt><i>pp4</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/ppower4.zip">support/ppower4</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/ppower4/">browse the directory</a>)
+<dt><tt><i>ppr-prv.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ppr-prv.zip">macros/latex/contrib/ppr-prv</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ppr-prv/">browse the directory</a>)
+<dt><tt><i>prosper.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/prosper.zip">macros/latex/contrib/prosper</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/prosper/">browse the directory</a>)
+<dt><tt><i>talk.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/talk.zip">macros/latex/contrib/talk</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/talk/">browse the directory</a>)
+<dt><tt><i>texpower</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/texpower.zip">macros/latex/contrib/texpower</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/texpower/">browse the directory</a>)
+<dt><tt><i>xcolor.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xcolor.zip">macros/latex/contrib/xcolor</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xcolor/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=slidecls">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=slidecls</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-spell.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-spell.html
index ae6333b3514..f43c7c08ef7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-spell.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-spell.html
@@ -21,16 +21,16 @@ some important features of LaTeX syntax.
called from within an editor, and <i>jspell</i> is an extended
version of <i>ispell</i>.
<dl>
-<dt><tt><i>4spell</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/4spell.zip">support/4spell</a> (<a href="ftp://cam.ctan.org/tex-archive/support/4spell.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/4spell/">browse</a>)
-<dt><tt><i>amspell</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/amspell.zip">support/amspell</a> (<a href="ftp://cam.ctan.org/tex-archive/support/amspell.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/amspell/">browse</a>)
-<dt><tt><i>aspell</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/support/aspell/">support/aspell/</a> &mdash; choose just those language
+<dt><tt><i>4spell</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/4spell.zip">support/4spell</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/4spell/">browse the directory</a>)
+<dt><tt><i>amspell</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/amspell.zip">support/amspell</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/amspell/">browse the directory</a>)
+<dt><tt><i>aspell</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/aspell/">support/aspell/</a> &mdash; choose just those language
dictionaries (under subdirectory <i>dict/</i>) that you need.
-<dt><tt><i>excalibur</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/mac/support/excalibur/Excalibur-4.0.2.sit.hqx">systems/mac/support/excalibur/Excalibur-4.0.2.sit.hqx</a>
-<dt><tt><i>ispell</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/ispell/ispell-3.2.06.tar.gz">support/ispell/ispell-3.2.06.tar.gz</a>
-<dt><tt><i>jspell</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/jspell.zip">support/jspell</a> (<a href="ftp://cam.ctan.org/tex-archive/support/jspell.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/jspell/">browse</a>)
+<dt><tt><i>excalibur</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/mac/support/excalibur/Excalibur-4.0.2.sit.hqx">systems/mac/support/excalibur/Excalibur-4.0.2.sit.hqx</a>
+<dt><tt><i>ispell</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/ispell/ispell-3.2.06.tar.gz">support/ispell/ispell-3.2.06.tar.gz</a>
+<dt><tt><i>jspell</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jspell.zip">support/jspell</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/jspell/">browse the directory</a>)
<dt><tt><i>VMS spell</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/support/vmspell.zip">support/vmspell</a> (<a href="ftp://cam.ctan.org/tex-archive/support/vmspell.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/vmspell/">browse</a>)
-<dt><tt><i>winedt</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/systems/win32/winedt/">systems/win32/winedt/</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/vmspell.zip">support/vmspell</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/vmspell/">browse the directory</a>)
+<dt><tt><i>winedt</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/winedt/">systems/win32/winedt/</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=spell">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=spell</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-splitfoot.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-splitfoot.html
index a88f7736c8a..2abec7eed21 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-splitfoot.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-splitfoot.html
@@ -38,7 +38,7 @@ one page.
<p/>The <i>fnbreak</i> package detects (and generates warnings about)
split footnotes.
<dl>
-<dt><tt><i>fnbreak.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fnbreak.zip">macros/latex/contrib/fnbreak</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fnbreak.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fnbreak/">browse</a>)
+<dt><tt><i>fnbreak.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fnbreak.zip">macros/latex/contrib/fnbreak</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fnbreak/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=splitfoot">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=splitfoot</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-srchpdf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-srchpdf.html
index 2ac60dbd765..f95bc5c506d 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-srchpdf.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-srchpdf.html
@@ -27,8 +27,8 @@ encoded, such as the <i>cm-super</i> distribution. Fonts like Adobe
Times Roman (which are encoded for (La)TeX use via virtual fonts)
are not amenable to this treatment.
<dl>
-<dt><tt><i>cmap.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cmap.zip">macros/latex/contrib/cmap</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cmap.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/cmap/">browse</a>)
-<dt><tt><i>cm-super fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>)
+<dt><tt><i>cmap.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cmap.zip">macros/latex/contrib/cmap</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cmap/">browse the directory</a>)
+<dt><tt><i>cm-super fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=srchpdf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=srchpdf</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-struttab.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-struttab.html
index 670afd22834..0b327116ca7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-struttab.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-struttab.html
@@ -69,11 +69,11 @@ packages such as <i>longtable</i>.
<p/>Documentation of both <i>bigstrut</i> and <i>tabls</i> may be
found as comments in the package files themselves.
<dl>
-<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>bigstrut.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/multirow.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/multirow/">browse</a>)
-<dt><tt><i>booktabs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/booktabs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/booktabs/">browse</a>)
-<dt><tt><i>cellspace.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cellspace.zip">macros/latex/contrib/cellspace</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/cellspace.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/cellspace/">browse</a>)
-<dt><tt><i>tabls.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/tabls.sty">macros/latex/contrib/misc/tabls.sty</a>
+<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>bigstrut.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow.zip">macros/latex/contrib/multirow</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/multirow/">browse the directory</a>)
+<dt><tt><i>booktabs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs.zip">macros/latex/contrib/booktabs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/booktabs/">browse the directory</a>)
+<dt><tt><i>cellspace.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cellspace.zip">macros/latex/contrib/cellspace</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/cellspace/">browse the directory</a>)
+<dt><tt><i>tabls.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/tabls.sty">macros/latex/contrib/misc/tabls.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=struttab">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=struttab</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-subsubsub.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-subsubsub.html
index b93f11eb629..a8220a44101 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-subsubsub.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-subsubsub.html
@@ -26,8 +26,8 @@ LaTeX distribution) and the source of the standard packages
(<i>classes.dtx</i>). The <a href="FAQ-books.html">LaTeX Companion</a>
discusses use of <code>\</code><code>@startsection</code> for this sort of thing.
<dl>
-<dt><tt><i>LaTeX source</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.zip">macros/latex/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/base/">browse</a>)
-<dt><tt><i>titlesec.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titlesec.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/titlesec/">browse</a>)
+<dt><tt><i>LaTeX source</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base.zip">macros/latex/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/base/">browse the directory</a>)
+<dt><tt><i>titlesec.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec.zip">macros/latex/contrib/titlesec</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titlesec/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=subsubsub">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=subsubsub</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-symbols.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-symbols.html
index 455acf5f569..719785c5fe5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-symbols.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-symbols.html
@@ -10,7 +10,7 @@ of which are not shown (or even mentioned) in (La)TeX books.
<em>The Comprehensive LaTeX Symbol List</em> (by Scott Pakin
<em>et al.</em>) illustrates over 2000 symbols, and details the
-commands and packages needed to produce them.
+commands and the LaTeX packages needed to produce them.
<p/>Other questions in this FAQ offer specific help on kinds of
symbols:
<ul>
@@ -19,7 +19,7 @@ symbols:
<li> <a href="FAQ-prinvalint.html">Typesetting the principal value integral</a>
</ul>
<dl>
-<dt><tt><i>Symbol List</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/info/symbols/comprehensive/">info/symbols/comprehensive/</a>; there are processed
+<dt><tt><i>Symbol List</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/symbols/comprehensive/">info/symbols/comprehensive/</a>; there are processed
versions in both PostScript and PDF forms for both A4 and
letter paper.
</dl>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabacc.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabacc.html
index 5b1e5fd09f1..fee3f89401c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabacc.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabacc.html
@@ -46,7 +46,7 @@ example would therefore become:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>Tabbing.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/Tabbing.zip">macros/latex/contrib/Tabbing</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/Tabbing.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/Tabbing/">browse</a>)
+<dt><tt><i>Tabbing.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/Tabbing.zip">macros/latex/contrib/Tabbing</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/Tabbing/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tabacc">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tabacc</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabcellalign.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabcellalign.html
index 5687db12009..928e19b1a20 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabcellalign.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tabcellalign.html
@@ -66,7 +66,7 @@ or in the preamble as:
</pre>
</blockquote><p>
<dl>
-<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tabcellalign">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tabcellalign</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds-zip.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds-zip.html
index bb2d5cbea86..20301b28e5f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds-zip.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds-zip.html
@@ -1,7 +1,7 @@
<head>
<title>UK TeX FAQ -- question label tds-zip</title>
</head><body>
-<h3>Prebuilt installation files on the archive</h3>
+<h3>Ready-built installation files on the archive</h3>
<p/>The <a href="FAQ-tds.html">TDS</a> is a simple structure, and almost all
files can be installed simply by putting them in the &ldquo;right&rdquo; place,
and updating a single index. (Note, this simple idea typically
@@ -10,10 +10,15 @@ doesn&rsquo;t work for fonts, unless they&rsquo;re distributed as Metafont sourc
which have a built-in directory structure that matches the TDS.
These files have to be built, and the CTAN team has asked that
package authors supply them (the team will advise, of course, if the
-author has trouble). Everyone hopes that the extra work involved will
-contrinute to happier lives for package users, which in turn must
-surely help keep the TeX community lively and active.
+author has trouble). The CTAN team hopes that the extra work
+involved will contribute to happier lives for package users, which in
+turn must surely help keep the TeX community lively and active.
+<p/>At the time of writing, there are rather few <code>.tds.zip</code>
+files (by comparison with the huge number of packages that are
+available). As packages are updated, the number of files is
+steadily increasing, but it will be a long time before the whole set
+is covered.
<p/>Use of the files is discussed in
-&ldquo;<a href="FAQ-inst-tds-zip.html">installing using preformatted ZIP files</a>&rdquo;.
+&ldquo;<a href="FAQ-inst-tds-zip.html">installing using ready-built ZIP files</a>&rdquo;.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds-zip">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds-zip</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds.html
index e02bfeab6fe..bcfcbc93c3a 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tds.html
@@ -29,7 +29,7 @@ You may browse an <a href="http://tug.org/tds/">on-line version</a> of the
standard, and copies in several other formats (including source) are
available on CTAN.
<dl>
-<dt><tt><i>TDS specification</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/tds.zip">tds</a> (<a href="ftp://cam.ctan.org/tex-archive/tds.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/tds/">browse</a>)
+<dt><tt><i>TDS specification</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/tds.zip">tds</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/tds/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texcad.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texcad.html
index 2a000e3c3b6..23f50dced73 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texcad.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texcad.html
@@ -13,8 +13,8 @@ the emTeX driver-family
TeXCAD is part of the emTeX distribution.
<p/>A Unix port of the program (<i>xtexcad</i>) has been made.
<dl>
-<dt><tt><i>emtex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/msdos/emtex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/msdos/emtex/">browse</a>)
-<dt><tt><i>xtexcad</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/nonfree/graphics/xtexcad/xtexcad-2.4.1.tar.gz">nonfree/graphics/xtexcad/xtexcad-2.4.1.tar.gz</a>
+<dt><tt><i>emtex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex.zip">systems/msdos/emtex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/msdos/emtex/">browse the directory</a>)
+<dt><tt><i>xtexcad</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivenonfree/graphics/xtexcad/xtexcad-2.4.1.tar.gz">nonfree/graphics/xtexcad/xtexcad-2.4.1.tar.gz</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texcad">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texcad</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texinfo.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texinfo.html
index d7149ff4db7..cff7f094121 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texinfo.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texinfo.html
@@ -27,7 +27,7 @@ avoided.
<p/>Finally, of course, you can also print the files, or convert them to
PDF using PDFTeX.
<dl>
-<dt><tt><i>Texinfo distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/texinfo/texinfo.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/texinfo/texinfo/">browse</a>)
+<dt><tt><i>Texinfo distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo.zip">macros/texinfo/texinfo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/texinfo/texinfo/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texinfo">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texinfo</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texorpdf.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texorpdf.html
new file mode 100644
index 00000000000..a447959c26d
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texorpdf.html
@@ -0,0 +1,45 @@
+<head>
+<title>UK TeX FAQ -- question label texorpdf</title>
+</head><body>
+<h3>Token not allowed in PDFDocEncoded string</h3>
+<p/>The package <i>hyperref</i> produces this error when it doesn&rsquo;t
+know how to make something into a &ldquo;character&rdquo; that will go into one
+of its PDF entries. For example, the (unlikely) sequence
+<blockquote>
+<pre>
+\newcommand{\filled}[2]{%
+ #1%
+ \hfil
+ #2%
+}
+\section{\filled{foo}{bar}}
+</pre>
+</blockquote><p>
+provokes the error. <i>Hyperref</i> goes on to tell you:
+<blockquote>
+<pre>
+removing `\hfil' on input line ...
+</pre>
+</blockquote><p>
+It&rsquo;s not surprising: how would <em>you</em> put the
+typesetting instruction <code>\</code><code>hfil</code> into a PDF bookmark?
+<p/><i>Hyperref</i> allows you to define an alternative for such
+things: the command <code>\</code><code>texorpdfstring</code>, which takes two
+arguments &mdash; the first is what is typeset, the second is what is put
+into the bookmark. For example, what you would probably like in this
+case is just a single space in the bookmark; if so, the erroneous
+example above would become:
+<blockquote>
+<pre>
+\newcommand{\filled}[2]{%
+ #1%
+ \texorpdfstring{\hfil}{\space}%
+ #2%
+}
+\section{\filled{foo}{bar}}
+</pre>
+</blockquote><p>
+and with that definition, the example will compile succesfully
+(<i>hyperref</i> knows about the macro <code>\</code><code>space</code>).
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texorpdf">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texorpdf</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textflow.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textflow.html
index 625db53d66d..d97c88c01ca 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textflow.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textflow.html
@@ -64,10 +64,10 @@ LaTeX document).
a summary in English.
</dl>
<dl>
-<dt><tt><i>floatflt.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/floatflt.zip">macros/latex/contrib/floatflt</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/floatflt.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/floatflt/">browse</a>)
-<dt><tt><i>picins.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/picins.zip">macros/latex209/contrib/picins</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/picins.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex209/contrib/picins/">browse</a>)
-<dt><tt><i>picins documentation summary</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/picins/picins.txt">macros/latex209/contrib/picins/picins.txt</a>
-<dt><tt><i>wrapfig.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wrapfig.zip">macros/latex/contrib/wrapfig</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wrapfig.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/wrapfig/">browse</a>)
+<dt><tt><i>floatflt.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/floatflt.zip">macros/latex/contrib/floatflt</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/floatflt/">browse the directory</a>)
+<dt><tt><i>picins.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/picins.zip">macros/latex209/contrib/picins</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex209/contrib/picins/">browse the directory</a>)
+<dt><tt><i>picins documentation summary</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex209/contrib/picins/picins.txt">macros/latex209/contrib/picins/picins.txt</a>
+<dt><tt><i>wrapfig.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wrapfig.zip">macros/latex/contrib/wrapfig</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wrapfig/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=textflow">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=textflow</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texthings.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texthings.html
new file mode 100644
index 00000000000..4388082f856
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-texthings.html
@@ -0,0 +1,169 @@
+<head>
+<title>UK TeX FAQ -- question label texthings</title>
+</head><body>
+<h3>Things with &ldquo;TeX&rdquo; in the name</h3>
+<p/>New TeX users are often baffled by the myriad terms with &ldquo;TeX&rdquo;
+in the name. The goal of this answer is to clarify some of the more
+common TeX terms.
+<p/><p/><b>TeX itself</b>&nbsp;&nbsp;
+TeX proper is a typesetting system based on a set of low-level
+control sequences that instruct TeX how to lay out text on the
+page. For example, <code>\</code><code>hskip</code> inserts a given amount of horizontal
+space into the document, and <code>\</code><code>font</code> makes a given font available
+to TeX. TeX is fully programmable using an integrated macro
+scripting language that supports variables, scoping, conditional
+execution, control flow, and function (really, macro) definitions.
+See
+<a href="FAQ-whatTeX.html">What is TeX?</a> for some background
+information on TeX and
+<a href="FAQ-ref-doc.html">Reference documents</a> for pointers to
+descriptions of TeX control sequences, data types, and other key
+parts of TeX.
+<p/><p/><b>TeX macro packages (a.k.a. TeX formats)</b>&nbsp;&nbsp;
+TeX&rsquo;s control sequences are tedious to use directly; they are
+intended primarily as building blocks for higher-level&mdash;and therefore
+more user-friendly&mdash;abstractions. For example, there is no way in
+base TeX to specify that a piece of text should be typeset in a
+larger font. Instead, one must keep track of the current size and
+typeface, load a new font with the same typeface but a (specified)
+larger size, and tell TeX to use that new font until instructed
+otherwise. Fortunately, because TeX is programmable, it is
+possible to write a macro that hides this complexity behind a simple,
+new control sequence. For example,
+
+<code>\</code><code>larger{my text}</code> can be defined to typeset &ldquo;my text&rdquo; in
+the next larger font).
+<p/>While some users write their own, perfectly customized set of
+macros&mdash;which they then typically reuse across many documents&mdash;it is
+far more common to rely upon a <em>macro package</em>, a collection of
+TeX macros written by experts. For the user&rsquo;s convenience, these
+macro packages are often combined with the base TeX engine into a
+standalone executable. The following are some of that macro packages
+that you are likely to encounter:
+<dl>
+ <dt>Plain TeX (executable: <i>tex</i>)<dd>
+ See
+ <a href="FAQ-books.html">Books on TeX and its relations</a>,
+ <a href="FAQ-man-tex.html">Online introductions: TeX</a>,
+ <a href="FAQ-plainvltx.html">Should I use Plain TeX or LaTeX?</a> and
+ <a href="FAQ-ol-books.html">Freely available (La)TeX books</a>.
+ Note that the Plain TeX executable is called <i>tex</i>; the
+ base TeX engine is generally provided by a separate executable
+ such as <i>initex</i> or as a <code>-ini</code> flag to
+ <i>tex</i>.
+<p/> <dt>LaTeX (executable: <i>latex</i>)<dd>
+ See
+ <a href="FAQ-books.html">Books on TeX and its relations</a>,
+ <a href="FAQ-tutorialstar.html">(La)TeX Tutorials, etc.</a>,
+ <a href="FAQ-man-latex.html">Online introductions: LaTeX</a>,
+ <a href="FAQ-tutbitslatex.html">Specialized (La)TeX tutorials</a> and
+ <a href="FAQ-doc-dirs.html">Directories of (La)TeX information</a>.
+ Note that there have been two major versions of LaTeX: LaTeX2e
+ refers to the current version of LaTeX while LaTeX 2.09 is the
+ long-since-obsolete (since 1994) version (cf.
+ <a href="FAQ-latex2e.html">What is LaTeX2e?</a> for more information).
+<p/> <dt>ConTeXt (executable: <i>texexec</i>)<dd>
+ See
+ <a href="FAQ-context.html">What is ConTeXt?</a>.
+<p/> <dt>Texinfo (executables: <i>tex</i>, <i>makeinfo</i>)<dd>
+ See
+ <a href="FAQ-texinfo.html">What is Texinfo?</a>. <i>makeinfo</i>
+ converts Texinfo documents to HTML, DocBook, Emacs info,
+ XML, and plain text. <i>Tex</i> (or wrappers such as
+ <i>texi2pdf</i> and <i>texi2pdf</i>) produce one of TeX&rsquo;s
+ usual output formats such as DVI or PDF. Because
+ <i>tex</i> loads the Plain TeX macros, not the Texinfo ones,
+ a Texinfo document must begin with <code>\</code><code>input{texinfo}</code> to
+ explicitly load the Texinfo macro package.
+<p/> <dt>Eplain&mdash;Extended Plain TeX (executable: <i>eplain</i>)<dd>
+ See
+ <a href="FAQ-eplain.html">What is Eplain?</a>.
+</dl>
+<p/><p/><b>Modified <i>tex</b>&nbsp;&nbsp; executables</i>
+The original <i>tex</i> executable was produced in the late 1970s
+(cf. <a href="FAQ-whatTeX.html">What is TeX?</a>) and consequently
+lacked some features that users have come to expect from today&rsquo;s
+software. The following programs address these issues by augmenting
+the TeX engine with some additional useful features:
+<p/><dl>
+ <dt>PDFTeX (executable: <i>pdftex</i>)<dd>
+ TeX, which predates the PDF file format by a decade,
+ outputs files in a TeX-specific format called DVI
+ (cf. <a href="FAQ-dvi.html">What is a DVI file?</a>). In
+ contrast, PDFTeX can output both DVI <em>and</em> PDF
+ files. In PDF mode, it lets documents exploit various
+ PDF features such as hyperlinks, bookmarks, and annotations,
+ PDFTeX additionally supports two sophisticated micro-typographic
+ features: character protrusion and font expansion. See
+ <a href="FAQ-whatpdftex.html">What is PDFTeX?</a>.
+<p/> <dt>XeTeX (executable: <i>xetex</i>)<dd>
+ TeX not only predates all major font technologies in use today
+ (e.g., TrueType, OpenType, and PostScript Type 1) but also predates
+ the notion that fonts be included with an operating system.
+ Consequently, TeX uses its own font formats, which are
+ incompatible with anything a user is likely to have preinstalled.
+ XeTeX addresses this issue by enhancing TeX&rsquo;s <code>\</code><code>font</code>
+ control sequence to support all of the fonts made available by the
+ operating system. See
+ <a href="FAQ-xetex.html">What is XeTeX?</a>.
+<p/> <dt>LuaTeX (executable: <i>luatex</i>)<dd>
+ TeX is programmed in its own, integrated, macro-based programming
+ language. Many users have criticized this language for being
+ needlessly difficult to program. LuaTeX addresses that criticism
+ by integrating a modern scripting language, Lua, into the base
+ TeX engine. See
+ <a href="FAQ-luatex.html">What is LuaTeX?</a>.
+<p/> <dt>e-TeX (executable: <i>etex</i>)<dd>
+ e-TeX provides a number of features that are only indirectly
+ useful to end users but that can be immensely useful to package
+ developers. Consequently, there is an increasing number of macro
+ packages that require the use of e-TeX. (Note: Be careful not to
+ confuse e-TeX, which enhances the TeX engine, with Eplain,
+ which enhances the Plain TeX macro package.) See
+ <a href="FAQ-etex.html">What is e-TeX?</a>.
+</dl>
+<p/>Because each of the above modifies only the base TeX engine, it is
+possible to combine any of those with any of the TeX macro packages
+listed earlier to produce executables with both sets of features. For
+example, the <i>pdflatex</i>, <i>xelatex</i> and
+<i>lualatex</i> executables each combine
+LaTeX with an enhanced TeX engine. Some executables combine the
+features of multiple enhanced TeX engine: <i>pdfetex</i>
+combines PDFTeX and e-TeX into a single executable.
+<p/>As combining features is a generally desirable tendency, current
+TeX distributions (see below) incorporate the features of PDFTeX
+and e-TeX into a single executable. This executable may be
+offered with a LaTeX format (as <i>latex</i> or
+<i>pdflatex</i>) or with a Plain TeX format (as
+<i>pdftex</i>). (<i>Tex</i> remains with an unadorned TeX
+executable using Plain TeX, for people such as Knuth himself, who
+want the certainty of the &ldquo;original&rdquo;.)
+<p/><p/><p/><b>TeX distributions</b>&nbsp;&nbsp;
+A <em>TeX distribution</em> is a collection of TeX-related
+software. Generally, a TeX distribution includes a set of core
+TeX executables such as <i>tex</i> and <i>latex</i>;
+various fonts optimized for use with TeX; helper programs such as
+the BibTeX bibliographic-database formatter, editors, integrated
+development environments, file-format-conversion programs; numerous
+LaTeX packages; configuration tools; and any other goodies the
+distributor chooses to include. Commonly encountered TeX
+distributions include TeX Live, MiKTeX and MacTeX; older ones
+include ozTeX, CMacTeX and teTeX. Some TeX
+distributions target a specific operating system and/or processor
+architecture; others run on multiple platforms. Some TeX
+distributions are free; others require payment. See
+<a href="FAQ-TeXsystems.html">(La)TeX for different machines</a> for a
+list of free and shareware TeX distributions and
+<a href="FAQ-commercial.html">Commercial TeX implementations</a> for a
+list of commercial TeX distributions.
+<p/><p/><p/><b>Summary</b>&nbsp;&nbsp;
+If your document begins with <code>\</code><code>documentclass</code>, you&rsquo;re using some
+form of the LaTeX macro package. Even if hidden behind a button in
+a TeX-aware GUI, this document is getting compiled by a TeX
+executable&mdash;probably <i>latex</i> or <i>pdflatex</i>&mdash;to
+produce an output file. The executable came bundled as part of a
+TeX distribution such as MiKTeX, which includes various other
+TeX-related components.
+
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texthings">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=texthings</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textrace.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textrace.html
index 129c1fe5838..fc6be497d44 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textrace.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-textrace.html
@@ -35,7 +35,7 @@ Type 1 fonts. The first results, the
well-established, and a bunch of existing designs have been reworked
in MetaType1 format.
<dl>
-<dt><tt><i>MetaType1</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/metatype1.zip">fonts/utilities/metatype1</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/metatype1.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/metatype1/">browse</a>)
+<dt><tt><i>MetaType1</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/metatype1.zip">fonts/utilities/metatype1</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/metatype1/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=textrace">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=textrace</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-theoremfmt.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-theoremfmt.html
index ec873f2af47..3a2c28ac8d2 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-theoremfmt.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-theoremfmt.html
@@ -21,9 +21,9 @@ Alternatively, the following sets up an environment
The <i>ntheorem</i> package provides control of the fonts used by
theorems, directly.
<dl>
-<dt><tt><i>amsthm.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/amslatex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/amslatex/">browse</a>)
-<dt><tt><i>ntheorem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntheorem.zip">macros/latex/contrib/ntheorem</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ntheorem.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ntheorem/">browse</a>)
-<dt><tt><i>theorem.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>amsthm.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex.zip">macros/latex/required/amslatex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/amslatex/">browse the directory</a>)
+<dt><tt><i>ntheorem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntheorem.zip">macros/latex/contrib/ntheorem</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ntheorem/">browse the directory</a>)
+<dt><tt><i>theorem.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=theoremfmt">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=theoremfmt</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-thesis.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-thesis.html
index fe7573cc45a..4cd505fddf5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-thesis.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-thesis.html
@@ -5,14 +5,14 @@
<p/>Thesis styles are usually very specific to your University, so it&rsquo;s
usually not profitable to ask around for a package outside your own
University. Since many Universities (in their eccentric way) still
-require double-spacing, you may care to refer to
-<a href="FAQ-linespace.html">the relevant question</a>.
-If you want to write your own, a good place to start is the University
-of California style, but it&rsquo;s not worth going to a lot of trouble. (If
-officials won&rsquo;t allow standard typographic conventions, you won&rsquo;t be
-able to produce an &aelig;sthetically pleasing document anyway!)
+require double-spaced thesis text, you may also need separately to set
+up <a href="FAQ-linespace.html">double spacing</a>.
+<p/>If you want to write a new thesis class of your own, a good place to
+start is the University of California style, but remember that it&rsquo;s
+often difficult to produce a thesis that both looks good and conforms
+with the style that your Univeristy demands.
<dl>
-<dt><tt><i>UC thesis style</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ucthesis.zip">macros/latex/contrib/ucthesis</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ucthesis.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ucthesis/">browse</a>)
+<dt><tt><i>UC thesis style</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ucthesis.zip">macros/latex/contrib/ucthesis</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ucthesis/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=thesis">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=thesis</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-time.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-time.html
index 6617bca3e6e..20b45407be5 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-time.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-time.html
@@ -24,8 +24,8 @@ words).
command also takes an optional argument, the character to separate the
hours and minutes: the default is of course <code>:</code>.
<dl>
-<dt><tt><i>datetime.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/datetime.zip">macros/latex/contrib/datetime</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/datetime.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/datetime/">browse</a>)
-<dt><tt><i>scrtime.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
+<dt><tt><i>datetime.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/datetime.zip">macros/latex/contrib/datetime</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/datetime/">browse the directory</a>)
+<dt><tt><i>scrtime.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=time">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=time</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-titlsty.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-titlsty.html
index 8d30d1c7ef1..16510f85404 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-titlsty.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-titlsty.html
@@ -17,9 +17,9 @@ to program alternative
The web page is not useful to users unless they are willing to do
their own LaTeX programming.
<dl>
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>titling.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titling.zip">macros/latex/contrib/titling</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/titling.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/titling/">browse</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>titling.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titling.zip">macros/latex/contrib/titling</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/titling/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=titlsty">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=titlsty</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tmupfl.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tmupfl.html
index 681de21a071..93228659a58 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tmupfl.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tmupfl.html
@@ -44,7 +44,7 @@ more floats, leading to the error.
<i>float</i> package&rsquo;s <code>[H]</code> float qualifier, but you are unlikely
to get away without using <code>\</code><code>clearpage</code> from time to time.
<dl>
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tmupfl">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tmupfl</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-toascii.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-toascii.html
index 39104b0ba0b..81240cec872 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-toascii.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-toascii.html
@@ -45,14 +45,14 @@ beings than the flat-style TeX code.
and then to use a browser such as <i>lynx</i> to dump the resulting
HTML as plain text.
<dl>
-<dt><tt><i>catdvi</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/catdvi.zip">dviware/catdvi</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/catdvi.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/catdvi/">browse</a>)
-<dt><tt><i>crudetype</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/crudetype.zip">dviware/crudetype</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/crudetype.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/crudetype/">browse</a>)
-<dt><tt><i>detex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/detex.zip">support/detex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/detex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/detex/">browse</a>)
-<dt><tt><i>dvi2tty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2tty.zip">dviware/dvi2tty</a> (<a href="ftp://cam.ctan.org/tex-archive/dviware/dvi2tty.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/dviware/dvi2tty/">browse</a>)
-<dt><tt><i>l2a</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/l2a.zip">support/l2a</a> (<a href="ftp://cam.ctan.org/tex-archive/support/l2a.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/l2a/">browse</a>)
-<dt><tt><i>screen.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex209/contrib/misc/screen.sty">macros/latex209/contrib/misc/screen.sty</a>
-<dt><tt><i>tex2mail</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/tex2mail.zip">support/tex2mail</a> (<a href="ftp://cam.ctan.org/tex-archive/support/tex2mail.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/tex2mail/">browse</a>)
-<dt><tt><i>txt</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/txt.zip">support/txt</a> (<a href="ftp://cam.ctan.org/tex-archive/support/txt.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/txt/">browse</a>)
+<dt><tt><i>catdvi</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/catdvi.zip">dviware/catdvi</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/catdvi/">browse the directory</a>)
+<dt><tt><i>crudetype</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/crudetype.zip">dviware/crudetype</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/crudetype/">browse the directory</a>)
+<dt><tt><i>detex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/detex.zip">support/detex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/detex/">browse the directory</a>)
+<dt><tt><i>dvi2tty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2tty.zip">dviware/dvi2tty</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/dviware/dvi2tty/">browse the directory</a>)
+<dt><tt><i>l2a</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/l2a.zip">support/l2a</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/l2a/">browse the directory</a>)
+<dt><tt><i>screen.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex209/contrib/misc/screen.sty">macros/latex209/contrib/misc/screen.sty</a>
+<dt><tt><i>tex2mail</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tex2mail.zip">support/tex2mail</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/tex2mail/">browse the directory</a>)
+<dt><tt><i>txt</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/txt.zip">support/txt</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/txt/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=toascii">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=toascii</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocbibind.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocbibind.html
index 4e8fc66bf64..97548fe7cc3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocbibind.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocbibind.html
@@ -53,10 +53,10 @@ as a set of class options (e.g., <code>bibtotoc</code> to add the
bibliography to the table of contents); the <i>memoir</i> class includes
<i>tocbibind</i> itself.
<dl>
-<dt><tt><i>hyperref.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/hyperref.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/hyperref/">browse</a>)
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>tocbibind.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocbibind.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tocbibind/">browse</a>)
+<dt><tt><i>hyperref.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref.zip">macros/latex/contrib/hyperref</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/hyperref/">browse the directory</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>tocbibind.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind.zip">macros/latex/contrib/tocbibind</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocbibind/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tocbibind">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tocbibind</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocloft.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocloft.html
index c82806db738..a40ed9df058 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocloft.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tocloft.html
@@ -24,9 +24,9 @@ for the table of contents, and calculates the space needed for the
numbers automatically. The <i>memoir</i> class includes the functionality
of <i>tocloft</i>.
<dl>
-<dt><tt><i>KOMA script bundle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/koma-script.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/koma-script/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>tocloft.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocloft.zip">macros/latex/contrib/tocloft</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/tocloft.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/tocloft/">browse</a>)
+<dt><tt><i>KOMA script bundle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script.zip">macros/latex/contrib/koma-script</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/koma-script/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>tocloft.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocloft.zip">macros/latex/contrib/tocloft</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/tocloft/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tocloft">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tocloft</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tradesyms.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tradesyms.html
index dfea790f4fb..954f6abefd8 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tradesyms.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tradesyms.html
@@ -25,6 +25,5 @@ errors: you <em>must</em> use
\textsuperscript{\textregistered}
</pre>
</blockquote><p>
-<p/>
-<p/><p/><p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tradesyms">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tradesyms</a>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tradesyms">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tradesyms</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tutbitslatex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tutbitslatex.html
index eacc105e158..ff55f5f2dc8 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tutbitslatex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-tutbitslatex.html
@@ -5,8 +5,9 @@
<p/>The AMS publishes a &ldquo;Short Math Guide for LaTeX&rdquo;, which is
available (in several formats) via
<a href="http://www.ams.org/tex/short-math-guide.html">http://www.ams.org/tex/short-math-guide.html</a>
-<p/>Herbert Voss is developing a parallel document, that is also very
-useful; it&rsquo;s part of his &ldquo;<a href="FAQ-doc-dirs.html">tips and tricks</a>&rdquo; and
+<p/>Herbert Voss has written an extensive guide to mathematics in
+LaTeX (a German version of which is published as a book). The
+guide is part of his &ldquo;<a href="FAQ-doc-dirs.html">tips and tricks</a>&rdquo; and
a copy is maintained on CTAN.
<p/>Two documents written more than ten years apart about font usage in
@@ -31,7 +32,7 @@ soon&rdquo;).
<p/>Kjell Magne Fauske offers a set of examples of the use of the drawing
packages
<a href="FAQ-drawing.html">PGF and TikZ</a>; the
-<a href="http://www.fauskes.net/pgftikzexamples/">examples catalogue</a>
+<a href="http://www.texample.net/tikz/examples/">examples catalogue</a>
includes examples (with output) from the package documentation as well
as code written by the author himself.
<p/>Vincent Zoonekynd provides a set of excellent (and graphic) tutorials
@@ -84,9 +85,9 @@ deparment&rsquo;s pages at
<dl>
<dt><tt><i>Graphics in LaTeX2e</i></tt><dd>the
document is available in PostScript and PDF formats as
- <a href="ftp://cam.ctan.org/tex-archive/info/epslatex/english/epslatex.ps">info/epslatex/english/epslatex.ps</a> and <a href="ftp://cam.ctan.org/tex-archive/info/epslatex/english/epslatex.pdf">info/epslatex/english/epslatex.pdf</a> respectively
-<dt><tt><i>testflow</i></tt><dd><a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
-<dt><tt><i>Herbert Voss&rsquo;s Maths tutorial</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/math/voss/mathmode/Mathmode.pdf">info/math/voss/mathmode/Mathmode.pdf</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/epslatex/english/epslatex.ps">info/epslatex/english/epslatex.ps</a> and <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/epslatex/english/epslatex.pdf">info/epslatex/english/epslatex.pdf</a> respectively
+<dt><tt><i>testflow</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/IEEEtran/testflow/">macros/latex/contrib/IEEEtran/testflow/</a>
+<dt><tt><i>Herbert Voss&rsquo;s Maths tutorial</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/math/voss/mathmode/Mathmode.pdf">info/math/voss/mathmode/Mathmode.pdf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tutbitslatex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tutbitslatex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-twooptarg.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-twooptarg.html
index bb7b1a8208c..1d148d6af2e 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-twooptarg.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-twooptarg.html
@@ -68,11 +68,11 @@ readily-understood language), and emits (La)TeX macros which enable
the command to be defined. The command requires that a
<i>Python</i> interpreter (etc.) be installed on your computer.
<dl>
-<dt><tt><i>newcommand.py</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/newcommand.zip">support/newcommand</a> (<a href="ftp://cam.ctan.org/tex-archive/support/newcommand.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/newcommand/">browse</a>)
-<dt><tt><i>optparams.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sauerj.zip">macros/latex/contrib/sauerj</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/sauerj.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/sauerj/">browse</a>)
-<dt><tt><i>twoopt.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>)
-<dt><tt><i>xargs.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xargs.zip">macros/latex/contrib/xargs</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xargs.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/xargs/">browse</a>)
-<dt><tt><i>xkeyval.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xkeyval.zip">macros/latex/contrib/xkeyval</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/xkeyval.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/xkeyval/">browse</a>)
+<dt><tt><i>newcommand.py</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/newcommand.zip">support/newcommand</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/newcommand/">browse the directory</a>)
+<dt><tt><i>optparams.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sauerj.zip">macros/latex/contrib/sauerj</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/sauerj/">browse the directory</a>)
+<dt><tt><i>twoopt.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>)
+<dt><tt><i>xargs.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xargs.zip">macros/latex/contrib/xargs</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xargs/">browse the directory</a>)
+<dt><tt><i>xkeyval.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xkeyval.zip">macros/latex/contrib/xkeyval</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/xkeyval/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=twooptarg">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=twooptarg</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-type1T1.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-type1T1.html
index cf1e34853d4..7e119d8a2a6 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-type1T1.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-type1T1.html
@@ -91,16 +91,16 @@ Adobe&rsquo;s Times family) you have to find a matching family of
mathematical fonts, which is a non-trivial undertaking &mdash;
see <a href="FAQ-psfchoice.html">&ldquo;choice of scalable fonts&rdquo;</a>.
<dl>
-<dt><tt><i>ae fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ae.zip">fonts/ae</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ae.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ae/">browse</a>)
-<dt><tt><i>aecompl.sty</i></tt><dd>Distributed with <a href="ftp://cam.ctan.org/tex-archive/fonts/ae.zip">fonts/ae</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ae.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ae/">browse</a>)
-<dt><tt><i>aeguill.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/aeguill.zip">macros/latex/contrib/aeguill</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/aeguill.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/aeguill/">browse</a>)
-<dt><tt><i>BaKoMa fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/tex-archive/systems/win32/bakoma/fonts/">systems/win32/bakoma/fonts/</a>
-<dt><tt><i>CM-LGC fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-lgc.zip">fonts/ps-type1/cm-lgc</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-lgc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-lgc/">browse</a>)
-<dt><tt><i>CM-super fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/cm-super.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/cm-super/">browse</a>) (beware:
+<dt><tt><i>ae fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ae.zip">fonts/ae</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ae/">browse the directory</a>)
+<dt><tt><i>aecompl.sty</i></tt><dd>Distributed with <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ae.zip">fonts/ae</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ae/">browse the directory</a>)
+<dt><tt><i>aeguill.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/aeguill.zip">macros/latex/contrib/aeguill</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/aeguill/">browse the directory</a>)
+<dt><tt><i>BaKoMa fonts</i></tt><dd>Browse <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesystems/win32/bakoma/fonts/">systems/win32/bakoma/fonts/</a>
+<dt><tt><i>CM-LGC fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-lgc.zip">fonts/ps-type1/cm-lgc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-lgc/">browse the directory</a>)
+<dt><tt><i>CM-super fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super.zip">fonts/ps-type1/cm-super</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/cm-super/">browse the directory</a>) (beware:
very large download)
-<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/lm.zip">fonts/lm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/lm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/lm/">browse</a>)
-<dt><tt><i>tt2001 fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/tt2001.zip">fonts/ps-type1/tt2001</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/ps-type1/tt2001.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/ps-type1/tt2001/">browse</a>)
-<dt><tt><i>zefonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/zefonts.zip">fonts/zefonts</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/zefonts.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/zefonts/">browse</a>)
+<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm.zip">fonts/lm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm/">browse the directory</a>)
+<dt><tt><i>tt2001 fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/tt2001.zip">fonts/ps-type1/tt2001</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/ps-type1/tt2001/">browse the directory</a>)
+<dt><tt><i>zefonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/zefonts.zip">fonts/zefonts</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/zefonts/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=type1T1">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=type1T1</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-typo-style.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-typo-style.html
index 37d738baf04..125eebf8ba7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-typo-style.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-typo-style.html
@@ -2,6 +2,10 @@
<title>UK TeX FAQ -- question label typo-style</title>
</head><body>
<h3>Typography tutorials</h3>
+<p/>Peter Wilson&rsquo;s manual for his <i>memoir</i> class has a lengthy
+introductory section on typographic considerations, which is a fine
+tutorial, written by someone who is aware of the issues as they apply
+to (La)TeX users.
<p/>There&rsquo;s also (at least one) typographic style tutorial available on
the Web, the excellent
&ldquo;<a href="http://www.nbcs.rutgers.edu/~hedrick/typography/typography.janson-syntax.107514.pdf">Guidelines for Typography in NBCS</a>&rdquo;.
@@ -14,12 +18,8 @@ ambition to supplant such excellent books as
<a href="FAQ-typebooks.html">Bringhurst&rsquo;s</a>, but the document (though it does
contain its Rutgers-local matter) is a fine introduction to the issues
of producing readable documents.
-<p/>Peter Wilson&rsquo;s manual for his <i>memoir</i> class has a lengthy
-introductory section on typographic considerations, which is a fine
-tutorial, written by someone who is aware of the issues as they apply
-to (La)TeX users.
<dl>
-<dt><tt><i>memoir distribution</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
+<dt><tt><i>memoir distribution</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=typo-style">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=typo-style</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underline.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underline.html
index f3d4e83a58d..bed08505430 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underline.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underline.html
@@ -32,8 +32,8 @@ loading the package with:
</pre>
Documentation of <i>ulem</i> is in the package itself.
<dl>
-<dt><tt><i>ulem.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/ulem.sty">macros/latex/contrib/misc/ulem.sty</a>
-<dt><tt><i>soul.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/soul.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/soul/">browse</a>)
+<dt><tt><i>ulem.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/ulem.sty">macros/latex/contrib/misc/ulem.sty</a>
+<dt><tt><i>soul.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul.zip">macros/latex/contrib/soul</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/soul/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=underline">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=underline</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underscore.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underscore.html
index 6008a15a443..6f429744203 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underscore.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-underscore.html
@@ -36,7 +36,7 @@ sense of the word), but it <em>is</em> robust under expansion (i.e., the
LaTeX sense of the word); so use it with care, but don&rsquo;t worry
about section headings and the like.
<dl>
-<dt><tt><i>underscore.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/underscore.sty">macros/latex/contrib/misc/underscore.sty</a>
+<dt><tt><i>underscore.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/underscore.sty">macros/latex/contrib/misc/underscore.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=underscore">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=underscore</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-unkgrfextn.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-unkgrfextn.html
index e7a74af855f..243e9c862e8 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-unkgrfextn.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-unkgrfextn.html
@@ -58,7 +58,7 @@ unsatisfactory alternatives:
</pre>
</ul>
<dl>
-<dt><tt><i>grffile.sty</i></tt><dd>Distributed as part of the <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/oberdiek.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/oberdiek/">browse</a>) collection
+<dt><tt><i>grffile.sty</i></tt><dd>Distributed as part of the <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek.zip">macros/latex/contrib/oberdiek</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/oberdiek/">browse the directory</a>) collection
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=unkgrfextn">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=unkgrfextn</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uploads.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uploads.html
index ecce4105cf8..a7c22ad08bf 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uploads.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uploads.html
@@ -57,7 +57,7 @@ contribution direct into the archive. At present this may only be
done if your contribution is available via <i>ftp</i>, and of
course the directory structure on your repository must &lsquo;fit&rsquo;.
<dl>
-<dt><tt><i>README.uploads</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/README.uploads">README.uploads</a>
+<dt><tt><i>README.uploads</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveREADME.uploads">README.uploads</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=uploads">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=uploads</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-upquot.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-upquot.html
index 2a664630d7e..25f3ee117ab 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-upquot.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-upquot.html
@@ -12,7 +12,7 @@ particularly in those of Unix-like shell scripts. The
<code>verbatim</code> environment so that the output is a clearer
representation of what the user must type.
<dl>
-<dt><tt><i>upquote.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/upquote/upquote.sty">macros/latex/contrib/upquote/upquote.sty</a>
+<dt><tt><i>upquote.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/upquote/upquote.sty">macros/latex/contrib/upquote/upquote.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=upquot">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=upquot</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-useMF.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-useMF.html
index d3eb8137324..87d2f2d6d84 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-useMF.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-useMF.html
@@ -3,105 +3,116 @@
</head><body>
<h3>Getting Metafont to do what you want</h3>
<p/>Metafont allows you to create your own fonts, and most TeX users
-will never need to use it. Metafont, unlike TeX, requires some
-customisation: each output device for which you will be generating
-fonts needs a mode associated with it. Modes are defined using the
-<code>mode_def</code> convention described on page 94 of <em>The Metafontbook</em>
+will never need to use it &mdash; modern (La)TeX systems contain
+rather few Metafont fonts of any significance, and when Metafont output is
+needed the font generation is done, automatically, &ldquo;on the fly&rdquo;.
+<p/>If you find you have some special requirement that the system doesn&rsquo;t
+satisfy, you need to know about Metafont in rather more detail. Metafont,
+unlike TeX, requires customisation for each output device: such
+customisation is conventionally held in a &ldquo;mode&rdquo; associated with the
+device. Modes are commonly defined using the <code>mode_def</code>
+convention described on page 94 of <em>The Metafontbook</em>
(see <a href="FAQ-books.html">TeX-related books</a>). You will need
-a file, which conventionally called <i>local.mf</i>, containing all the
-<code>mode_def</code>s you will be using. If <i>local.mf</i> doesn&rsquo;t already
-exist, Karl Berry&rsquo;s collection of modes (<i>modes.mf</i>)
-is a good starting point
-(it can be used as a &lsquo;<i>local.mf</i>&rsquo; without modification in a &lsquo;big
-enough&rsquo; implementation of Metafont). Lists of
+a file, conventionally called <i>local.mf</i>, containing all the
+<code>mode_def</code>s you will be using. In the unlikely event that
+<i>local.mf</i> doesn&rsquo;t already exist, Karl Berry&rsquo;s collection of
+modes (<i>modes.mf</i>) is a good starting point
+(it can be used as a &lsquo;<i>local.mf</i>&rsquo; without modification in a
+typical modern implementation of Metafont). Lists of
settings for various output devices are also published periodically in
<i>TUGboat</i> (see <a href="FAQ-TUGstar.html">TUG</a>). Now create
-a <code>plain</code> base
-file using <i>inimf</i>, <code>plain.mf</code>, and <code>local.mf</code>:
+a <code>plain</code> base file using <i>mf</i> (in &ldquo;initialisation&rdquo;
+mode), <code>plain.mf</code>, and <code>local.mf</code>:
+<blockquote>
<pre>
- % inimf
- This is METAFONT...
- **plain # you type plain
- (output)
- *input local # you type this
- (output)
- *dump # you type this
- Beginning to dump on file plain...
- (output)
+% mf -ini
+This is METAFONT...
+**plain # you type plain
+(output)
+*input local # you type this
+(output)
+*dump # you type this
+Beginning to dump on file plain...
+(output)
</pre>
+</blockquote><p>
-This will create a base file named <i>plain.base</i> (or something
-similar; for example, it will be
-
- <i>PLAIN.BAS</i>
-on MSDOS systems) which should be moved to the directory containing
-the base files on your system (note that some systems have two or more
-such directories, one for each &lsquo;size&rsquo; of Metafont used).
+This will create a base file named <i>plain.base</i>
+(or something similar; for example, it will be <i>PLAIN.BAS</i>
+on MSDOS systems). Move the file to the directory containing
+the base files on your system.
<p/>Now you need to make sure Metafont loads this new base when it starts up. If
Metafont loads the <code>plain</code> base by default on your system, then you&rsquo;re
-ready to go. Under Unix (using the default <i>web2c</i>
-distribution
-)
-this does indeed happen, but we could for instance define a command
-<i>mf</i> which executes <code>virmf &amp;plain</code> loading the
-<code>plain</code> base file.
-<p/>The usual way to create a font with <code>plain</code> Metafont is to start
-it with the
+ready to go. Under Unix (using the default TeX Live (and earlier)
+distributions this does indeed happen, but we could for instance
+define a command <i>plainmf</i>
+
+which executes &lsquo;<code>mf -base=plain</code>&rsquo; (or, in more traditional
+style &lsquo;<code>mf &amp;plain</code>&rsquo;) which loads the <code>plain</code> base
+file.
+<p/>The usual way to create a font with Metafont (with an appropriate base
+file loaded) is to start Metafont&rsquo;s input with the
line
<pre>
\mode=&lt;mode name&gt;; mag=&lt;magnification&gt;; input &lt;font file name&gt;
</pre>
in response to the &lsquo;<code>**</code>&rsquo; prompt or on the Metafont command line. (If
-<code>&lt;mode name&gt;</code> is unknown or omitted, the mode defaults to &lsquo;proof&rsquo; and
-Metafont will produce an output file called
-
+<code>&lt;mode name&gt;</code> is unknown or omitted, the mode defaults to
+&lsquo;proof&rsquo; mode and Metafont will produce an output file called
<i>&lt;font file name&gt;.2602gf</i>)
The <code>&lt;magnification&gt;</code> is a floating point number or
&lsquo;magstep&rsquo; (magsteps are defined in <em>The Metafontbook</em> and
<em>The TeXbook</em>).
If <code>mag=&lt;magnification&gt;</code> is omitted, then the default
-is 1 (magstep 0). For example, to generate cmr10 at 12pt for an epson
-printer you would type
+is 1 (magstep 0). For example, to generate cmr10 at 12pt for an Epson
+printer you might type
+<blockquote>
<pre>
- mf \mode=epson; mag=magstep 1; input cmr10
+mf \mode=epson; mag=magstep 1; input cmr10
</pre>
+</blockquote><p>
Note that under Unix the <code>\</code> and <code>;</code>
characters must usually be quoted or escaped, so this would typically
look something like
+<blockquote>
<pre>
mf '\mode=epson; mag=magstep 1; input cmr10'
</pre>
-<p/>If you don&rsquo;t have <i>inimf</i> or need a special mode that isn&rsquo;t
-in the base, you can put its commands in a file (<em>e.g.</em>,
-<i>ln03.mf</i>) and invoke it on the fly with the <code>\</code><code>smode</code> command.
-For example, to create <i>cmr10.300gf</i> for an LN03 printer, using
-the file
+</blockquote><p>
+If you need a special mode that isn&rsquo;t in the base, you can put its
+commands in a file (<em>e.g.</em>, <i>ln03.mf</i>) and invoke it on the
+fly with the <code>\</code><code>smode</code> command. For example, to create
+<i>cmr10.300gf</i> for an LN03 printer, using the file
+<blockquote>
<pre>
- % This is ln03.mf as of 1990/02/27
- % mode_def courtesy of John Sauter
- proofing:=0;
- fontmaking:=1;
- tracingtitles:=0;
- pixels_per_inch:=300;
- blacker:=0.65;
- fillin:=-0.1;
- o_correction:=.5;
+% This is ln03.mf as of 1990/02/27
+% mode_def courtesy of John Sauter
+proofing:=0;
+fontmaking:=1;
+tracingtitles:=0;
+pixels_per_inch:=300;
+blacker:=0.65;
+fillin:=-0.1;
+o_correction:=.5;
</pre>
+</blockquote><p>
(note the absence of the <code>mode_def</code> and <code>enddef</code>
commands), you would type
+<blockquote>
<pre>
- mf \smode="ln03"; input cmr10
+mf \smode="ln03"; input cmr10
</pre>
+</blockquote><p>
This technique isn&rsquo;t one you should regularly use, but it may
prove useful if you acquire a new printer and want to experiment with
parameters, or for some other reason are regularly editing the
parameters you&rsquo;re using. Once you&rsquo;ve settled on an appropriate set of
parameters, you should use them to rebuild the base file that you use.
-<p/>Other sources of help are mentioned in
+<p/>Other sources of help are discussed in our list of
<a href="FAQ-mfptutorials.html">Metafont and MetaPost Tutorials</a>.
<dl>
-<dt><tt><i>modes.mf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/modes/modes.mf">fonts/modes/modes.mf</a>
+<dt><tt><i>modes.mf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivefonts/modes/modes.mf">fonts/modes/modes.mf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=useMF">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=useMF</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uselmfonts.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uselmfonts.html
index c9beec26f7f..3bafe92ef36 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uselmfonts.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-uselmfonts.html
@@ -23,8 +23,8 @@ files), but copy the other three into your existing Local
<a href="FAQ-inst-wlcf.html">update the filename database</a>.
<p/>Now, incorporate the fonts in the set searched by PDFLaTeX,
-<i>dvips</i>, <i>dvipdfm</i>, your previewers and
-Type 1-to-PK conversion programs, by
+<i>dvips</i>, <i>dvipdfm</i>/<i>dvipdfmx</i>, your
+previewers and Type 1-to-PK conversion programs, by
<ul>
<li> On a teTeX system earlier than version 2.0, edit the file
<i>$TEXMF/dvips/config/updmap</i> and insert an absolute path for
@@ -60,7 +60,7 @@ for text, and
if you want to use any of the TS1-encoding symbols. There is
no support for using fonts according to the OT1 encoding.
<dl>
-<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/lm.zip">fonts/lm</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/lm.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/lm/">browse</a>)
+<dt><tt><i>Latin Modern fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm.zip">fonts/lm</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/lm/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=uselmfonts">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=uselmfonts</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepictex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepictex.html
index 9f5bf31140e..4a4b8870e88 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepictex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepictex.html
@@ -49,10 +49,10 @@ part of the distribution). <i>MathsPic</i> is available either as
a <i>Basic</i> program for DOS, or as a <i>Perl</i>
program for other systems (including Windows, nowadays).
<dl>
-<dt><tt><i>m-pictex.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/context/current/cont-tmf.zip">macros/context/current/cont-tmf.zip</a>
-<dt><tt><i>m-pictex.tex</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/context/current/cont-tmf.zip">macros/context/current/cont-tmf.zip</a>
-<dt><tt><i>MathsPic</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/graphics/mathspic.zip">graphics/mathspic</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/mathspic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/mathspic/">browse</a>)
-<dt><tt><i>pictexwd.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/graphics/pictex/addon.zip">graphics/pictex/addon</a> (<a href="ftp://cam.ctan.org/tex-archive/graphics/pictex/addon.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/graphics/pictex/addon/">browse</a>)
+<dt><tt><i>m-pictex.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/context/current/cont-tmf.zip">macros/context/current/cont-tmf.zip</a>
+<dt><tt><i>m-pictex.tex</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/context/current/cont-tmf.zip">macros/context/current/cont-tmf.zip</a>
+<dt><tt><i>MathsPic</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/mathspic.zip">graphics/mathspic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/mathspic/">browse the directory</a>)
+<dt><tt><i>pictexwd.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex/addon.zip">graphics/pictex/addon</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/graphics/pictex/addon/">browse the directory</a>)
</dl>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usepictex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usepictex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepsfont.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepsfont.html
index 56621c87624..3766b77b1eb 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepsfont.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usepsfont.html
@@ -42,9 +42,9 @@ LaTeX&rsquo;s NFSS, and so is easy to use with PostScript fonts.
<p/>Some common problems encountered are discussed elsewhere
(see <a href="FAQ-psfontprob.html">problems with PS fonts</a>).
<dl>
-<dt><tt><i>Metrics for the &lsquo;Laserwriter&rsquo; set of 35 fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss/lw35nfss.zip">macros/latex/required/psnfss/lw35nfss.zip</a>
-<dt><tt><i>lollipop</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/lollipop.zip">macros/lollipop</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/lollipop.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/lollipop/">browse</a>)
-<dt><tt><i>psnfss</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/psnfss.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/psnfss/">browse</a>)
+<dt><tt><i>Metrics for the &lsquo;Laserwriter&rsquo; set of 35 fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/required/psnfss/lw35nfss.zip">macros/latex/required/psnfss/lw35nfss.zip</a>
+<dt><tt><i>lollipop</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/lollipop.zip">macros/lollipop</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/lollipop/">browse the directory</a>)
+<dt><tt><i>psnfss</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usepsfont">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usepsfont</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usesymb.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usesymb.html
new file mode 100644
index 00000000000..334c1ac2c75
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-usesymb.html
@@ -0,0 +1,40 @@
+<head>
+<title>UK TeX FAQ -- question label usesymb</title>
+</head><body>
+<h3>Using symbols</h3>
+<p/>Most symbol font sets come with a package that defines commands for
+every symbol in the font. While this is convenient, it can lead to
+difficulties, particularly with name clashes when you load packages
+that cover fonts which duplicate symbols &mdash; an issue which is
+discussed in
+
+ &ldquo;<a href="FAQ-alreadydef.html">symbol already defined</a>&rdquo;.
+Some font sets (for example, <i>MnSymbol</i>) are huge, and the
+accompanying macros cover so many symbols that name clashes are surely
+a serious problem.
+<p/>The <i>pifont</i> package (originally designed to use the Adobe
+<i>Zapf Dingbats</i> font) avoids this sort of problem: it requires
+you to know the font position of any symbol you want to use (the
+documentation provides font tables). The basic command is
+<code>\</code><code>ding{</code><em>number</em><code>}</code> for a single symbol; there are commands for
+other fancier uses. <i>Pifont</i> also allows you to select other
+fonts, for similar use.
+<p/>The <i>yagusylo</i> describes itself as &ldquo;an extended version of
+<i>pifont</i>, gone technicolor&rdquo;. It provides all the facilities
+of <i>pifont</i>, but allows you to create your own mnemonic names
+for symbols. Thus, while you can say
+<code>\</code><code>yagding[</code><em>family</em><code>]{</code><em>symbol number</em><code>}</code>[colour], you can also
+define symbol names with <code>\</code><code>defdingname</code>, and then use them
+with <code>\</code><code>yagding*{</code><em>symbol name</em><code>}</code> (the defined name carries the
+font family and colour specified in the arguments of
+<code>\</code><code>defdingname</code>).
+<p/><i>Yagusylo</i> is somewhat complicated, but its documentation is
+clear; it is probably the best tool to use for picking and choosing
+symbols from a variety of font families.
+<dl>
+<dt><tt><i>mnsymbol fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mnsymbol.zip">fonts/mnsymbol</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/mnsymbol/">browse the directory</a>)
+<dt><tt><i>pifont.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss.zip">macros/latex/required/psnfss</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/psnfss/">browse the directory</a>)
+<dt><tt><i>yagusylo.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/yagusylo.zip">macros/latex/contrib/yagusylo</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/yagusylo/">browse the directory</a>)
+</dl>
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usesymb">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=usesymb</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidcol.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidcol.html
index 7ddbf95f1b8..95382eadf83 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidcol.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidcol.html
@@ -54,8 +54,8 @@ or you can use it as follows:
where the second column will end up noticeably wider, and will wrap to
a second line in the third row.
<dl>
-<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
-<dt><tt><i>varwidth.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/varwidth.sty">macros/latex/contrib/misc/varwidth.sty</a>
+<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
+<dt><tt><i>varwidth.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/varwidth.sty">macros/latex/contrib/misc/varwidth.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=varwidcol">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=varwidcol</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidth.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidth.html
index 31f029b31e8..45aef83b16f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidth.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-varwidth.html
@@ -61,9 +61,9 @@ itself).
things still to be done, but the package is already proving useful for
a variety of jobs.
<dl>
-<dt><tt><i>eqparbox.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eqparbox.zip">macros/latex/contrib/eqparbox</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eqparbox.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/eqparbox/">browse</a>)
-<dt><tt><i>pbox.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pbox.zip">macros/latex/contrib/pbox</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/pbox.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/pbox/">browse</a>)
-<dt><tt><i>varwidth.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/varwidth.sty">macros/latex/contrib/misc/varwidth.sty</a>
+<dt><tt><i>eqparbox.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eqparbox.zip">macros/latex/contrib/eqparbox</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eqparbox/">browse the directory</a>)
+<dt><tt><i>pbox.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pbox.zip">macros/latex/contrib/pbox</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/pbox/">browse the directory</a>)
+<dt><tt><i>varwidth.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/varwidth.sty">macros/latex/contrib/misc/varwidth.sty</a>
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=varwidth">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=varwidth</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbfile.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbfile.html
index 08d6a2c9fc1..1d607ba94ea 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbfile.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbfile.html
@@ -52,11 +52,11 @@ advised.
<i>verbatim</i> and <i>moreverb</i> packages.
<dl>
<dt><tt><i>alltt.sty</i></tt><dd>Part of the LaTeX distribution.
-<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyvrb/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>moreverb.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moreverb.zip">macros/latex/contrib/moreverb</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/moreverb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/moreverb/">browse</a>)
-<dt><tt><i>sverb.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/mdwtools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/mdwtools/">browse</a>)
-<dt><tt><i>verbatim.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>moreverb.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moreverb.zip">macros/latex/contrib/moreverb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/moreverb/">browse the directory</a>)
+<dt><tt><i>sverb.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools.zip">macros/latex/contrib/mdwtools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/mdwtools/">browse the directory</a>)
+<dt><tt><i>verbatim.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=verbfile">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=verbfile</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbwithin.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbwithin.html
index f6379c0d327..772dd0cfbf9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbwithin.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-verbwithin.html
@@ -60,7 +60,7 @@ necessary?&rdquo;.
address or the like, then the <code>\</code><code>url</code> command from the
<i>url</i> will help: it doesn&rsquo;t suffer from all the problems of
<code>\</code><code>verb</code>, though it&rsquo;s still not robust;
- &rdquo;<a href="FAQ-setURL.html">typesetting URLs</a>&rdquo; offers advice here.
+ &ldquo;<a href="FAQ-setURL.html">typesetting URLs</a>&rdquo; offers advice here.
<li> If you&rsquo;re putting <code>\</code><code>verb</code> into the argument of a boxing
command (such as <code>\</code><code>fbox</code>), consider using the <code>lrbox</code>
environment:
@@ -80,21 +80,22 @@ necessary?&rdquo;.
<li> Some packages have macros which are designed to be responsive
to verbatim text in their arguments. For example,
the <i>fancyvrb</i> package defines a command
- <code>\</code><code>VerbatimFootnotes</code>, which redefines the <code>\</code><code>footnotetext</code> (and
- hence the <code>\</code><code>footnote</code>) commands in such a way that you can include
- <code>\</code><code>verb</code> commands in its argument. This approach could in
- principle be extended to the arguments of other commands, but it can
- clash with other packages: for example, <code>\</code><code>VerbatimFootnotes</code>
- interacts poorly with the <code>para</code> option to the <i>footmisc</i>
- package.
+ <code>\</code><code>VerbatimFootnotes</code>, which redefines the <code>\</code><code>footnotetext</code>
+ command, and hence also the behaviour of the <code>\</code><code>footnote</code>)
+ command, in such a way that you can include <code>\</code><code>verb</code> commands in
+ its argument. This approach could in principle be extended to the
+ arguments of other commands, but it can clash with other packages:
+ for example, <code>\</code><code>VerbatimFootnotes</code> interacts poorly with the
+ <code>para</code> option of the <i>footmisc</i> package.
<p/> The <i>memoir</i> class defines its <code>\</code><code>footnote</code> command so that
it will accept verbatim in its arguments, without any supporting package.
<li> The <i>fancyvrb</i> package defines a command <code>\</code><code>SaveVerb</code>,
with a corresponding <code>\</code><code>UseVerb</code> command, that allow you to save
and then to reuse the content of its argument; for details of this
extremely powerful facility, see the package documentation.
-<p/> Rather simpler is the <i>verbdef</i> package, which defines a
- (robust) command which expands to the verbatim argument given.
+<p/> Rather simpler is the <i>verbdef</i> package, whose <code>\</code><code>verbdef</code>
+ command defines a (robust) command which expands to the verbatim
+ argument given.
<li> If you have a single character that is giving trouble (in
its absence you could simply use <code>\</code><code>texttt</code>), consider using
<code>\</code><code>string</code>. <code>\</code><code>texttt{my<code>\</code><code>string</code>_name}</code>
@@ -120,10 +121,10 @@ necessary?&rdquo;.
Documentation of both <i>url</i> and <i>verbdef</i> is in the
package files.
<dl>
-<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/fancyvrb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/fancyvrb/">browse</a>)
-<dt><tt><i>memoir.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/memoir.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/memoir/">browse</a>)
-<dt><tt><i>url.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
-<dt><tt><i>verbdef.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/misc/verbdef.sty">macros/latex/contrib/misc/verbdef.sty</a>
+<dt><tt><i>fancyvrb.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb.zip">macros/latex/contrib/fancyvrb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/fancyvrb/">browse the directory</a>)
+<dt><tt><i>memoir.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir.zip">macros/latex/contrib/memoir</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/memoir/">browse the directory</a>)
+<dt><tt><i>url.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/url.sty">macros/latex/contrib/misc/url.sty</a>
+<dt><tt><i>verbdef.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/misc/verbdef.sty">macros/latex/contrib/misc/verbdef.sty</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=verbwithin">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=verbwithin</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-virtualfonts.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-virtualfonts.html
index dc3ae3f7377..2cdef3b90d1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-virtualfonts.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-virtualfonts.html
@@ -54,10 +54,10 @@ together with the discussion of
fonts (it uses TeX to parse a description of the virtual font, and
<i>qdtexvpl</i> itself processes the resulting DVI file).
<dl>
-<dt><tt><i>fontinst</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/fontinst.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/fontinst/">browse</a>)
-<dt><tt><i>Knuth on virtual fonts</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/knuth/virtual-fonts">info/knuth/virtual-fonts</a>
-<dt><tt><i>Virtual fonts &ldquo;how to&rdquo;</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/virtualfontshowto/virtualfontshowto.txt">info/virtualfontshowto/virtualfontshowto.txt</a>
-<dt><tt><i>qdtexvpl</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/qdtexvpl.zip">fonts/utilities/qdtexvpl</a> (<a href="ftp://cam.ctan.org/tex-archive/fonts/utilities/qdtexvpl.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/fonts/utilities/qdtexvpl/">browse</a>)
+<dt><tt><i>fontinst</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst.zip">fonts/utilities/fontinst</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/fontinst/">browse the directory</a>)
+<dt><tt><i>Knuth on virtual fonts</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/knuth/virtual-fonts">info/knuth/virtual-fonts</a>
+<dt><tt><i>Virtual fonts &ldquo;how to&rdquo;</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/virtualfontshowto/virtualfontshowto.txt">info/virtualfontshowto/virtualfontshowto.txt</a>
+<dt><tt><i>qdtexvpl</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/qdtexvpl.zip">fonts/utilities/qdtexvpl</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/fonts/utilities/qdtexvpl/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=virtualfonts">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=virtualfonts</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-watermark.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-watermark.html
index fb996352f51..f075966cd12 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-watermark.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-watermark.html
@@ -32,12 +32,12 @@ to do what you like.
to a particular page; you therefore need to construct your own
apparatus for anything complicated.
<dl>
-<dt><tt><i>draftcopy.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/draftcopy.zip">macros/latex/contrib/draftcopy</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/draftcopy.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/draftcopy/">browse</a>)
-<dt><tt><i>draftwatermark.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/draftwatermark.zip">macros/latex/contrib/draftwatermark</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/draftwatermark.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/draftwatermark/">browse</a>)
-<dt><tt><i>eso-pic.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eso-pic.zip">macros/latex/contrib/eso-pic</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/eso-pic.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/eso-pic/">browse</a>)
-<dt><tt><i>everypage.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/everypage.zip">macros/latex/contrib/everypage</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/everypage.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/everypage/">browse</a>)
-<dt><tt><i>everyshi.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ms.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ms/">browse</a>)
-<dt><tt><i>wallpaper.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wallpaper.zip">macros/latex/contrib/wallpaper</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wallpaper.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/wallpaper/">browse</a>)
+<dt><tt><i>draftcopy.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/draftcopy.zip">macros/latex/contrib/draftcopy</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/draftcopy/">browse the directory</a>)
+<dt><tt><i>draftwatermark.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/draftwatermark.zip">macros/latex/contrib/draftwatermark</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/draftwatermark/">browse the directory</a>)
+<dt><tt><i>eso-pic.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eso-pic.zip">macros/latex/contrib/eso-pic</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/eso-pic/">browse the directory</a>)
+<dt><tt><i>everypage.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/everypage.zip">macros/latex/contrib/everypage</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/everypage/">browse the directory</a>)
+<dt><tt><i>everyshi.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms.zip">macros/latex/contrib/ms</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ms/">browse the directory</a>)
+<dt><tt><i>wallpaper.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wallpaper.zip">macros/latex/contrib/wallpaper</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wallpaper/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=watermark">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=watermark</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-webpkgs.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-webpkgs.html
index c3e8a9421c5..b3c74170e6c 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-webpkgs.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-webpkgs.html
@@ -26,17 +26,17 @@ is written in ANSI C).
<p/><i>Tweb</i> is a WEB for Plain TeX macro files, using
<i>noweb</i>.
<dl>
-<dt><tt><i>aplweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/apl/aplweb.zip">web/apl/aplweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/apl/aplweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/apl/aplweb/">browse</a>)
-<dt><tt><i>cweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/c_cpp/cweb.zip">web/c_cpp/cweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/c_cpp/cweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/c_cpp/cweb/">browse</a>)
-<dt><tt><i>funnelweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/funnelweb.zip">web/funnelweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/funnelweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/funnelweb/">browse</a>)
-<dt><tt><i>fweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/fweb.zip">web/fweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/fweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/fweb/">browse</a>)
-<dt><tt><i>noweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/noweb.zip">web/noweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/noweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/noweb/">browse</a>)
-<dt><tt><i>nuweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/nuweb.zip">web/nuweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/nuweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/nuweb/">browse</a>)
-<dt><tt><i>schemeweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/schemeweb.zip">web/schemeweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/schemeweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/schemeweb/">browse</a>)
-<dt><tt><i>spiderweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/spiderweb.zip">web/spiderweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/spiderweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/spiderweb/">browse</a>)
-<dt><tt><i>tangle</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/knuth/dist/web.zip">systems/knuth/dist/web</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/knuth/dist/web.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/knuth/dist/web/">browse</a>)
-<dt><tt><i>tweb</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/web/tweb.zip">web/tweb</a> (<a href="ftp://cam.ctan.org/tex-archive/web/tweb.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/web/tweb/">browse</a>)
-<dt><tt><i>weave</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/systems/knuth/dist/web.zip">systems/knuth/dist/web</a> (<a href="ftp://cam.ctan.org/tex-archive/systems/knuth/dist/web.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/systems/knuth/dist/web/">browse</a>)
+<dt><tt><i>aplweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/apl/aplweb.zip">web/apl/aplweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/apl/aplweb/">browse the directory</a>)
+<dt><tt><i>cweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/c_cpp/cweb.zip">web/c_cpp/cweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/c_cpp/cweb/">browse the directory</a>)
+<dt><tt><i>funnelweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/funnelweb.zip">web/funnelweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/funnelweb/">browse the directory</a>)
+<dt><tt><i>fweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/fweb.zip">web/fweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/fweb/">browse the directory</a>)
+<dt><tt><i>noweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/noweb.zip">web/noweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/noweb/">browse the directory</a>)
+<dt><tt><i>nuweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/nuweb.zip">web/nuweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/nuweb/">browse the directory</a>)
+<dt><tt><i>schemeweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/schemeweb.zip">web/schemeweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/schemeweb/">browse the directory</a>)
+<dt><tt><i>spiderweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/spiderweb.zip">web/spiderweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/spiderweb/">browse the directory</a>)
+<dt><tt><i>tangle</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/knuth/dist/web.zip">systems/knuth/dist/web</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/knuth/dist/web/">browse the directory</a>)
+<dt><tt><i>tweb</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/tweb.zip">web/tweb</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/web/tweb/">browse the directory</a>)
+<dt><tt><i>weave</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/knuth/dist/web.zip">systems/knuth/dist/web</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/systems/knuth/dist/web/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=webpkgs">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=webpkgs</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-weirdhyphen.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-weirdhyphen.html
index b722d797144..fe9630bf071 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-weirdhyphen.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-weirdhyphen.html
@@ -27,8 +27,8 @@ December 1995 release of LaTeX2e do <em>not</em> use the alternative
hyphen character, and therefore removed this source of problems; the
solution, again, is to upgrade your LaTeX.
<dl>
-<dt><tt><i>LaTeX 2.09</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/obsolete/macros/latex209/distribs/latex209.tar.gz">obsolete/macros/latex209/distribs/latex209.tar.gz</a>
-<dt><tt><i>plain.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/plain/base.zip">macros/plain/base</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/plain/base.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/plain/base/">browse</a>)
+<dt><tt><i>LaTeX 2.09</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveobsolete/macros/latex209/distribs/latex209.tar.gz">obsolete/macros/latex209/distribs/latex209.tar.gz</a>
+<dt><tt><i>plain.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/base.zip">macros/plain/base</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/plain/base/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=weirdhyphen">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=weirdhyphen</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-what-TDS.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-what-TDS.html
index a6e44a2149f..9ba1ed93ecd 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-what-TDS.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-what-TDS.html
@@ -40,14 +40,14 @@ and register it using the window&rsquo;s
suggests that you should create
&ldquo;<code>C:\Local TeX Files</code>&rdquo;, which is good if you
manage your own machine, but often not even possible in corporate, or
-similar, environments ­&ndash; in such situations, the user may have no
+similar, environments &mdash; in such situations, the user may have no
control over the hard disc of the computer, at all.
<p/>So the real criterion is that your local tree should be somewhere that
<em>you</em>, rather than the system, control. Restrictive systems often
provide a &ldquo;home directory&rdquo; for each user, mounted as a network
drive; this is a natural home for the user&rsquo;s local tree. Other (often
academic) environments assume the user is going to provide a memory
-stick, and will assign it a defined drive letter ­&ndash; another good
+stick, and will assign it a defined drive letter &mdash; another good
candidate location. Note that the semantics of such a tree are
indistinguishable from those of a
<a href="FAQ-privinst.html">&ldquo;home&rdquo; TEXMF tree</a>.
@@ -55,7 +55,7 @@ indistinguishable from those of a
<ul>
<li> if the package, or whatever, is &ldquo;personal&rdquo; (for example,
something commercial that has been licensed to you alone, or
- something you&rsquo;re developing yourself), the package should go in your
+ something you&rsquo;re developing yourself), it should go in your
<a href="FAQ-privinst.html">&ldquo;home&rdquo; TEXMF tree</a>;
<li> if you <em>know</em> that the package you are installing is a
replacement for the copy on the TEXMF tree of your (La)TeX
@@ -71,7 +71,7 @@ have an effect like:
<ul>
<li> distribution comes with package version n;
<li> you install package version n+1 on the local tree; and
-<li> the updated distribution comes with package version n+2.
+<li> the updated distribution provides package version n+2.
</ul>
In such a situation, you will find yourself using version
n+1 (from the local tree) <em>after</em> the new
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatTeX.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatTeX.html
index 18536d7d135..45e6983fcd7 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatTeX.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatTeX.html
@@ -7,7 +7,11 @@
says in the Preface to his book on TeX
(see <a href="FAQ-books.html">books about TeX</a>) that it is
-&ldquo;<em>intended for the creation of beautiful books &mdash; and especially for books that contain a lot of mathematics</em>&rdquo;.
+&ldquo;<em>intended for the creation of beautiful books &mdash;</em>
+<em>and especially for books that contain a lot of mathematics</em>&rdquo;.
+(If TeX were <em>only</em> good for mathematical books, much of its
+use nowadays would not happen: it&rsquo;s actually a pretty good general
+typesetting system.)
<p/>Knuth is Emeritus Professor of the Art of Computer Programming at
Stanford University in California, USA. Knuth developed the
first version of TeX in 1978 to deal with revisions to his series
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatbst.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatbst.html
index 71e450dd0cb..9e2817a6bd1 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatbst.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatbst.html
@@ -49,7 +49,7 @@ produce. (Because <i>xampl.bib</i> is so extreme in some of its
&ldquo;examples&rdquo;, the BibTeX run will also give you an interesting
selection of BibTeX&rsquo;s error messages...)
<dl>
-<dt><tt><i>xampl.bib</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/biblio/bibtex/distribs/doc/xampl.bib">biblio/bibtex/distribs/doc/xampl.bib</a>
+<dt><tt><i>xampl.bib</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivebiblio/bibtex/distribs/doc/xampl.bib">biblio/bibtex/distribs/doc/xampl.bib</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whatbst">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whatbst</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatmacros.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatmacros.html
new file mode 100644
index 00000000000..f37343a9096
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatmacros.html
@@ -0,0 +1,65 @@
+<head>
+<title>UK TeX FAQ -- question label whatmacros</title>
+</head><body>
+<h3>What are (TeX) macros</h3>
+<p/>TeX is a <em>macro processor</em>: this is a computer-science-y term
+meaning &ldquo;text expander&rdquo; (more or less); TeX typesets text as it
+goes along, but <em>expands</em> each macro it finds. TeX&rsquo;s macros
+may include instructions to TeX itself, on top of the simple text
+generation one might expect.
+<p/>Macros are a <em>good thing</em>, since they allow the user to
+manipulate documents according to context. For example, the macro
+<code>\</code><code>TeX</code> is usually defined to produce &ldquo;TEX&rdquo; with the &lsquo;E&rsquo; lowered,
+but in these FAQs the default definition of the macro is
+overridden, and it simply expands to the letters &ldquo;TeX&rdquo;. (<em>You</em>
+may not think this a good thing, but the author of the macros has his
+reasons &ndash; see <a href="FAQ-logos.html">TeX-related logos</a>.)
+<p/>Macro names are conventionally built from a <code>\</code>
+followed by a sequence of letters, which may be upper or lower case
+(as in <code>\</code><code>TeX</code>, mentioned above). They may also be
+<code>\&lt;<i>any single character</i>&gt;</code>, which allows all
+sorts of oddities (many built in to most TeX macro sets, all the
+way up from the apparently simple &lsquo;<code>\</code><code> </code>&rsquo; meaning &ldquo;insert a space
+here&rdquo;).
+<p/>Macro programming can be a complicated business, but at their very
+simplest they need little introduction &mdash; you&rsquo;ll hardly need to be
+told that:
+<blockquote>
+<pre>
+\def\foo{bar}
+</pre>
+</blockquote><p>
+replaces each instance of <code>\</code><code>foo</code> with the text &ldquo;bar&rdquo;. The
+command <code>\</code><code>def</code> is Plain TeX syntax for defining commands;
+LaTeX offers a macro <code>\</code><code>newcommand</code> that goes some way towards
+protecting users from themselves, but basically does the same thing:
+<blockquote>
+<pre>
+\newcommand{\foo}{bar}
+</pre>
+</blockquote><p>
+Macros may have &ldquo;arguments&rdquo;, which are used to substitute for marked
+bits of the macro expansion:
+<blockquote>
+<pre>
+\def\foo#1{This is a #1 bar}
+...
+\foo{2/4}
+</pre>
+</blockquote><p>
+or, in LaTeX speak:
+<blockquote>
+<pre>
+\newcommand{\foo}[1]{This is a #1 bar}
+...
+\foo{3/4}
+</pre>
+</blockquote><p>
+Macro writing can get very complicated, very quickly. If you are a
+beginner (La)TeX programmer, you are well advised to read something
+along the lines of the <a href="FAQ-books.html">TeXbook</a>; once you&rsquo;re under
+way, <a href="FAQ-ol-books.html">TeX by Topic</a> is possibly a more satisfactory
+choice. Rather a lot of the answers in these FAQs tell you
+about various issues of how to write macros.
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whatmacros">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whatmacros</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatpdftex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatpdftex.html
index 6e59347c7ed..15d32cd9f7b 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatpdftex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whatpdftex.html
@@ -2,10 +2,13 @@
<title>UK TeX FAQ -- question label whatpdftex</title>
</head><body>
<h3>What is PDFTeX?</h3>
-<p/>PDFTeX has entered the main stream of TeX distributions: most
-LaTeX and ConTeXt users nowadays use PDFTeX whether they know
-it or not (more precisely, they use an amalgam of PDFTeX and
-<a href="FAQ-etex.html">e-TeX</a>). So what is PDFTeX?
+<p/>One can reasonably say that PDFTeX is (today) the main stream of
+TeX distributions: most LaTeX and ConTeXt users nowadays use
+PDFTeX whether they know it or not (more precisely, they use
+PDFTeX extended by
+ <a href="FAQ-etex.html">e-TeX</a>).
+
+So what is PDFTeX?
<p/>PDFTeX is a development of TeX that is capable of generating
typeset PDF output in place of DVI. PDFTeX has
other capabilities, most notably in the area of fine typographic
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whereFAQ.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whereFAQ.html
index 8fccd8c871a..dc7a246a4ef 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whereFAQ.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-whereFAQ.html
@@ -39,23 +39,24 @@ ordinary mortals&rsquo; use.
<dt>German<dd>Posted regularly to <i>de.comp.tex</i>, and archived
on CTAN; the FAQ also appears at
<a href="http://www.dante.de/faq/de-tex-faq/">http://www.dante.de/faq/de-tex-faq/</a>
-<dt>French<dd>An interactive (full-screen!) FAQ may be found at
- <a href="http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf">http://www.frenchpro6.com/screen.pdf/FAQscreen.pdf</a>, and a copy
- for printing at <a href="http://frenchle.free.fr/FAQ.pdf">http://frenchle.free.fr/FAQ.pdf</a>;
+<dt>French<dd>
+
+
+
A FAQ used to be posted regularly to
<i>fr.comp.text.tex</i>, and is archived on CTAN &mdash;
sadly, that effort seems to have fallen by the wayside.
-<dt>Spanish<dd>See <a href="http://apolo.us.es/CervanTeX/FAQ/">http://apolo.us.es/CervanTeX/FAQ/</a>
+
<dt>Czech<dd>See <a href="http://www.fi.muni.cz/cstug/csfaq/">http://www.fi.muni.cz/cstug/csfaq/</a>
</dl>
<p/>Resources available on CTAN are:
<dl>
-<dt><tt><i>Dante FAQ</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/help/de-tex-faq.zip">help/de-tex-faq</a> (<a href="ftp://cam.ctan.org/tex-archive/help/de-tex-faq.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/de-tex-faq/">browse</a>)
-<dt><tt><i>French FAQ</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/help/LaTeX-FAQ-francaise.zip">help/LaTeX-FAQ-francaise</a> (<a href="ftp://cam.ctan.org/tex-archive/help/LaTeX-FAQ-francaise.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/LaTeX-FAQ-francaise/">browse</a>)
-<dt><tt><i>Sources of this FAQ</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (<a href="ftp://cam.ctan.org/tex-archive/help/uk-tex-faq.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/help/uk-tex-faq/">browse</a>)
+<dt><tt><i>Dante FAQ</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/de-tex-faq.zip">help/de-tex-faq</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/de-tex-faq/">browse the directory</a>)
+<dt><tt><i>French FAQ</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/LaTeX-FAQ-francaise.zip">help/LaTeX-FAQ-francaise</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/LaTeX-FAQ-francaise/">browse the directory</a>)
+<dt><tt><i>Sources of this FAQ</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq.zip">help/uk-tex-faq</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq/">browse the directory</a>)
<dt><tt><i>Obsolete <code>comp.text.tex</code> FAQ</i></tt><dd>
- <a href="ftp://cam.ctan.org/tex-archive/obsolete/help/TeX,_LaTeX,_etc.:_Frequently_Asked_Questions_with_Answers">obsolete/help/TeX,_LaTeX,_etc.:_Frequently_Asked_Questions_with_Answers</a>
-<dt><tt><i>The visual FAQ</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/info/visualFAQ/visualFAQ.pdf">info/visualFAQ/visualFAQ.pdf</a>
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveobsolete/help/TeX,_LaTeX,_etc.:_Frequently_Asked_Questions_with_Answers">obsolete/help/TeX,_LaTeX,_etc.:_Frequently_Asked_Questions_with_Answers</a>
+<dt><tt><i>The visual FAQ</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archiveinfo/visualFAQ/visualFAQ.pdf">info/visualFAQ/visualFAQ.pdf</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whereFAQ">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=whereFAQ</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wholerow.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wholerow.html
index a4b39068e90..20880193f9f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wholerow.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wholerow.html
@@ -23,7 +23,7 @@ than columns. So, we set things up by:
</pre>
</blockquote><p>
Now, we put &lsquo;<code>$</code>&rsquo; before the first column specifier; and we
-put &lsquo;<code>\textasciicircum</code>&rsquo;
+put &lsquo;<code>textasciicircum</code>&rsquo;
before the modifiers of subsequent ones. We then use <code>\</code><code>rowstyle</code> at
the start of each row we want to modify:
<blockquote>
@@ -44,7 +44,7 @@ The <i>array</i> package works with several other
example <code>longtable</code>), but unfortunately this trick won&rsquo;t
always work.
<dl>
-<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>array.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wholerow">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wholerow</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-widefigs.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-widefigs.html
index 520cd27f9d4..e1fff76feb3 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-widefigs.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-widefigs.html
@@ -16,8 +16,8 @@ float environments. You should include them in <code>figure</code> environments
or use the <i>float</i> or <i>ccaption</i>package to define a
new float type.
<dl>
-<dt><tt><i>ccaption.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/ccaption.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/ccaption/">browse</a>)
-<dt><tt><i>float.sty</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/float.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/float/">browse</a>)
+<dt><tt><i>ccaption.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption.zip">macros/latex/contrib/ccaption</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/ccaption/">browse the directory</a>)
+<dt><tt><i>float.sty</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float.zip">macros/latex/contrib/float</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/float/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=widefigs">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=widefigs</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wideflt.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wideflt.html
new file mode 100644
index 00000000000..49e24031d72
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wideflt.html
@@ -0,0 +1,30 @@
+<head>
+<title>UK TeX FAQ -- question label wideflt</title>
+</head><body>
+<h3>Centring a very wide figure or table</h3>
+<p/>The normal means of centring a figure or table object is to include
+<code>\</code><code>centering</code> at the top of the float. This doesn&rsquo;t help if the
+object is wider than <code>\</code><code>textwidth</code> &mdash; the object starts at the left
+margin and juts out into the right margin (which is actually doubly
+unsatisfactory, since as well as looking bad, the float won&rsquo;t be
+placed until the next <code>\</code><code>clearpage</code> or the like.)
+<p/>You can avoid the problem by rescaling the figure or table to fit, but
+this is often not satisfactory, for several reasons.
+<p/>Otherwise, if the object is wider than the printable area of the page,
+you&rsquo;ve no choice other than to <a href="FAQ-landscape.html">rotate it</a>. If,
+however, the object is <em>just</em> wider than the text block, you can
+make it pretend to be the right size by:
+<blockquote>
+<pre>
+\begin{figure}
+ \noindent
+ \makebox[\textwidth]{\includegraphics{my-wide-figure}}%
+ \caption{This figure juts out into both margins}
+\end{figure}
+</pre>
+
+</blockquote><p>
+Note the <code>\</code><code>noindent</code>: the <code>\</code><code>makebox</code> starts a paragraph, and you
+really don&rsquo;t want that indented by <code>\</code><code>parindent</code>.
+<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wideflt">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wideflt</a>
+</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wordcount.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wordcount.html
index 36b42d6fb41..16bd4cdafbf 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wordcount.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-wordcount.html
@@ -27,16 +27,23 @@ The <i>latexcount</i> script does the same sort of job, in one
easily configured (see documentation inside the script).
<i>Winedt</i> (see <a href="FAQ-editors.html">editors and shells</a>)
provides this functionality direct in the Windows environment.
-<p/>Simply stripping (La)TeX markup isn&rsquo;t entirely reliable, however:
-that markup itself may contribute typeset words, and this could be a
-problem. The <i>wordcount</i> package
+<p/><i>TeXcount</i> also goes a long way with heuristics for counting,
+starting from a LaTeX file; the documentation is comprehensive, and
+you may try the script on-line via the
+ <a href="http://folk.uio.no/einarro/Comp/texwordcount.html">package home page</a>.
+
+Even quite sophisticated stripping of (La)TeX markup can never be
+entirely reliable, however: that markup itself may contribute typeset
+words, and this could be a problem. The <i>wordcount</i> package
contains a Bourne shell (i.e., typically Unix) script for running a
LaTeX file with a special piece of supporting TeX code, and then
counting word indications in the log file. This is probably as
-accurate automatic counting as you can get.
+accurate automatic counting as you can get, if it works for you.
<dl>
-<dt><tt><i>detex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/support/detex.zip">support/detex</a> (<a href="ftp://cam.ctan.org/tex-archive/support/detex.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/support/detex/">browse</a>)
-<dt><tt><i>wordcount</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wordcount.zip">macros/latex/contrib/wordcount</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/contrib/wordcount.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/wordcount/">browse</a>)
+<dt><tt><i>detex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/detex.zip">support/detex</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/detex/">browse the directory</a>)
+<dt><tt><i>latexcount.pl</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivesupport/latexcount/latexcount.pl">support/latexcount/latexcount.pl</a>
+<dt><tt><i>TeXcount</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/texcount.zip">support/texcount</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/support/texcount/">browse the directory</a>)
+<dt><tt><i>wordcount</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wordcount.zip">macros/latex/contrib/wordcount</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/contrib/wordcount/">browse the directory</a>)
</dl>
<p/>
<p/><p/><p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wordcount">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wordcount</a>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-writecls.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-writecls.html
index 492b1347ae9..6f25dd17fb9 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-writecls.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-writecls.html
@@ -17,9 +17,12 @@ knowledge it is possible to use the documented source of LaTeX as
reference material (dedicated authors will acquaint themselves with the
source as a matter of course). A complete set of the documented
source of LaTeX may be prepared by processing the file
-<i>source2e.tex</i> in the LaTeX distribution, but individual files
-in the distribution may be processed separately with LaTeX, like
-any well-constructed <a href="FAQ-dtx.html"><code>.dtx</code> file</a>.
+<i>source2e.tex</i> in the LaTeX distribution. Such processing is
+noticeably tedious, but Heiko Oberdiek has prepared a well-linked
+PDF version, which is in the file <i>base.tds.zip</i> of his
+<i>latex-tds</i> distribution. Individual files in the LaTeX
+distribution may be processed separately with LaTeX, like any
+well-constructed <a href="FAQ-dtx.html"><code>.dtx</code> file</a>.
<p/>Writing good classes is not easy; it&rsquo;s a good idea to read some
established ones (<i>classes.dtx</i>, for example, is the documented
source of the standard classes other than <i>Letter</i>, and may
@@ -33,11 +36,12 @@ as it appears in <i>classes.dtx</i>, was published in
<i>TUGboat</i> 28(1). The article, by Peter Flynn, which is some help in
understanding <i>classes.dtx</i>
<dl>
-<dt><tt><i>classes.dtx</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base/classes.dtx">macros/latex/base/classes.dtx</a>
-<dt><tt><i>clsguide.pdf</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc/clsguide.pdf">macros/latex/doc/clsguide.pdf</a>
-<dt><tt><i>ltxguide.cls</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base/ltxguide.cls">macros/latex/base/ltxguide.cls</a>
-<dt><tt><i>LaTeX documentation</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc.zip">macros/latex/doc</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/doc.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/doc/">browse</a>)
-<dt><tt><i>source2e.tex</i></tt><dd><a href="ftp://cam.ctan.org/tex-archive/macros/latex/base/source2e.tex">macros/latex/base/source2e.tex</a>
+<dt><tt><i>classes.dtx</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/base/classes.dtx">macros/latex/base/classes.dtx</a>
+<dt><tt><i>clsguide.pdf</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/doc/clsguide.pdf">macros/latex/doc/clsguide.pdf</a>
+<dt><tt><i>latex-tds collection</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/contrib/latex-tds/">macros/latex/contrib/latex-tds/</a>
+<dt><tt><i>ltxguide.cls</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/base/ltxguide.cls">macros/latex/base/ltxguide.cls</a>
+<dt><tt><i>LaTeX documentation</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/doc.zip">macros/latex/doc</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/doc/">browse the directory</a>)
+<dt><tt><i>source2e.tex</i></tt><dd><a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archivemacros/latex/base/source2e.tex">macros/latex/base/source2e.tex</a>
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=writecls">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=writecls</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xetex.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xetex.html
index 6c7acf95289..a100e4cb80f 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xetex.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xetex.html
@@ -2,20 +2,23 @@
<title>UK TeX FAQ -- question label xetex</title>
</head><body>
<h3>The XeTeX project</h3>
-<p/>XeTeX (by Jonathan Kew) is a successor to the shareware TeX/GX
-program for Macintoshes. It is a Unicode-based (UTF-8) TeX
-implementation which is able to make use of Mac OS X AAT
-(Apple Advanced Typography) <code>.dfonts</code> and OpenType fonts. It
-uses Apple&rsquo;s Quartz system (which facilitates the afore-mentioned font
-access) to generate PDF output. XeTeX supports Unicode
-character sets and bidirectional typesetting, and is widely used by
-people studying linguistics, as well as an increasing range of people
-working in other fields.
-<p/>A Linux and Unix-system version is available in TeX Live 2007; that
-version (of course) relies on OpenType fonts alone. A version is
-planned for MiKTeX version 2.7 (currently planned for December 2007).
-<p/>The project has a <a href="http://scripts.sil.org/xetex">web site</a> for
-the user who wants more than this simple answer, and you can also sign
-up to a <a href="http://www.tug.org/mailman/listinfo/xetex">mailing list</a>.
+<p/><a href="http://scripts.sil.org/xetex">XeTeX</a>, by Jonathan Kew, is a
+successor to the shareware TeX/GX program for Macintoshes.
+It is a Unicode-based TeX implementation which is able to make
+direct use of the fonts installed on a system. It supports the
+advanced typographical features available in modern font technology
+(OpenType, AAT on Mac OS X, Graphite). XeTeX was
+originally developed for Mac OS X but it is now fully
+integrated in TeX Live on a wide range of platforms, as well as
+being available as part of MiKTeX. XeTeX supports Unicode
+character sets and bidirectional typesetting (via e-TeX primitives).
+It is popular among linguists and scholars in the humanities, as well
+as an increasing range of people working in other fields. Support for
+mathematical Unicode fonts (such as Asana Math and Cambria) is
+progressing.
+<p/>The project has an active
+<a href="http://www.tug.org/mailman/listinfo/xetex">mailing list</a>; a
+collection of other information is to be found in a set of
+<a href="http://www.tug.org/xetex/">links on the TUG web site</a>.
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=xetex">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=xetex</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xspace.html b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xspace.html
index ff4cbfb70d1..60b55022c76 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xspace.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/FAQ-xspace.html
@@ -50,7 +50,7 @@ which can be confusing, notably to a collaborating author
don&rsquo;t). Of course, no command built into LaTeX or into any
&ldquo;standard&rdquo; class or package will use <code>\</code><code>xspace</code>.
<dl>
-<dt><tt><i>xspace.sty</i></tt><dd>Distributed as part of <a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (<a href="ftp://cam.ctan.org/tex-archive/macros/latex/required/tools.tar.gz">gzipped tar</a>, <a href="http://www.tex.ac.uk/tex-archive/macros/latex/required/tools/">browse</a>)
+<dt><tt><i>xspace.sty</i></tt><dd>Distributed as part of <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools.zip">macros/latex/required/tools</a> (or <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/macros/latex/required/tools/">browse the directory</a>)
</dl>
<p/><p>This question on the Web: <a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=xspace">http://www.tex.ac.uk/cgi-bin/texfaq2html?label=xspace</a>
</body>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/html/index.html b/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
index 81a159e718e..f74c52a4561 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
+++ b/Master/texmf-dist/doc/generic/FAQ-en/html/index.html
@@ -1,56 +1,65 @@
+<html><head>
+<title>TeX Frequently Asked Questions</title>
+</head><body>
+<h1 align="center">Welcome to the UK List of<br>
+ TeX Frequently Asked Questions</h1>
<h2>Introduction</h2>
+
+
+
<p/>This is a set of Frequently Asked Questions (FAQ) for
-English-speaking users of TeX. The questions answered here cover a
-wide range of topics, but the actual typesetting issues are mostly
+English-speaking users of TeX. The questions answered here cover
+a wide range of topics, but the actual typesetting issues are mostly
covered from the viewpoint of a LaTeX user.
<p/>You may use the FAQ
<ul>
-<li> by reading a printed document,
+<li> by reading a printed document,
<li> by viewing a PDF file, with hyperlinks to assist
browsing: copies are available formatted for printing on
- <a href="http://www.tex.ac.uk/tex-archive/help/uk-tex-faq/newfaq.pdf">A4 paper</a> or on
- <a href="http://www.tex.ac.uk/tex-archive/help/uk-tex-faq/letterfaq.pdf">North American &ldquo;letter&rdquo; paper</a>, or
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq/newfaq.pdf">A4 paper</a> or on
+ <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/help/uk-tex-faq/letterfaq.pdf">North American &ldquo;letter&rdquo; paper</a>, or
<li> by using the FAQ&rsquo;s web interface (base URL:
- <a href="http://www.tex.ac.uk/faq">http://www.tex.ac.uk/faq</a>); this version provides simple search
- capabilities, as well as a link to Google for a more sophisticated
- search restricted to the FAQ itself, or
-<li> via Scott Pakin&rsquo;s <a href="http://www.tex.ac.uk/tex-archive/info/visualFAQ/visualFAQ.pdf">Visual FAQ</a>.
+ <a href="http://www.tex.ac.uk/faq">http://www.tex.ac.uk/faq</a>); this version provides simple
+ search capabilities, as well as a link to Google for a more
+ sophisticated search restricted to the FAQ itself, or
+<li> via Scott Pakin&rsquo;s <a href="http://www.tex.ac.uk/www.tex.ac.uk tex-archive/info/visualFAQ/visualFAQ.pdf">Visual FAQ</a>.
</ul>
<p/>
-<b>Caveat: Acquiring files</b>
-<p/>Most answers in this FAQ provide links for downloading
-software; a large proportion of these links direct you to entire
-directories on the CTAN archives. Unfortunately, some browsers
-issue a sequence of commands that causes CTAN servers to deny
-the existence of compressed archive files of the directory, that the
-server would be happy to create &ldquo;on the fly&rdquo;. The FAQ
-therefore offers three possible links for downloading directories
-(that aren&rsquo;t already designated &ldquo;browse only&rdquo;): the links give you
-<code>.zip</code> and <code>.tar.gz</code> archives, and a link for browsing
-the directory.
-<p/>Fortunately, CTAN is switching to statically-generated
-directory archive files; many directories mentioned in this FAQ
-will also exist as <code>.zip</code> files on the archives, and won&rsquo;t fall
-foul of the browser problem. Of course, if the <code>.zip</code> file
-does not exist, and the browser is playing up, you will need to use
-the &ldquo;browse&rdquo; link.
-<p/>
+<p/>Unless otherwise specified, all files mentioned in this FAQ
+are available from a CTAN archive, or from a mirror of
+CTAN &mdash; see <a href="FAQ-archives.html">later discussion</a>
+ of the CTAN
+archives and how to retrieve files
+from them. If you don&rsquo;t have access to the internet, the
+<a href="FAQ-CD.html">TeX Live distribution</a> offers off-line snapshots of the
+archives.
+<p/>The reader should also note that the first directory name of the
+path name of every file on CTAN is omitted from what
+follows, for the simple reason that, while it&rsquo;s always the same
+(<i>tex-archive/</i>) on the main sites, mirror sites often choose
+something else.
+<p/>To avoid confusion, we also omit the full stop from the end of
+any sentence whose last item is a path name (such sentences are
+rare, and only occur at the end of paragraphs). Though the path
+names are set in a different font from running text, it&rsquo;s not easy
+to distinguish the font of a single dot!
<p/><b>Origins</b>
-<p/>The FAQ was originated by the Committee of the UK TeX
-Users&rsquo; Group (UK TUG) as a development of a regular
-posting to the <em>Usenet</em> newsgroup <i>comp.text.tex</i> that
-was maintained for some time by Bobby Bodenheimer. The first
-UK version was much re-arranged and corrected from the
-original, and little of Bodenheimer&rsquo;s work now remains.
+<p/>The FAQ was originated by the Committee of the UK
+TeX Users&rsquo; Group (UK TUG) as a development of a
+regular posting to the <em>Usenet</em> newsgroup
+<i>comp.text.tex</i> that was maintained for some time by Bobby
+Bodenheimer. The first UK version was much re-arranged and
+corrected from the original, and little of Bodenheimer&rsquo;s work now
+remains.
<p/>The following people (at least &mdash; there are almost certainly others
whose names weren&rsquo;t correctly recorded) have contributed help or
-advice on the development of the FAQ:
-Donald Arseneau,
+advice on the development of the FAQ: Donald Arseneau,
Rosemary Bailey,
Barbara Beeton,
-Karl Berry,
+Karl Berry,
Giuseppe Bilotta,
Charles Cameron,
+Fran&ccedil;ois Charette,
Damian Cugley,
Michael Dewey,
Michael Downes,
@@ -81,6 +90,7 @@ Oleg Katsitadze,
Isaac Khabaza,
Ulrich Klauer,
Markus Kohm,
+Stefan Kottwitz
David Kraus,
Ryszard Kubiak,
Simon Law,
@@ -91,7 +101,7 @@ Andreas Matthias,
Brooks Moses,
Iain Murray,
Vilar Camara Neto,
-Dick Nickalls,
+Dick Nickalls,
Ted Nieland,
Hans Nordhaug,
Pat Rau,
@@ -99,6 +109,7 @@ Heiko Oberdiek,
Piet van Oostrum,
Scott Pakin,
Oren Patashnik,
+Manuel P&eacute;gouri&eacute;-Gonnard,
Steve Peter,
Sebastian Rahtz,
Philip Ratcliffe,
@@ -109,19 +120,21 @@ Hans-Peter Schr&ouml;cker,
Joachim Schrod,
Maarten Sneep,
Axel Sommerfeldt,
+Philipp Stephani,
James Szinger,
Ulrik Vieth,
Mike Vulis,
Chris Walker,
Peter Wilson,
+Joseph Wright,
Rick Zaccone and
Reinhard Zierke.
-<p/>
-<p/><h3>The Background</h3><ul>
+<h3>The Background</h3><ul>
<li><a href="FAQ-whatTeX.html">What is TeX?</a>
<li><a href="FAQ-TeXpronounce.html">How should I pronounce &ldquo;TeX&rdquo;?</a>
<li><a href="FAQ-MF.html">What is Metafont?</a>
<li><a href="FAQ-MP.html">What is MetaPost?</a>
+<li><a href="FAQ-texthings.html">Things with &ldquo;TeX&rdquo; in the name</a>
<li><a href="FAQ-triptrap.html">How can I be sure it&rsquo;s really TeX?</a>
<li><a href="FAQ-y2k.html">Are TeX and friends Y2K compliant?</a>
<li><a href="FAQ-etex.html">What is e-TeX?</a>
@@ -170,6 +183,7 @@ Reinhard Zierke.
<li><a href="FAQ-pk.html">What are PK files?</a>
<li><a href="FAQ-tfm.html">What are TFM files?</a>
<li><a href="FAQ-virtualfonts.html">Virtual fonts</a>
+<li><a href="FAQ-whatmacros.html">What are (TeX) macros</a>
<li><a href="FAQ-specials.html"><code>\</code><code>special</code> commands</a>
<li><a href="FAQ-hyphen.html">How does hyphenation work in TeX?</a>
<li><a href="FAQ-clsvpkg.html">What are LaTeX classes and packages?</a>
@@ -177,14 +191,14 @@ Reinhard Zierke.
<li><a href="FAQ-whatenc.html">What are encodings?</a>
<li><a href="FAQ-ECfonts.html">What are the EC fonts?</a>
<li><a href="FAQ-tds.html">What is the TDS?</a>
-<li><a href="FAQ-eps.html">What is &ldquo;Encapsulated PostScript&rdquo; (&ldquo;EPS&rdquo;)</a>
+<li><a href="FAQ-eps.html">What is &ldquo;Encapsulated PostScript&rdquo; (&ldquo;EPS&rdquo;)?</a>
<li><a href="FAQ-adobetypen.html">Adobe font formats</a>
-<li><a href="FAQ-resolns.html">What are &ldquo;resolutions&rdquo;</a>
-<li><a href="FAQ-fontname.html">What is the &ldquo;Berry naming scheme&rdquo;</a>
+<li><a href="FAQ-resolns.html">What are &ldquo;resolutions&rdquo;?</a>
+<li><a href="FAQ-fontname.html">What is the &ldquo;Berry naming scheme&rdquo;?</a>
</ul><h3>Acquiring the Software</h3><ul>
<li><a href="FAQ-archives.html">Repositories of TeX material</a>
-<li><a href="FAQ-tds-zip.html">Prebuilt installation files on the archive</a>
-<li><a href="FAQ-nonfree.html">What&rsquo;s the CTAN <code>nonfree</code> tree?</a>
+<li><a href="FAQ-tds-zip.html">Ready-built installation files on the archive</a>
+<li><a href="FAQ-nonfree.html">What is the CTAN <code>nonfree</code> tree?</a>
<li><a href="FAQ-uploads.html">Contributing a file to the archives</a>
<li><a href="FAQ-findfiles.html">Finding (La)TeX files</a>
<li><a href="FAQ-findfont.html">Finding new fonts</a>
@@ -200,7 +214,7 @@ Reinhard Zierke.
<li><a href="FAQ-previewers.html">DVI previewers</a>
<li><a href="FAQ-dvi-bmp.html">Generating bitmaps from DVI</a>
</ul><h3>Support Packages for TeX</h3><ul>
-<li><a href="FAQ-fig.html">Fig, a (La)TeX-friendly drawing package</a>
+<li><a href="FAQ-figetc.html">(La)TeX-friendly drawing packages</a>
<li><a href="FAQ-texcad.html">TeXCAD, a drawing package for LaTeX</a>
<li><a href="FAQ-spell.html">Spelling checkers for work with TeX</a>
<li><a href="FAQ-wordcount.html">How many words have you written?</a>
@@ -226,7 +240,7 @@ Reinhard Zierke.
<li><a href="FAQ-inst-tidy.html">Tidying up after installation</a>
<li><a href="FAQ-inst-scut.html">Shortcuts to installing files</a>
<li><a href="FAQ-inst-miktexstar.html">Installation using MiKTeX package manager</a>
-<li><a href="FAQ-inst-tds-zip.html">Installing using preformatted ZIP files</a>
+<li><a href="FAQ-inst-tds-zip.html">Installing using ready-built ZIP files</a>
<li><a href="FAQ-tempinst.html">&ldquo;Temporary&rdquo; installation of (La)TeX files</a>
<li><a href="FAQ-privinst.html">&ldquo;Private&rdquo; installations of files</a>
<li><a href="FAQ-instfont.html">Installing a new font</a>
@@ -269,6 +283,7 @@ Reinhard Zierke.
<li><a href="FAQ-dvipsgraphics.html">Imported graphics in <i>dvips</i></a>
<li><a href="FAQ-pdftexgraphics.html">Imported graphics in PDFLaTeX</a>
<li><a href="FAQ-dvipdfmgraphics.html">Imported graphics in <i>dvipdfm</i></a>
+<li><a href="FAQ-grffilenames.html">&ldquo;Modern&rdquo; graphics file names</a>
<li><a href="FAQ-graphicspath.html">Importing graphics from &ldquo;somewhere else&rdquo;</a>
<li><a href="FAQ-graph-pspdf.html">Portable imported graphics</a>
<li><a href="FAQ-repeatgrf.html">Repeated graphics in a document</a>
@@ -351,7 +366,6 @@ Reinhard Zierke.
<li><a href="FAQ-nopagebrk.html">Preventing page breaks between lines</a>
<li><a href="FAQ-parallel.html">Parallel setting of text</a>
<li><a href="FAQ-epigraph.html">Typesetting epigraphs</a>
-<li><a href="FAQ-outszwrng.html">(La)TeX PDF output prints at wrong size</a>
</ul><h4>Spacing of characters and lines</h4><ul>
<li><a href="FAQ-linespace.html">Double-spaced documents in LaTeX</a>
<li><a href="FAQ-letterspace.html">Changing the space between letters</a>
@@ -415,6 +429,7 @@ Reinhard Zierke.
</ul><h4>Floating tables, figures, etc.</h4><ul>
<li><a href="FAQ-floatpages.html">Floats on their own on float pages</a>
<li><a href="FAQ-vertspacefloat.html">Extra vertical space in floats</a>
+<li><a href="FAQ-wideflt.html">Centring a very wide figure or table</a>
<li><a href="FAQ-2colfloat.html">Placing two-column floats at bottom of page</a>
<li><a href="FAQ-mcfloat.html">Floats in multicolumn setting</a>
<li><a href="FAQ-dpfloat.html">Facing floats on 2-page spread</a>
@@ -452,6 +467,7 @@ Reinhard Zierke.
<li><a href="FAQ-bold-extras.html">How to do bold-tt or bold-sc</a>
<li><a href="FAQ-varwidth.html">Automatic sizing of <code>minipage</code></a>
</ul><h3>Symbols, etc.</h3><ul>
+<li><a href="FAQ-usesymb.html">Using symbols</a>
<li><a href="FAQ-numbersets.html">Symbols for the number sets</a>
<li><a href="FAQ-scriptfonts.html">Better script fonts for maths</a>
<li><a href="FAQ-boldgreek.html">Setting bold Greek letters in LaTeX</a>
@@ -460,8 +476,10 @@ Reinhard Zierke.
<li><a href="FAQ-atsign.html">How to type an &lsquo;@&rsquo; sign?</a>
<li><a href="FAQ-euro.html">Typesetting the Euro sign</a>
<li><a href="FAQ-tradesyms.html">How to get copyright, trademark, etc.</a>
+<li><a href="FAQ-osf.html">Using &ldquo;old-style&rdquo; figures</a>
</ul><h3>Macro programming</h3><ul>
</ul><h4>&ldquo;Generic&rdquo; macros and techniques</h4><ul>
+<li><a href="FAQ-linmacnames.html">Non-letters in macro names</a>
<li><a href="FAQ-findwidth.html">Finding the width of a letter, word, or phrase</a>
<li><a href="FAQ-patch.html">Patching existing commands</a>
<li><a href="FAQ-compjobnam.html">Comparing the &ldquo;job name&rdquo;</a>
@@ -469,6 +487,7 @@ Reinhard Zierke.
<li><a href="FAQ-hash.html">Defining macros within macros</a>
<li><a href="FAQ-spinmacro.html">Spaces in macros</a>
<li><a href="FAQ-moren9.html">How to break the 9-argument limit</a>
+<li><a href="FAQ-keyval.html">Key-value input for macros and package options</a>
<li><a href="FAQ-activechars.html">Defining characters as macros</a>
<li><a href="FAQ-actinarg.html">Active characters in command arguments</a>
<li><a href="FAQ-csname.html">Defining a macro from an argument</a>
@@ -527,6 +546,7 @@ Reinhard Zierke.
<li><a href="FAQ-breaklinks.html">Link text doesn&rsquo;t break at end line</a>
<li><a href="FAQ-wrongpn.html">Page number is wrong at start of page</a>
<li><a href="FAQ-matchbrak.html">My brackets don&rsquo;t match</a>
+<li><a href="FAQ-pdf-fig-chars.html">Characters disappear from figures in PDFTeX</a>
</ul><h4>Common misunderstandings</h4><ul>
<li><a href="FAQ-include.html">What&rsquo;s going on in my <code>\</code><code>include</code> commands?</a>
<li><a href="FAQ-paraparam.html">Why does it ignore paragraph parameters?</a>
@@ -581,6 +601,7 @@ Reinhard Zierke.
<li><a href="FAQ-errmissitem.html">Perhaps a missing <code>\</code><code>item</code>?</a>
<li><a href="FAQ-errparnum.html">Illegal parameter number in definition</a>
<li><a href="FAQ-fllost.html">Float(s) lost</a>
+<li><a href="FAQ-texorpdf.html">Token not allowed in PDFDocEncoded string</a>
<li><a href="FAQ-optionclash.html">Option clash for package</a>
<li><a href="FAQ-checksum.html">Checksum mismatch in font</a>
<li><a href="FAQ-entercompmode.html">Entering compatibility mode</a>
@@ -589,11 +610,11 @@ Reinhard Zierke.
<li><a href="FAQ-mathml.html">Future WWW technologies and (La)TeX</a>
<li><a href="FAQ-textrace.html">Making outline fonts from Metafont</a>
<li><a href="FAQ-WYGexpts.html">The TeX document preparation environment</a>
-<li><a href="FAQ-ant.html">The ANT typesetting system</a>
-<li><a href="FAQ-extex.html">The ExTeX project</a>
<li><a href="FAQ-omegaleph.html">Omega and Aleph</a>
-<li><a href="FAQ-luatex.html">PDFTeX becomes LuaTeX</a>
<li><a href="FAQ-xetex.html">The XeTeX project</a>
+<li><a href="FAQ-luatex.html">PDFTeX and LuaTeX</a>
+<li><a href="FAQ-ant.html">The ANT typesetting system</a>
+<li><a href="FAQ-extex.html">The ExTeX project</a>
<li><a href="FAQ-biblatex.html">Replacing the BibTeX&ndash;LaTeX mechanism</a>
</ul><h3>You&rsquo;re still stuck?</h3><ul>
<li><a href="FAQ-noans.html">You don&rsquo;t understand the answer</a>
@@ -608,5 +629,6 @@ Reinhard Zierke.
"<a href="FAQ-noans.html">Improving the FAQ</a>" or
"<a href="FAQ-newans.html">Extending the FAQ</a>".
<p>
- This is FAQ version 3.18, last modified on 2008-06-21.
+ This is FAQ version 3.19, last modified on 2009-06-10.
</address>
+</body></html>
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf b/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
index d4823f2634a..10c73a57d33 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
+++ b/Master/texmf-dist/doc/generic/FAQ-en/letterfaq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf b/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf
index 8704013cb91..c088527fe80 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf
+++ b/Master/texmf-dist/doc/generic/FAQ-en/newfaq.pdf
Binary files differ
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2dac7c2e545..d2254bbbf3d 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -209,6 +209,8 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
#'euenc', "&MAKEflatten",
'expressgx', "&MAKEexpressg",
'fancyvrb', "&MAKEfancyvrb",
+ 'faq', "die 'skipping, use FAQ-en'",
+ 'faq-en', "die 'skipping, use FAQ-en'",
'faq-fr', "die 'skipping, nonfree'",
'fax', "die 'skipping, nosell license'",
'fc', "&MAKEflatten",
@@ -517,6 +519,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'txfonts', "&MAKEflatten",
'ucs', "&MAKEucs",
'uebungsblatt',"&MAKEflatten",
+ 'uk-faq', "die 'skipping, use FAQ-en'",
'ukrhyph', "&MAKEukrhyph",
'umrand', "die 'skipping, nonfree'",
'unitsdef', "&MAKEflatten",
@@ -927,6 +930,7 @@ $standardtex='\.(cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
%specialdocfmt = (
+ 'FAQ-en', 'generic',
'abbr', 'generic',
'abstyles', 'bibtex',
'apalike', 'bibtex',