Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/zones/

diff --combined distorted.tex
index f143903,1ec0db2..95904b6
--- 1/distorted.tex
--- 2/distorted.tex
+++ b/distorted.tex
@@@ -1,7 -1,3 +1,7 @@@
 +%&distorted
 +
 +\ifx\dumped\xxundefined
 +
  \documentclass[article, a4paper, 10pt, notitlepage, numbering]{strayman}
  \usepackage[palatino, helvetica, maths=cmr]{mdwfonts}
  \usepackage[T1]{fontenc}
@@@ -28,8 -24,6 +28,8 @@@
  
  \errorcontextlines=999
  
 +\let\dumped\relax\expandafter\dump\fi
 +
  \begin{document}
  \title{@l{distorted.org.uk} network design}
  \author{Mark Wooding}
@@@ -346,9 -340,7 +346,7 @@@ externally available: these are shown i
      Ident & TCP 113      & NTP & UDP 123%
        %%\footnote{Only to upstream ISP's time servers.}
                                              & HTTPS & TCP 443    \\
-     TrIPE & UDP 22\,003
-       & \multicolumn{2}{c|}{---}
-       & \multicolumn{2}{c|}{---}                                 \\ \hlx{vh}
+     rsync & TCP 873      & GIT & TCP 9418   & TrIPE & UDP 22\,003 \\ \hlx{vh}
    \end{tabular}
    \end{minipage}