fix manpages

4 files changed, 382 insertions, 1380 deletions

diff --git a/sys/man/1/INDEX b/sys/man/1/INDEX
deleted file mode 100644
index c62d577b3..000000000
--- a/sys/man/1/INDEX
+++ /dev/null
@@ -1,329 +0,0 @@
-0intro 0intro
-intro 0intro
-0a 2a
-1a 2a
-2a 2a
-5a 2a
-6a 2a
-7a 2a
-8a 2a
-ka 2a
-qa 2a
-va 2a
-0c 2c
-1c 2c
-2c 2c
-5c 2c
-6c 2c
-7c 2c
-8c 2c
-kc 2c
-qc 2c
-vc 2c
-0l 2l
-1l 2l
-2l 2l
-5l 2l
-6l 2l
-7l 2l
-8l 2l
-kl 2l
-ql 2l
-vl 2l
-abaco abaco
-readweb abaco
-acid acid
-trump acid
-truss acid
-acme acme
-awd acme
-win acme
-ap ap
-ar ar
-ascii ascii
-unicode ascii
-awk awk
-basename basename
-bc bc
-bind bind
-mount bind
-unmount bind
-bitsyload bitsyload
-keyboard bitsyload
-light bitsyload
-params bitsyload
-pencal bitsyload
-prompter bitsyload
-bundle bundle
-cal cal
-calendar calendar
-cat cat
-read cat
-cb cb
-chgrp chgrp
-chmod chmod
-cleanname cleanname
-cmp cmp
-col col
-colors colors
-getmap colors
-comm comm
-con con
-hayes con
-rx con
-telnet con
-xmr con
-xms con
-cp cp
-fcp cp
-mv cp
-cpp cpp
-cpu cpu
-crop crop
-iconv crop
-clock date
-date date
-db db
-dc dc
-dd dd
-delkey delkey
-delatex deroff
-deroff deroff
-diff diff
-doc2ps doc2txt
-doc2txt doc2txt
-msexceltables doc2txt
-mswordstrings doc2txt
-olefs doc2txt
-wdoc2txt doc2txt
-xls2txt doc2txt
-doctype doctype
-du du
-echo echo
-ecp ecp
-ed ed
-emacs emacs
-eqn eqn
-at expect
-drain expect
-expect expect
-pass expect
-faces faces
-seemail faces
-vwhois faces
-factor factor
-primes factor
-fedex fedex
-ups fedex
-usps fedex
-file file
-deliver filter
-filter filter
-list filter
-token filter
-vf filter
-fmt fmt
-htmlfmt fmt
-fortune fortune
-freq freq
-4s games
-5s games
-games games
-juggle games
-life games
-mahjongg games
-memo games
-sokoban games
-sudoku games
-grap grap
-graph graph
-grep grep
-gs gs
-gview gview
-bunzip2 gzip
-bzip2 gzip
-compress gzip
-gunzip gzip
-gzip gzip
-uncompress gzip
-unzip gzip
-zip gzip
-hget hget
-history history
-hoc hoc
-htmlroff htmlroff
-idiff idiff
-join join
-bmp jpg
-gif jpg
-ico jpg
-jpg jpg
-png jpg
-ppm jpg
-togif jpg
-toico jpg
-topng jpg
-toppm jpg
-v210 jpg
-yuv jpg
-kbmap kbmap
-broke kill
-kill kill
-slay kill
-ktrace ktrace
-kmem leak
-leak leak
-umem leak
-lens lens
-lex lex
-lock lock
-look look
-lp lp
-lc ls
-ls ls
-go.fishing mail
-mail mail
-lookman man
-man man
-sig man
-marshal marshal
-mc mc
-membername mk
-mk mk
-mkdir mkdir
-ml mlmgr
-mlmgr mlmgr
-mlowner mlmgr
-mp3dec mp3dec
-mp3enc mp3enc
-html2ms ms2html
-ms2html ms2html
-mtime mtime
-mug mug
-nedmail nedmail
-netstat netstat
-news news
-nm nm
-ns ns
-p p
-page page
-netkey passwd
-passwd passwd
-patch patch
-pcc pcc
-pic pic
-tpic pic
-pipefile pipefile
-plot plot
-plumb plumb
-pr pr
-kprof prof
-prof prof
-tprof prof
-proof proof
-ps ps
-psu ps
-pdf2ps ps2pdf
-ps2pdf ps2pdf
-pump pump
-pbd pwd
-pwd pwd
-. rc
-cd rc
-eval rc
-exec rc
-exit rc
-flag rc
-rc rc
-rfork rc
-shift rc
-wait rc
-whatis rc
-~ rc
-changes replica
-pull replica
-push replica
-replica replica
-scan replica
-resample resample
-label rio
-rio rio
-window rio
-wloc rio
-rm rm
-conswdir rwd
-rwd rwd
-B sam
-sam sam
-sam.save sam
-samterm sam
-aescbc secstore
-ipso secstore
-secstore secstore
-sed sed
-seq seq
-size size
-sleep sleep
-sort sort
-spell spell
-sprog spell
-spin spin
-split split
-src src
-scp ssh
-ssh ssh
-sshnet ssh
-sshserve ssh
-start stop
-stop stop
-strings strings
-strip strip
-md5sum sum
-sha1sum sum
-sum sum
-syscall syscall
-tail tail
-dircp tar
-tar tar
-tbl tbl
-tcs tcs
-tee tee
-iwhois tel
-tel tel
-test test
-thesaurus thesaurus
-time time
-touch touch
-tr tr
-trace trace
-dpost troff
-nroff troff
-troff troff
-troff2html troff2html
-tweak tweak
-uniq uniq
-units units
-uptime uptime
-unvac vac
-vac vac
-copy venti
-read venti
-venti venti
-write venti
-5i vi
-ki vi
-qi vi
-vi vi
-vnc vnc
-vncs vnc
-vncv vnc
-vt vt
-wc wc
-weather weather
-who who
-whois who
-winwatch winwatch
-xd xd
-yacc yacc
-diffy yesterday
-yesterday yesterday
diff --git a/sys/man/1/INDEX.html b/sys/man/1/INDEX.html
deleted file mode 100644
index 84c4100a0..000000000
--- a/sys/man/1/INDEX.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<HEAD>
-<TITLE>plan 9 man section 1</TITLE>
-</HEAD>
-<BODY>
-<B>[<A HREF="/sys/man/index.html">manual index</A>]</B>
-<H2>Plan 9 from Bell Labs - Section 1 - Commands</H2>
-<HR>
-<DL>
-<DT><A HREF="/magic/man2html/1/0intro">0intro</A>
--  introduction to Plan 9
-<DD><TT> intro</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/2a">2a</A>
--  assemblers
-<DD><TT> 0a, 1a, 2a, 5a, 6a, 7a, 8a, ka, qa, va</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/2c">2c</A>
--  C compilers
-<DD><TT> 0c, 1c, 2c, 5c, 6c, 7c, 8c, kc, qc, vc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/2l">2l</A>
--  loaders
-<DD><TT> 0l, 1l, 2l, 5l, 6l, 7l, 8l, kl, ql, vl</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/abaco">abaco</A>
--  browse the World-Wide Web
-<DD><TT> abaco, readweb</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/acid">acid</A>
--  debugger
-<DD><TT> acid, truss, trump</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/acme">acme</A>
--  interactive text windows
-<DD><TT> acme, win, awd</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ar">ar</A>
--  archive and library maintainer
-<DD><TT> ar</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ascii">ascii</A>
--  interpret ASCII, Unicode characters
-<DD><TT> ascii, unicode</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/awk">awk</A>
--  pattern-directed scanning and processing language
-<DD><TT> awk</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/basename">basename</A>
--  strip file name affixes
-<DD><TT> basename</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/bc">bc</A>
--  arbitrary-precision arithmetic language
-<DD><TT> bc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/bind">bind</A>
--  change name space
-<DD><TT> bind, mount, unmount</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/bitsyload">bitsyload</A>
--  bitsy-specific utilities
-<DD><TT> bitsyload, light, pencal, keyboard, params, prompter</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/bundle">bundle</A>
--  collect files for distribution
-<DD><TT> bundle</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cal">cal</A>
--  print calendar
-<DD><TT> cal</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/calendar">calendar</A>
--  print upcoming events
-<DD><TT> calendar</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cat">cat</A>
--  catenate files
-<DD><TT> cat, read</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cb">cb</A>
--  C program beautifier
-<DD><TT> cb</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/chgrp">chgrp</A>
--  change file group
-<DD><TT> chgrp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/chmod">chmod</A>
--  change mode
-<DD><TT> chmod</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cleanname">cleanname</A>
--  clean a path name
-<DD><TT> cleanname</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cmp">cmp</A>
--  compare two files
-<DD><TT> cmp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/col">col</A>
--  column alignment
-<DD><TT> col</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/colors">colors</A>
--  display color map
-<DD><TT> getmap, colors</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/comm">comm</A>
--  select or reject lines common to two sorted files
-<DD><TT> comm</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/con">con</A>
--  remote login, execution, and XMODEM file transfer
-<DD><TT> con, telnet, rx, hayes, xms, xmr</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cp">cp</A>
--  copy, move files
-<DD><TT> cp, fcp, mv</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cpp">cpp</A>
--  C language preprocessor
-<DD><TT> cpp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/cpu">cpu</A>
--  connection to CPU server
-<DD><TT> cpu</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/crop">crop</A>
--  frame, crop, and convert image
-<DD><TT> crop, iconv</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/date">date</A>
--  date and time
-<DD><TT> date, clock</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/db">db</A>
--  debugger
-<DD><TT> db</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/dc">dc</A>
--  desk calculator
-<DD><TT> dc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/dd">dd</A>
--  convert and copy a file
-<DD><TT> dd</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/delkey">delkey</A>
--  delete keys from factotum
-<DD><TT> delkey</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/deroff">deroff</A>
--  remove formatting requests
-<DD><TT> deroff, delatex</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/diff">diff</A>
--  differential file comparator
-<DD><TT> diff</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/doc2txt">doc2txt</A>
--  extract printable text from Microsoft documents
-<DD><TT> doc2txt, doc2ps, wdoc2txt, xls2txt, olefs, mswordstrings, msexceltables</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/doctype">doctype</A>
--  intuit command line for formatting a document
-<DD><TT> doctype</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/du">du</A>
--  disk usage
-<DD><TT> du</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/echo">echo</A>
--  print arguments
-<DD><TT> echo</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ecp">ecp</A>
--  fast copy, handling errors
-<DD><TT> ecp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ed">ed</A>
--  text editor
-<DD><TT> ed</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/emacs">emacs</A>
--  editor macros
-<DD><TT> emacs</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/eqn">eqn</A>
--  typeset mathematics
-<DD><TT> eqn</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/expect">expect</A>
--  dialer scripting tools
-<DD><TT> at, drain, expect, pass</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/faces">faces</A>
--  mailbox interface
-<DD><TT> faces, seemail, vwhois</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/factor">factor</A>
--  factor a number, generate large primes
-<DD><TT> factor, primes</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/fedex">fedex</A>
--  track shipments
-<DD><TT> fedex, ups, usps</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/file">file</A>
--  determine file type
-<DD><TT> file</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/filter">filter</A>
--  filtering mail
-<DD><TT> filter, list, deliver, token, vf</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/fmt">fmt</A>
--  simple text formatters
-<DD><TT> fmt, htmlfmt</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/fortune">fortune</A>
--  sample lines from a file
-<DD><TT> fortune</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/freq">freq</A>
--  print histogram of character frequencies
-<DD><TT> freq</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/grap">grap</A>
--  pic preprocessor for drawing graphs
-<DD><TT> grap</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/graph">graph</A>
--  draw a graph
-<DD><TT> graph</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/grep">grep</A>
--  search a file for a pattern
-<DD><TT> grep</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/gs">gs</A>
--  Aladdin Ghostscript (PostScript and PDF language interpreter)
-<DD><TT> gs</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/gview">gview</A>
--  interactive graph viewer
-<DD><TT> gview</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/gzip">gzip</A>
--  compress and expand data
-<DD><TT> gzip, gunzip, bzip2, bunzip2, compress, uncompress, zip, unzip</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/hget">hget</A>
--  retrieve a web page corresponding to a url
-<DD><TT> hget</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/history">history</A>
--  print file names from the dump
-<DD><TT> history</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/hoc">hoc</A>
--  interactive floating point language
-<DD><TT> hoc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/htmlroff">htmlroff</A>
--  HTML formatting and typesetting
-<DD><TT> htmlroff</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/idiff">idiff</A>
--  interactive diff
-<DD><TT> idiff</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/join">join</A>
--  relational database operator
-<DD><TT> join</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/jpg">jpg</A>
--  view and convert pictures
-<DD><TT> jpg, gif, png, ppm, bmp, v210, yuv, ico, togif, toppm, topng, toico</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/kbmap">kbmap</A>
--  show a list of available keyboard maps and switch between them.
-<DD><TT> kbmap</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/kill">kill</A>
--  print commands to kill processes
-<DD><TT> kill, slay, broke</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ktrace">ktrace</A>
--  interpret kernel stack dumps
-<DD><TT> ktrace</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/leak">leak</A>
--  help find memory leaks
-<DD><TT> leak, kmem, umem</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/lens">lens</A>
--  interactive screen magnifier
-<DD><TT> lens</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/lex">lex</A>
--  generator of lexical analysis programs
-<DD><TT> lex</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/lock">lock</A>
--  run a command under lock
-<DD><TT> lock</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/look">look</A>
--  find lines in a sorted list
-<DD><TT> look</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/lp">lp</A>
--  printer output
-<DD><TT> lp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ls">ls</A>
--  list contents of directory
-<DD><TT> ls, lc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mail">mail</A>
--  mail and mailboxes
-<DD><TT> mail, go.fishing</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/man">man</A>
--  print or find pages of this manual
-<DD><TT> man, lookman, sig</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/marshal">marshal</A>
--  formatting and sending mail
-<DD><TT> marshal</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mc">mc</A>
--  multicolumn print
-<DD><TT> mc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mk">mk</A>
--  maintain (make) related files
-<DD><TT> mk, membername</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mkdir">mkdir</A>
--  make a directory
-<DD><TT> mkdir</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mlmgr">mlmgr</A>
--  unmoderated mailing lists
-<DD><TT> ml, mlmgr, mlowner</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mp3dec">mp3dec</A>
--  decode audio MPEG files (layers 1, 2 and 3)
-<DD><TT> mp3dec</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mp3enc">mp3enc</A>
--  create mp3 audio files
-<DD><TT> mp3enc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ms2html">ms2html</A>
--  convert between troff's ms macros and html
-<DD><TT> ms2html, html2ms</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mtime">mtime</A>
--  print file modification time
-<DD><TT> mtime</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/mug">mug</A>
--  convert an image to a face icon
-<DD><TT> mug</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/nedmail">nedmail</A>
--  reading mail
-<DD><TT> nedmail</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/netstat">netstat</A>
--  summarize network connections
-<DD><TT> netstat</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/news">news</A>
--  print news items
-<DD><TT> news</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/nm">nm</A>
--  name list (symbol table)
-<DD><TT> nm</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ns">ns</A>
--  display name space
-<DD><TT> ns</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/p">p</A>
--  paginate
-<DD><TT> p</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/page">page</A>
--  view FAX, image, graphic, PostScript, PDF, and typesetter output files
-<DD><TT> page</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/passwd">passwd</A>
--  change or verify user password
-<DD><TT> passwd, netkey</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/patch">patch</A>
--  simple patch creation and tracking system
-<DD><TT> patch</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pcc">pcc</A>
--  APE C compiler driver
-<DD><TT> pcc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pic">pic</A>
--  troff and tex preprocessors for drawing pictures
-<DD><TT> pic, tpic</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pipefile">pipefile</A>
--  attach filter to file in name space
-<DD><TT> pipefile</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/plot">plot</A>
--  graphics filter
-<DD><TT> plot</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/plumb">plumb</A>
--  send message to plumber
-<DD><TT> plumb</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pr">pr</A>
--  print file
-<DD><TT> pr</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/prof">prof</A>
--  display profiling data
-<DD><TT> prof, tprof, kprof</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/proof">proof</A>
--  troff output interpreter
-<DD><TT> proof</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ps">ps</A>
--  process status
-<DD><TT> ps, psu</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ps2pdf">ps2pdf</A>
--  convert between PostScript and PDF
-<DD><TT> ps2pdf, pdf2ps</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pump">pump</A>
--  copy asynchronously via a large circular buffer
-<DD><TT> pump</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/pwd">pwd</A>
--  working directory
-<DD><TT> pwd, pbd</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/rc">rc</A>
--  command language
-<DD><TT> rc, cd, eval, exec, exit, flag, rfork, shift, wait, whatis, ., ~</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/replica">replica</A>
--  client-server replica management
-<DD><TT> changes, pull, push, scan</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/resample">resample</A>
--  resample a picture
-<DD><TT> resample</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/rio">rio</A>
--  window system
-<DD><TT> rio, label, window, wloc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/rm">rm</A>
--  remove files
-<DD><TT> rm</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/rwd">rwd</A>
--  maintain remote working directory
-<DD><TT> rwd, conswdir</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/sam">sam</A>
--  screen editor with structural regular expressions
-<DD><TT> sam, B, sam.save, samterm</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/secstore">secstore</A>
--  secstore commands
-<DD><TT> aescbc, ipso, secstore</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/sed">sed</A>
--  stream editor
-<DD><TT> sed</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/seq">seq</A>
--  print sequences of numbers
-<DD><TT> seq</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/size">size</A>
--  print size of executable files
-<DD><TT> size</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/sleep">sleep</A>
--  suspend execution for an interval
-<DD><TT> sleep</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/sort">sort</A>
--  sort and/or merge files
-<DD><TT> sort</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/spell">spell</A>
--  find spelling errors
-<DD><TT> spell, sprog</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/spin">spin</A>
--  verification tool for models of concurrent systems
-<DD><TT> spin</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/split">split</A>
--  split a file into pieces
-<DD><TT> split</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/src">src</A>
--  find source code for executable
-<DD><TT> src</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/ssh">ssh</A>
--  secure login and file copy from/to Unix or Plan 9
-<DD><TT> ssh, sshnet, scp, sshserve</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/stop">stop</A>
--  print commands to stop and start processes
-<DD><TT> stop, start</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/strings">strings</A>
--  extract printable strings
-<DD><TT> strings</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/strip">strip</A>
--  remove symbols from binary files
-<DD><TT> strip</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/sum">sum</A>
--  sum and count blocks in a file
-<DD><TT> sum, md5sum, sha1sum</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/syscall">syscall</A>
--  test a system call
-<DD><TT> syscall</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tail">tail</A>
--  deliver the last part of a file
-<DD><TT> tail</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tar">tar</A>
--  archiver
-<DD><TT> tar, dircp</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tbl">tbl</A>
--  format tables for nroff or troff
-<DD><TT> tbl</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tcs">tcs</A>
--  translate character sets
-<DD><TT> tcs</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tee">tee</A>
--  pipe fitting
-<DD><TT> tee</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tel">tel</A>
--  look in phone book
-<DD><TT> tel, iwhois</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/test">test</A>
--  set status according to condition
-<DD><TT> test</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/thesaurus">thesaurus</A>
--  search online thesaurus
-<DD><TT> thesaurus</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/time">time</A>
--  time a command
-<DD><TT> time</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/touch">touch</A>
--  set modification date of a file
-<DD><TT> touch</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tr">tr</A>
--  translate characters
-<DD><TT> tr</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/trace">trace</A>
--  show (real-time) process behavior
-<DD><TT> trace</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/troff">troff</A>
--  text formatting and typesetting
-<DD><TT> troff, nroff, dpost</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/troff2html">troff2html</A>
--  convert troff output into HTML
-<DD><TT> troff2html</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/tweak">tweak</A>
--  edit image files, subfont files, face files, etc.
-<DD><TT> tweak</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/uniq">uniq</A>
--  report repeated lines in a file
-<DD><TT> uniq</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/units">units</A>
--  conversion program
-<DD><TT> units</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/uptime">uptime</A>
--  show how long the system has been running
-<DD><TT> uptime</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/vac">vac</A>
--  create, extract a vac archive on Venti
-<DD><TT> vac, unvac</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/venti">venti</A>
--  simple Venti clients
-<DD><TT> read, write, copy</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/vi">vi</A>
--  instruction simulators
-<DD><TT> 5i, ki, vi, qi</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/vnc">vnc</A>
--  remote frame buffer server and viewer for Virtual Network Computing (VNC)
-<DD><TT> vncs, vncv</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/vt">vt</A>
--  emulate a VT-100 or VT-220 terminal
-<DD><TT> vt</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/wc">wc</A>
--  word count
-<DD><TT> wc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/weather">weather</A>
--  print weather report
-<DD><TT> weather</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/who">who</A>
--  who is using the machine
-<DD><TT> who, whois</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/winwatch">winwatch</A>
--  monitor rio windows
-<DD><TT> winwatch</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/xd">xd</A>
--  hex, octal, decimal, or ASCII dump
-<DD><TT> xd</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/yacc">yacc</A>
--  yet another compiler-compiler
-<DD><TT> yacc</TT>
-</DT>
-<DT><A HREF="/magic/man2html/1/yesterday">yesterday</A>
--  print file names from the dump
-<DD><TT> yesterday, diffy</TT>
-</DT>
-</DL>
diff --git a/sys/man/1/hg b/sys/man/1/hg
index 8df08de35..7a621ac0d 100644
--- a/sys/man/1/hg
+++ b/sys/man/1/hg
@@ -1,26 +1,25 @@
-.\"     Title: hg
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 08/13/2008
-.\"    Manual: 
-.\"    Source: 
-.\"
-.TH "HG" "1" "08/13/2008" "" ""
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
+.TH HG 1
+.SH NAME
 hg \- Mercurial source code management system
-.SH "SYNOPSIS"
-\fIhg\fR [global option]\&... <command> [command/global option]\&... [argument]\&...
-.sp
-.SH "DESCRIPTION"
-The hg(1) command provides a command line interface to the Mercurial system\&.
+.SH SYNOPSIS
+.B hg
+[
+.I global option ...
+]
+.I command
+[
+.I command/global option ...
+] [
+.I argument ...
+]
+.SH DESCRIPTION
+The
+.IR hg (1)
+command provides a command line interface to the Mercurial system.
 .sp
 .SH "COMMAND ELEMENTS"
 .PP
-files \&...
+files ...
 .RS 4
 indicates one or more filename or relative path filenames; see "FILE NAME PATTERNS" for information on pattern matching
 .RE
@@ -37,9 +36,9 @@ indicates a changeset which can be specified as a changeset revision number, a t
 .PP
 repository path
 .RS 4
-either the pathname of a local repository or the URI of a remote repository\&. There are two available URI protocols, http:// which is fast and the static\-http:// protocol which is much slower but does not require a special server on the web host\&.
+either the pathname of a local repository or the URI of a remote repository. There are two available URI protocols, http:// which is fast and the static\-http:// protocol which is much slower but does not require a special server on the web host.
 .RE
-.SH "OPTIONS"
+.SH OPTIONS
 .PP
 \-R, \-\-repository
 .RS 4
@@ -122,22 +121,22 @@ output version information and exit
 .RS 4
 display help and exit
 .RE
-.SH "COMMANDS"
+.SH COMMANDS
 .PP
-add [OPTION]\&... [FILE]\&...
+add [OPTION]... [FILE]...
 .RS 4
-Schedule files to be version controlled and added to the repository\&.
+Schedule files to be version controlled and added to the repository.
 .sp
 .RS 4
 .nf
-The files will be added to the repository at the next commit\&. To
-undo an add before that, see hg revert\&.
+The files will be added to the repository at the next commit. To
+undo an add before that, see hg revert.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-If no names are given, add all files in the repository\&.
+If no names are given, add all files in the repository.
 .fi
 .RE
 .sp
@@ -151,24 +150,24 @@ options:
 .RE
 .RE
 .PP
-addremove [OPTION]\&... [FILE]\&...
+addremove [OPTION]... [FILE]...
 .RS 4
-Add all new files and remove all missing files from the repository\&.
+Add all new files and remove all missing files from the repository.
 .sp
 .RS 4
 .nf
-New files are ignored if they match any of the patterns in \&.hgignore\&. As
-with add, these changes take effect at the next commit\&.
+New files are ignored if they match any of the patterns in .hgignore. As
+with add, these changes take effect at the next commit.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Use the \-s option to detect renamed files\&.  With a parameter > 0,
+Use the \-s option to detect renamed files.  With a parameter > 0,
 this compares every removed file with every added file and records
-those similar enough as renames\&.  This option takes a percentage
+those similar enough as renames.  This option takes a percentage
 between 0 (disabled) and 100 (files must be identical) as its
-parameter\&.  Detecting renamed files this way can be expensive\&.
+parameter.  Detecting renamed files this way can be expensive.
 .fi
 .RE
 .sp
@@ -183,22 +182,22 @@ options:
 .RE
 .RE
 .PP
-annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE\&...
+annotate [\-r REV] [\-f] [\-a] [\-u] [\-d] [\-n] [\-c] [\-l] FILE...
 .RS 4
 List changes in files, showing the revision id responsible for each line
 .sp
 .RS 4
 .nf
 This command is useful to discover who did a change or when a change took
-place\&.
+place.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Without the \-a option, annotate will avoid processing files it
-detects as binary\&. With \-a, annotate will generate an annotation
-anyway, probably with undesirable results\&.
+detects as binary. With \-a, annotate will generate an annotation
+anyway, probably with undesirable results.
 .fi
 .RE
 .sp
@@ -225,13 +224,13 @@ aliases: blame
 .RE
 .RE
 .PP
-archive [OPTION]\&... DEST
+archive [OPTION]... DEST
 .RS 4
-By default, the revision used is the parent of the working directory; use "\-r" to specify a different revision\&.
+By default, the revision used is the parent of the working directory; use "\-r" to specify a different revision.
 .sp
 .RS 4
 .nf
-To specify the type of archive to create, use "\-t"\&.  Valid
+To specify the type of archive to create, use "\-t".  Valid
 types are:
 .fi
 .RE
@@ -250,15 +249,15 @@ types are:
 .RS 4
 .nf
 The exact name of the destination archive or directory is given
-using a format string; see "hg help export" for details\&.
+using a format string; see "hg help export" for details.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Each member added to an archive file has a directory prefix
-prepended\&.  Use "\-p" to specify a format string for the prefix\&.
-The default is the basename of the archive, with suffixes removed\&.
+prepended.  Use "\-p" to specify a format string for the prefix.
+The default is the basename of the archive, with suffixes removed.
 .fi
 .RE
 .sp
@@ -275,15 +274,15 @@ options:
 .RE
 .RE
 .PP
-backout [OPTION]\&... [\-r] REV
+backout [OPTION]... [\-r] REV
 .RS 4
-Commit the backed out changes as a new changeset\&. The new changeset is a child of the backed out changeset\&.
+Commit the backed out changes as a new changeset. The new changeset is a child of the backed out changeset.
 .sp
 .RS 4
 .nf
 If you back out a changeset other than the tip, a new head is
-created\&.  This head will be the new tip and you should merge this
-backout changeset with another head (current one by default)\&.
+created.  This head will be the new tip and you should merge this
+backout changeset with another head (current one by default).
 .fi
 .RE
 .sp
@@ -291,15 +290,15 @@ backout changeset with another head (current one by default)\&.
 .nf
 The \-\-merge option remembers the parent of the working directory
 before starting the backout, then merges the new head with that
-changeset afterwards\&.  This saves you from doing the merge by
-hand\&.  The result of this merge is not committed, as for a normal
-merge\&.
+changeset afterwards.  This saves you from doing the merge by
+hand.  The result of this merge is not committed, as for a normal
+merge.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
@@ -321,7 +320,7 @@ options:
 .PP
 bisect [\-gbsr] [REV]
 .RS 4
-This command helps to find changesets which introduce problems\&. To use, mark the earliest changeset you know exhibits the problem as bad, then mark the latest changeset which is free from the problem as good\&. Bisect will update your working directory to a revision for testing\&. Once you have performed tests, mark the working directory as bad or good and bisect will either update to another candidate changeset or announce that it has found the bad revision\&.
+This command helps to find changesets which introduce problems. To use, mark the earliest changeset you know exhibits the problem as bad, then mark the latest changeset which is free from the problem as good. Bisect will update your working directory to a revision for testing. Once you have performed tests, mark the working directory as bad or good and bisect will either update to another candidate changeset or announce that it has found the bad revision.
 .sp
 .RS 4
 .nf
@@ -337,18 +336,18 @@ options:
 .PP
 branch [\-f] [NAME]
 .RS 4
-With no argument, show the current branch name\&. With one argument, set the working directory branch name (the branch does not exist in the repository until the next commit)\&.
+With no argument, show the current branch name. With one argument, set the working directory branch name (the branch does not exist in the repository until the next commit).
 .sp
 .RS 4
 .nf
 Unless \-\-force is specified, branch will not let you set a
-branch name that shadows an existing branch\&.
+branch name that shadows an existing branch.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Use the command \'hg update\' to switch to an existing branch\&.
+Use the command \'hg update\' to switch to an existing branch.
 .fi
 .RE
 .sp
@@ -362,17 +361,17 @@ options:
 .PP
 branches [\-a]
 .RS 4
-List the repository\'s named branches, indicating which ones are inactive\&. If active is specified, only show active branches\&.
+List the repository\'s named branches, indicating which ones are inactive. If active is specified, only show active branches.
 .sp
 .RS 4
 .nf
-A branch is considered active if it contains repository heads\&.
+A branch is considered active if it contains repository heads.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Use the command \'hg update\' to switch to an existing branch\&.
+Use the command \'hg update\' to switch to an existing branch.
 .fi
 .RE
 .sp
@@ -384,32 +383,32 @@ options:
 .RE
 .RE
 .PP
-bundle [\-f] [\-a] [\-r REV]\&... [\-\-base REV]\&... FILE [DEST]
+bundle [\-f] [\-a] [\-r REV]... [\-\-base REV]... FILE [DEST]
 .RS 4
-Generate a compressed changegroup file collecting changesets not found in the other repository\&.
+Generate a compressed changegroup file collecting changesets not found in the other repository.
 .sp
 .RS 4
 .nf
 If no destination repository is specified the destination is
 assumed to have all the nodes specified by one or more \-\-base
-parameters\&.  To create a bundle containing all changesets, use
-\-\-all (or \-\-base null)\&.
+parameters.  To create a bundle containing all changesets, use
+\-\-all (or \-\-base null).
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The bundle file can then be transferred using conventional means and
-applied to another repository with the unbundle or pull command\&.
+applied to another repository with the unbundle or pull command.
 This is useful when direct push and pull are not available or when
-exporting an entire repository is undesirable\&.
+exporting an entire repository is undesirable.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Applying bundles preserves all changeset contents including
-permissions, copy/rename information, and revision history\&.
+permissions, copy/rename information, and revision history.
 .fi
 .RE
 .sp
@@ -426,14 +425,14 @@ options:
 .RE
 .RE
 .PP
-cat [OPTION]\&... FILE\&...
+cat [OPTION]... FILE...
 .RS 4
-Print the specified files as they were at the given revision\&. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out\&.
+Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out.
 .sp
 .RS 4
 .nf
 Output may be to a file, in which case the name of the file is
-given using a format string\&.  The formatting rules are the same as
+given using a format string.  The formatting rules are the same as
 for the export command, with the following additions:
 .fi
 .RE
@@ -441,7 +440,7 @@ for the export command, with the following additions:
 .RS 4
 .nf
 %s   basename of file being printed
-%d   dirname of file being printed, or \'\&.\' if in repo root
+%d   dirname of file being printed, or \'.\' if in repo root
 %p   root\-relative path name of file being printed
 .fi
 .RE
@@ -458,21 +457,21 @@ options:
 .RE
 .RE
 .PP
-clone [OPTION]\&... SOURCE [DEST]
+clone [OPTION]... SOURCE [DEST]
 .RS 4
-Create a copy of an existing repository in a new directory\&.
+Create a copy of an existing repository in a new directory.
 .sp
 .RS 4
 .nf
 If no destination directory name is specified, it defaults to the
-basename of the source\&.
+basename of the source.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The location of the source is added to the new repository\'s
-\&.hg/hgrc file, as the default to be used for future pulls\&.
+.hg/hgrc file, as the default to be used for future pulls.
 .fi
 .RE
 .sp
@@ -480,10 +479,10 @@ The location of the source is added to the new repository\'s
 .nf
 For efficiency, hardlinks are used for cloning whenever the source
 and destination are on the same filesystem (note this applies only
-to the repository data, not to the checked out files)\&.  Some
+to the repository data, not to the checked out files).  Some
 filesystems, such as AFS, implement hardlinking incorrectly, but
-do not report errors\&.  In these cases, use the \-\-pull option to
-avoid hardlinking\&.
+do not report errors.  In these cases, use the \-\-pull option to
+avoid hardlinking.
 .fi
 .RE
 .sp
@@ -502,40 +501,40 @@ $ cp \-al REPO REPOCLONE
 .sp
 .RS 4
 .nf
-which is the fastest way to clone\&. However, the operation is not
+which is the fastest way to clone. However, the operation is not
 atomic (making sure REPO is not modified during the operation is
 up to you) and you have to make sure your editor breaks hardlinks
-(Emacs and most Linux Kernel tools do so)\&.
+(Emacs and most Linux Kernel tools do so).
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If you use the \-r option to clone up to a specific revision, no
-subsequent revisions will be present in the cloned repository\&.
-This option implies \-\-pull, even on local repositories\&.
+subsequent revisions will be present in the cloned repository.
+This option implies \-\-pull, even on local repositories.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If the \-U option is used, the new clone will contain only a repository
-(\&.hg) and no working copy (the working copy parent is the null revision)\&.
+(.hg) and no working copy (the working copy parent is the null revision).
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See pull for valid source format details\&.
+See pull for valid source format details.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 It is possible to specify an ssh:// URL as the destination, but no
-\&.hg/hgrc and working directory will be created on the remote side\&.
+.hg/hgrc and working directory will be created on the remote side.
 Look at the help text for the pull command for important details
-about ssh:// URLs\&.
+about ssh:// URLs.
 .fi
 .RE
 .sp
@@ -553,34 +552,34 @@ options:
 .RE
 .RE
 .PP
-commit [OPTION]\&... [FILE]\&...
+commit [OPTION]... [FILE]...
 .RS 4
-Commit changes to the given files into the repository\&.
+Commit changes to the given files into the repository.
 .sp
 .RS 4
 .nf
 If a list of files is omitted, all changes reported by "hg status"
-will be committed\&.
+will be committed.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If you are committing the result of a merge, do not provide any
-file names or \-I/\-X filters\&.
+file names or \-I/\-X filters.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If no commit message is specified, the configured editor is started to
-enter a message\&.
+enter a message.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
@@ -605,22 +604,22 @@ aliases: ci
 .RE
 .RE
 .PP
-copy [OPTION]\&... [SOURCE]\&... DEST
+copy [OPTION]... [SOURCE]... DEST
 .RS 4
-Mark dest as having copies of source files\&. If dest is a directory, copies are put in that directory\&. If dest is a file, there can only be one source\&.
+Mark dest as having copies of source files. If dest is a directory, copies are put in that directory. If dest is a file, there can only be one source.
 .sp
 .RS 4
 .nf
 By default, this command copies the contents of files as they
-stand in the working directory\&.  If invoked with \-\-after, the
-operation is recorded, but no copying is performed\&.
+stand in the working directory.  If invoked with \-\-after, the
+operation is recorded, but no copying is performed.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-This command takes effect in the next commit\&. To undo a copy
-before that, see hg revert\&.
+This command takes effect in the next commit. To undo a copy
+before that, see hg revert.
 .fi
 .RE
 .sp
@@ -642,13 +641,13 @@ aliases: cp
 .RE
 .RE
 .PP
-diff [OPTION]\&... [\-r REV1 [\-r REV2]] [FILE]\&...
+diff [OPTION]... [\-r REV1 [\-r REV2]] [FILE]...
 .RS 4
-Show differences between revisions for the specified files\&.
+Show differences between revisions for the specified files.
 .sp
 .RS 4
 .nf
-Differences between files are shown using the unified diff format\&.
+Differences between files are shown using the unified diff format.
 .fi
 .RE
 .sp
@@ -656,25 +655,25 @@ Differences between files are shown using the unified diff format\&.
 .nf
 NOTE: diff may generate unexpected results for merges, as it will
 default to comparing against the working directory\'s first parent
-changeset if no revisions are specified\&.
+changeset if no revisions are specified.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 When two revision arguments are given, then changes are shown
-between those revisions\&. If only one revision is specified then
+between those revisions. If only one revision is specified then
 that revision is compared to the working directory, and, when no
 revisions are specified, the working directory files are compared
-to its parent\&.
+to its parent.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Without the \-a option, diff will avoid generating diffs of files
-it detects as binary\&. With \-a, diff will generate a diff anyway,
-probably with undesirable results\&.
+it detects as binary. With \-a, diff will generate a diff anyway,
+probably with undesirable results.
 .fi
 .RE
 .sp
@@ -700,28 +699,28 @@ options:
 .RE
 .RE
 .PP
-export [OPTION]\&... [\-o OUTFILESPEC] REV\&...
+export [OPTION]... [\-o OUTFILESPEC] REV...
 .RS 4
-Print the changeset header and diffs for one or more revisions\&.
+Print the changeset header and diffs for one or more revisions.
 .sp
 .RS 4
 .nf
 The information shown in the changeset header is: author,
-changeset hash, parent(s) and commit comment\&.
+changeset hash, parent(s) and commit comment.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 NOTE: export may generate unexpected diff output for merge changesets,
-as it will compare the merge changeset against its first parent only\&.
+as it will compare the merge changeset against its first parent only.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Output may be to a file, in which case the name of the file is
-given using a format string\&.  The formatting rules are as follows:
+given using a format string.  The formatting rules are as follows:
 .fi
 .RE
 .sp
@@ -741,15 +740,15 @@ given using a format string\&.  The formatting rules are as follows:
 .RS 4
 .nf
 Without the \-a option, export will avoid generating diffs of files
-it detects as binary\&. With \-a, export will generate a diff anyway,
-probably with undesirable results\&.
+it detects as binary. With \-a, export will generate a diff anyway,
+probably with undesirable results.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 With the \-\-switch\-parent option, the diff will be against the second
-parent\&. It can be useful to review a merge\&.
+parent. It can be useful to review a merge.
 .fi
 .RE
 .sp
@@ -765,26 +764,26 @@ options:
 .RE
 .RE
 .PP
-grep [OPTION]\&... PATTERN [FILE]\&...
+grep [OPTION]... PATTERN [FILE]...
 .RS 4
-Search revisions of files for a regular expression\&.
+Search revisions of files for a regular expression.
 .sp
 .RS 4
 .nf
-This command behaves differently than Unix grep\&.  It only accepts
-Python/Perl regexps\&.  It searches repository history, not the
-working directory\&.  It always prints the revision number in which
-a match appears\&.
+This command behaves differently than Unix grep.  It only accepts
+Python/Perl regexps.  It searches repository history, not the
+working directory.  It always prints the revision number in which
+a match appears.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 By default, grep only prints output for the first revision of a
-file in which it finds a match\&.  To get it to print every revision
+file in which it finds a match.  To get it to print every revision
 that contains a change in match status ("\-" for a match that
 becomes a non\-match, or "+" for a non\-match that becomes a match),
-use the \-\-all flag\&.
+use the \-\-all flag.
 .fi
 .RE
 .sp
@@ -809,31 +808,31 @@ options:
 .RE
 .RE
 .PP
-heads [\-r REV] [REV]\&...
+heads [\-r REV] [REV]...
 .RS 4
-With no arguments, show all repository head changesets\&.
+With no arguments, show all repository head changesets.
 .sp
 .RS 4
 .nf
 If branch or revisions names are given this will show the heads of
 the specified branches or the branches those revisions are tagged
-with\&.
+with.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Repository "heads" are changesets that don\'t have child
-changesets\&. They are where development generally takes place and
-are the usual targets for update and merge operations\&.
+changesets. They are where development generally takes place and
+are the usual targets for update and merge operations.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Branch heads are changesets that have a given branch tag, but have
-no child changesets with that tag\&.  They are usually where
-development on the given branch takes place\&.
+no child changesets with that tag.  They are usually where
+development on the given branch takes place.
 .fi
 .RE
 .sp
@@ -849,29 +848,29 @@ options:
 .PP
 help [COMMAND]
 .RS 4
-With no arguments, print a list of commands and short help\&.
+With no arguments, print a list of commands and short help.
 .sp
 .RS 4
 .nf
-Given a command name, print help for that command\&.
+Given a command name, print help for that command.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Given an extension name, print help for that extension, and the
-commands it provides\&.
+commands it provides.
 .fi
 .RE
 .RE
 .PP
 identify [\-nibt] [\-r REV] [SOURCE]
 .RS 4
-With no revision, print a summary of the current state of the repo\&.
+With no revision, print a summary of the current state of the repo.
 .sp
 .RS 4
 .nf
-With a path, do a lookup in another repository\&.
+With a path, do a lookup in another repository.
 .fi
 .RE
 .sp
@@ -880,7 +879,7 @@ With a path, do a lookup in another repository\&.
 This summary identifies the repository state using one or two parent
 hash identifiers, followed by a "+" if there are uncommitted changes
 in the working directory, a list of tags for this revision and a branch
-name for non\-default branches\&.
+name for non\-default branches.
 .fi
 .RE
 .sp
@@ -902,33 +901,33 @@ aliases: id
 .RE
 .RE
 .PP
-import [OPTION]\&... PATCH\&...
+import [OPTION]... PATCH...
 .RS 4
-Import a list of patches and commit them individually\&.
+Import a list of patches and commit them individually.
 .sp
 .RS 4
 .nf
 If there are outstanding changes in the working directory, import
-will abort unless given the \-f flag\&.
+will abort unless given the \-f flag.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-You can import a patch straight from a mail message\&.  Even patches
+You can import a patch straight from a mail message.  Even patches
 as attachments work (body part must be type text/plain or
-text/x\-patch to be used)\&.  From and Subject headers of email
-message are used as default committer and commit message\&.  All
+text/x\-patch to be used).  From and Subject headers of email
+message are used as default committer and commit message.  All
 text/plain body parts before first diff are added to commit
-message\&.
+message.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If the imported patch was generated by hg export, user and description
-from patch override values from message headers and body\&.  Values
-given on command line with \-m and \-u override these\&.
+from patch override values from message headers and body.  Values
+given on command line with \-m and \-u override these.
 .fi
 .RE
 .sp
@@ -937,22 +936,22 @@ given on command line with \-m and \-u override these\&.
 If \-\-exact is specified, import will set the working directory
 to the parent of each patch before applying it, and will abort
 if the resulting changeset has a different ID than the one
-recorded in the patch\&. This may happen due to character set
-problems or other deficiencies in the text patch format\&.
+recorded in the patch. This may happen due to character set
+problems or other deficiencies in the text patch format.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-To read a patch from standard input, use patch name "\-"\&.
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+To read a patch from standard input, use patch name "\-".
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 options:
-\-p, \-\-strip      directory strip option for patch\&. This has the
+\-p, \-\-strip      directory strip option for patch. This has the
                  same meaning as the corresponding patch option
                  (default: 1)
 \-b, \-\-base       base path
@@ -976,20 +975,20 @@ aliases: patch
 .RE
 .RE
 .PP
-incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]\&... [\-\-bundle FILENAME] [SOURCE]
+incoming [\-p] [\-n] [\-M] [\-f] [\-r REV]... [\-\-bundle FILENAME] [SOURCE]
 .RS 4
-Show new changesets found in the specified path/URL or the default pull location\&. These are the changesets that would be pulled if a pull was requested\&.
+Show new changesets found in the specified path/URL or the default pull location. These are the changesets that would be pulled if a pull was requested.
 .sp
 .RS 4
 .nf
 For remote repository, using \-\-bundle avoids downloading the changesets
-twice if the incoming is followed by a pull\&.
+twice if the incoming is followed by a pull.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See pull for valid source format details\&.
+See pull for valid source format details.
 .fi
 .RE
 .sp
@@ -1020,19 +1019,19 @@ aliases: in
 .PP
 init [\-e CMD] [\-\-remotecmd CMD] [DEST]
 .RS 4
-Initialize a new repository in the given directory\&. If the given directory does not exist, it is created\&.
+Initialize a new repository in the given directory. If the given directory does not exist, it is created.
 .sp
 .RS 4
 .nf
-If no directory is given, the current directory is used\&.
+If no directory is given, the current directory is used.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-It is possible to specify an ssh:// URL as the destination\&.
+It is possible to specify an ssh:// URL as the destination.
 Look at the help text for the pull command for important details
-about ssh:// URLs\&.
+about ssh:// URLs.
 .fi
 .RE
 .sp
@@ -1045,31 +1044,31 @@ options:
 .RE
 .RE
 .PP
-locate [OPTION]\&... [PATTERN]\&...
+locate [OPTION]... [PATTERN]...
 .RS 4
-Print all files under Mercurial control whose names match the given patterns\&.
+Print all files under Mercurial control whose names match the given patterns.
 .sp
 .RS 4
 .nf
-This command searches the entire repository by default\&.  To search
+This command searches the entire repository by default.  To search
 just the current directory and its subdirectories, use
-"\-\-include \&."\&.
+"\-\-include .".
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If no patterns are given to match, this command prints all file
-names\&.
+names.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If you want to feed the output of this command into the "xargs"
-command, use the "\-0" option to both this command and "xargs"\&.
+command, use the "\-0" option to both this command and "xargs".
 This will avoid the problem of "xargs" treating single filenames
-that contain white space as multiple filenames\&.
+that contain white space as multiple filenames.
 .fi
 .RE
 .sp
@@ -1085,17 +1084,17 @@ options:
 .RE
 .RE
 .PP
-log [OPTION]\&... [FILE]
+log [OPTION]... [FILE]
 .RS 4
-Print the revision history of the specified files or the entire project\&.
+Print the revision history of the specified files or the entire project.
 .sp
 .RS 4
 .nf
 File history is shown without following rename or copy history of
-files\&.  Use \-f/\-\-follow with a file name to follow history across
-renames and copies\&. \-\-follow without a file name will only show
-ancestors or descendants of the starting revision\&. \-\-follow\-first
-only follows the first parent of merge revisions\&.
+files.  Use \-f/\-\-follow with a file name to follow history across
+renames and copies. \-\-follow without a file name will only show
+ancestors or descendants of the starting revision. \-\-follow\-first
+only follows the first parent of merge revisions.
 .fi
 .RE
 .sp
@@ -1103,13 +1102,13 @@ only follows the first parent of merge revisions\&.
 .nf
 If no revision range is specified, the default is tip:0 unless
 \-\-follow is set, in which case the working directory parent is
-used as the starting revision\&.
+used as the starting revision.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
@@ -1117,8 +1116,8 @@ See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
 .nf
 By default this command outputs: changeset id and hash, tags,
 non\-trivial parents, user, date and time, and a summary for each
-commit\&. When the \-v/\-\-verbose switch is used, the list of changed
-files and full commit message is shown\&.
+commit. When the \-v/\-\-verbose switch is used, the list of changed
+files and full commit message is shown.
 .fi
 .RE
 .sp
@@ -1126,8 +1125,8 @@ files and full commit message is shown\&.
 .nf
 NOTE: log \-p may generate unexpected diff output for merge
 changesets, as it will compare the merge changeset against its
-first parent only\&. Also, the files: list will only reflect files
-that are different from BOTH parents\&.
+first parent only. Also, the files: list will only reflect files
+that are different from BOTH parents.
 .fi
 .RE
 .sp
@@ -1166,19 +1165,19 @@ aliases: history
 .PP
 manifest [\-r REV]
 .RS 4
-Print a list of version controlled files for the given revision\&. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out\&.
+Print a list of version controlled files for the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out.
 .sp
 .RS 4
 .nf
-The manifest is the list of files being version controlled\&. If no revision
-is given then the first parent of the working directory is used\&.
+The manifest is the list of files being version controlled. If no revision
+is given then the first parent of the working directory is used.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-With \-v flag, print file permissions, symlink and executable bits\&. With
-\-\-debug flag, print file revision hashes\&.
+With \-v flag, print file permissions, symlink and executable bits. With
+\-\-debug flag, print file revision hashes.
 .fi
 .RE
 .sp
@@ -1192,14 +1191,14 @@ options:
 .PP
 merge [\-f] [[\-r] REV]
 .RS 4
-Merge the contents of the current working directory and the requested revision\&. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed\&.
+Merge the contents of the current working directory and the requested revision. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed.
 .sp
 .RS 4
 .nf
 If no revision is specified, the working directory\'s parent is a
 head revision, and the repository contains exactly one other head,
-the other head is merged with by default\&.  Otherwise, an explicit
-revision to merge with must be provided\&.
+the other head is merged with by default.  Otherwise, an explicit
+revision to merge with must be provided.
 .fi
 .RE
 .sp
@@ -1212,13 +1211,13 @@ options:
 .RE
 .RE
 .PP
-outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]\&... [DEST]
+outgoing [\-M] [\-p] [\-n] [\-f] [\-r REV]... [DEST]
 .RS 4
-Show changesets not found in the specified destination repository or the default push location\&. These are the changesets that would be pushed if a push was requested\&.
+Show changesets not found in the specified destination repository or the default push location. These are the changesets that would be pushed if a push was requested.
 .sp
 .RS 4
 .nf
-See pull for valid destination format details\&.
+See pull for valid destination format details.
 .fi
 .RE
 .sp
@@ -1248,7 +1247,7 @@ aliases: out
 .PP
 parents [\-r REV] [FILE]
 .RS 4
-Print the working directory\'s parent revisions\&. If a revision is given via \-\-rev, the parent of that revision will be printed\&. If a file argument is given, revision in which the file was last changed (before the working directory revision or the argument to \-\-rev if given) is printed\&.
+Print the working directory\'s parent revisions. If a revision is given via \-\-rev, the parent of that revision will be printed. If a file argument is given, revision in which the file was last changed (before the working directory revision or the argument to \-\-rev if given) is printed.
 .sp
 .RS 4
 .nf
@@ -1262,25 +1261,25 @@ options:
 .PP
 paths [NAME]
 .RS 4
-Show definition of symbolic path name NAME\&. If no name is given, show definition of available names\&.
+Show definition of symbolic path name NAME. If no name is given, show definition of available names.
 .sp
 .RS 4
 .nf
 Path names are defined in the [paths] section of /etc/mercurial/hgrc
-and $HOME/\&.hgrc\&.  If run inside a repository, \&.hg/hgrc is used, too\&.
+and $HOME/.hgrc.  If run inside a repository, .hg/hgrc is used, too.
 .fi
 .RE
 .RE
 .PP
-pull [\-u] [\-f] [\-r REV]\&... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
+pull [\-u] [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [SOURCE]
 .RS 4
-Pull changes from a remote repository to a local one\&.
+Pull changes from a remote repository to a local one.
 .sp
 .RS 4
 .nf
 This finds all changes from the repository at the specified path
-or URL and adds them to the local repository\&. By default, this
-does not update the copy of the project in the working directory\&.
+or URL and adds them to the local repository. By default, this
+does not update the copy of the project in the working directory.
 .fi
 .RE
 .sp
@@ -1304,16 +1303,16 @@ static\-http://host[:port]/[path]
 .nf
 Paths in the local filesystem can either point to Mercurial
 repositories or to bundle files (as created by \'hg bundle\' or
-\'hg incoming \-\-bundle\')\&. The static\-http:// protocol, albeit slow,
+\'hg incoming \-\-bundle\'). The static\-http:// protocol, albeit slow,
 allows access to a Mercurial repository where you simply use a web
-server to publish the \&.hg directory as static content\&.
+server to publish the .hg directory as static content.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 An optional identifier after # indicates a particular branch, tag,
-or changeset to pull\&.
+or changeset to pull.
 .fi
 .RE
 .sp
@@ -1321,18 +1320,18 @@ or changeset to pull\&.
 .nf
 Some notes about using SSH with Mercurial:
 \- SSH requires an accessible shell account on the destination machine
-  and a copy of hg in the remote path or specified with as remotecmd\&.
-\- path is relative to the remote user\'s home directory by default\&.
+  and a copy of hg in the remote path or specified with as remotecmd.
+\- path is relative to the remote user\'s home directory by default.
   Use an extra slash at the start of a path to specify an absolute path:
-    ssh://example\&.com//tmp/repository
+    ssh://example.com//tmp/repository
 \- Mercurial doesn\'t use its own compression via SSH; the right thing
-  to do is to configure it in your ~/\&.ssh/config, e\&.g\&.:
-    Host *\&.mylocalnetwork\&.example\&.com
+  to do is to configure it in your ~/.ssh/config, e.g.:
+    Host *.mylocalnetwork.example.com
       Compression no
     Host *
       Compression yes
   Alternatively specify "ssh \-C" as your ssh command in your hgrc or
-  with the \-\-ssh command line option\&.
+  with the \-\-ssh command line option.
 .fi
 .RE
 .sp
@@ -1349,24 +1348,24 @@ options:
 .RE
 .RE
 .PP
-push [\-f] [\-r REV]\&... [\-e CMD] [\-\-remotecmd CMD] [DEST]
+push [\-f] [\-r REV]... [\-e CMD] [\-\-remotecmd CMD] [DEST]
 .RS 4
-Push changes from the local repository to the given destination\&.
+Push changes from the local repository to the given destination.
 .sp
 .RS 4
 .nf
-This is the symmetrical operation for pull\&. It helps to move
-changes from the current repository to a different one\&. If the
+This is the symmetrical operation for pull. It helps to move
+changes from the current repository to a different one. If the
 destination is local this is identical to a pull in that directory
-from the current one\&.
+from the current one.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 By default, push will refuse to run if it detects the result would
-increase the number of remote heads\&. This generally indicates the
-the client has forgotten to pull and merge before pushing\&.
+increase the number of remote heads. This generally indicates the
+the client has forgotten to pull and merge before pushing.
 .fi
 .RE
 .sp
@@ -1388,22 +1387,22 @@ https://[user@]host[:port]/[path]
 .RS 4
 .nf
 An optional identifier after # indicates a particular branch, tag,
-or changeset to push\&. If \-r is used, the named changeset and all its
-ancestors will be pushed to the remote repository\&.
+or changeset to push. If \-r is used, the named changeset and all its
+ancestors will be pushed to the remote repository.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Look at the help text for the pull command for important details
-about ssh:// URLs\&.
+about ssh:// URLs.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Pushing to http:// and https:// URLs is only possible, if this
-feature is explicitly enabled on the remote Mercurial server\&.
+feature is explicitly enabled on the remote Mercurial server.
 .fi
 .RE
 .sp
@@ -1421,35 +1420,35 @@ options:
 .PP
 recover
 .RS 4
-Recover from an interrupted commit or pull\&.
+Recover from an interrupted commit or pull.
 .sp
 .RS 4
 .nf
 This command tries to fix the repository status after an interrupted
-operation\&. It should only be necessary when Mercurial suggests it\&.
+operation. It should only be necessary when Mercurial suggests it.
 .fi
 .RE
 .RE
 .PP
-remove [OPTION]\&... FILE\&...
+remove [OPTION]... FILE...
 .RS 4
-Schedule the indicated files for removal from the repository\&.
+Schedule the indicated files for removal from the repository.
 .sp
 .RS 4
 .nf
 This only removes files from the current branch, not from the entire
-project history\&. \-A can be used to remove only files that have already
+project history. \-A can be used to remove only files that have already
 been deleted, \-f can be used to force deletion, and \-Af can be used
-to remove files from the next revision without deleting them\&.
+to remove files from the next revision without deleting them.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The following table details the behavior of remove for different file
-states (columns) and option combinations (rows)\&. The file states are
-Added, Clean, Modified and Missing (as reported by hg status)\&. The
-actions are Warn, Remove (from branch) and Delete (from disk)\&.
+states (columns) and option combinations (rows). The file states are
+Added, Clean, Modified and Missing (as reported by hg status). The
+actions are Warn, Remove (from branch) and Delete (from disk).
 .fi
 .RE
 .sp
@@ -1465,8 +1464,8 @@ none   W  RD W  R
 .sp
 .RS 4
 .nf
-This command schedules the files to be removed at the next commit\&.
-To undo a remove before that, see hg revert\&.
+This command schedules the files to be removed at the next commit.
+To undo a remove before that, see hg revert.
 .fi
 .RE
 .sp
@@ -1487,22 +1486,22 @@ aliases: rm
 .RE
 .RE
 .PP
-rename [OPTION]\&... SOURCE\&... DEST
+rename [OPTION]... SOURCE... DEST
 .RS 4
-Mark dest as copies of sources; mark sources for deletion\&. If dest is a directory, copies are put in that directory\&. If dest is a file, there can only be one source\&.
+Mark dest as copies of sources; mark sources for deletion. If dest is a directory, copies are put in that directory. If dest is a file, there can only be one source.
 .sp
 .RS 4
 .nf
 By default, this command copies the contents of files as they
-stand in the working directory\&.  If invoked with \-\-after, the
-operation is recorded, but no copying is performed\&.
+stand in the working directory.  If invoked with \-\-after, the
+operation is recorded, but no copying is performed.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-This command takes effect in the next commit\&. To undo a rename
-before that, see hg revert\&.
+This command takes effect in the next commit. To undo a rename
+before that, see hg revert.
 .fi
 .RE
 .sp
@@ -1524,58 +1523,58 @@ aliases: mv
 .RE
 .RE
 .PP
-revert [OPTION]\&... [\-r REV] [NAME]\&...
+revert [OPTION]... [\-r REV] [NAME]...
 .RS 4
 (use update \-r to check out earlier revisions, revert does not change the working dir parents)
 .sp
 .RS 4
 .nf
 With no revision specified, revert the named files or directories
-to the contents they had in the parent of the working directory\&.
+to the contents they had in the parent of the working directory.
 This restores the contents of the affected files to an unmodified
-state and unschedules adds, removes, copies, and renames\&. If the
+state and unschedules adds, removes, copies, and renames. If the
 working directory has two parents, you must explicitly specify the
-revision to revert to\&.
+revision to revert to.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Using the \-r option, revert the given files or directories to their
-contents as of a specific revision\&. This can be helpful to "roll
-back" some or all of an earlier change\&.
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+contents as of a specific revision. This can be helpful to "roll
+back" some or all of an earlier change.
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Revert modifies the working directory\&.  It does not commit any
-changes, or change the parent of the working directory\&.  If you
+Revert modifies the working directory.  It does not commit any
+changes, or change the parent of the working directory.  If you
 revert to a revision other than the parent of the working
 directory, the reverted files will thus appear modified
-afterwards\&.
+afterwards.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-If a file has been deleted, it is restored\&.  If the executable
-mode of a file was changed, it is reset\&.
+If a file has been deleted, it is restored.  If the executable
+mode of a file was changed, it is reset.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-If names are given, all files matching the names are reverted\&.
-If no arguments are given, no files are reverted\&.
+If names are given, all files matching the names are reverted.
+If no arguments are given, no files are reverted.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Modified files are saved with a \&.orig suffix before reverting\&.
-To disable these backups, use \-\-no\-backup\&.
+Modified files are saved with a .orig suffix before reverting.
+To disable these backups, use \-\-no\-backup.
 .fi
 .RE
 .sp
@@ -1595,13 +1594,13 @@ options:
 .PP
 rollback
 .RS 4
-This command should be used with care\&. There is only one level of rollback, and there is no way to undo a rollback\&. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time\&.
+This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time.
 .sp
 .RS 4
 .nf
 Transactions are used to encapsulate the effects of all commands
 that create new changesets or propagate existing changesets into a
-repository\&. For example, the following commands are transactional,
+repository. For example, the following commands are transactional,
 and their effects can be rolled back:
 .fi
 .RE
@@ -1618,29 +1617,29 @@ unbundle
 .sp
 .RS 4
 .nf
-This command is not intended for use on public repositories\&. Once
+This command is not intended for use on public repositories. Once
 changes are visible for pull by other users, rolling a transaction
 back locally is ineffective (someone else may already have pulled
-the changes)\&. Furthermore, a race is possible with readers of the
+the changes). Furthermore, a race is possible with readers of the
 repository; for example an in\-progress pull from the repository
-may fail if a rollback is performed\&.
+may fail if a rollback is performed.
 .fi
 .RE
 .RE
 .PP
 root
 .RS 4
-Print the root directory of the current repository\&.
+Print the root directory of the current repository.
 .RE
 .PP
-serve [OPTION]\&...
+serve [OPTION]...
 .RS 4
-Start a local HTTP repository browser and pull server\&.
+Start a local HTTP repository browser and pull server.
 .sp
 .RS 4
 .nf
 By default, the server logs accesses to stdout and errors to
-stderr\&.  Use the "\-A" and "\-E" options to log to files\&.
+stderr.  Use the "\-A" and "\-E" options to log to files.
 .fi
 .RE
 .sp
@@ -1667,21 +1666,21 @@ options:
 .RE
 .RE
 .PP
-showconfig [\-u] [NAME]\&...
+showconfig [\-u] [NAME]...
 .RS 4
-With no args, print names and values of all config items\&.
+With no args, print names and values of all config items.
 .sp
 .RS 4
 .nf
-With one arg of the form section\&.name, print just the value of
-that config item\&.
+With one arg of the form section.name, print just the value of
+that config item.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 With multiple args, print names and values of all config items
-with matching section names\&.
+with matching section names.
 .fi
 .RE
 .sp
@@ -1699,30 +1698,30 @@ aliases: debugconfig
 .RE
 .RE
 .PP
-status [OPTION]\&... [FILE]\&...
+status [OPTION]... [FILE]...
 .RS 4
-Show status of files in the repository\&. If names are given, only files that match are shown\&. Files that are clean or ignored or source of a copy/move operation, are not listed unless \-c (clean), \-i (ignored), \-C (copies) or \-A is given\&. Unless options described with "show only \&..." are given, the options \-mardu are used\&.
+Show status of files in the repository. If names are given, only files that match are shown. Files that are clean or ignored or source of a copy/move operation, are not listed unless \-c (clean), \-i (ignored), \-C (copies) or \-A is given. Unless options described with "show only ..." are given, the options \-mardu are used.
 .sp
 .RS 4
 .nf
 Option \-q/\-\-quiet hides untracked (unknown and ignored) files
-unless explicitly requested with \-u/\-\-unknown or \-i/\-ignored\&.
+unless explicitly requested with \-u/\-\-unknown or \-i/\-ignored.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 NOTE: status may appear to disagree with diff if permissions have
-changed or a merge has occurred\&. The standard diff format does not
+changed or a merge has occurred. The standard diff format does not
 report permission changes and diff only reports changes relative
-to one merge parent\&.
+to one merge parent.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-If one revision is given, it is used as the base revision\&.
-If two revisions are given, the difference between them is shown\&.
+If one revision is given, it is used as the base revision.
+If two revisions are given, the difference between them is shown.
 .fi
 .RE
 .sp
@@ -1767,38 +1766,38 @@ aliases: st
 .RE
 .RE
 .PP
-tag [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME\&...
+tag [\-l] [\-m TEXT] [\-d DATE] [\-u USER] [\-r REV] NAME...
 .RS 4
-Name a particular revision using <name>\&.
+Name a particular revision using <name>.
 .sp
 .RS 4
 .nf
 Tags are used to name particular revisions of the repository and are
 very useful to compare different revisions, to go back to significant
-earlier versions or to mark branch points as releases, etc\&.
+earlier versions or to mark branch points as releases, etc.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If no revision is given, the parent of the working directory is used,
-or tip if no revision is checked out\&.
+or tip if no revision is checked out.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 To facilitate version control, distribution, and merging of tags,
-they are stored as a file named "\&.hgtags" which is managed
+they are stored as a file named ".hgtags" which is managed
 similarly to other project files and can be hand\-edited if
-necessary\&.  The file \'\&.hg/localtags\' is used for local tags (not
-shared among repositories)\&.
+necessary.  The file \'.hg/localtags\' is used for local tags (not
+shared among repositories).
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See \'hg help dates\' for a list of formats valid for \-d/\-\-date\&.
+See \'hg help dates\' for a list of formats valid for \-d/\-\-date.
 .fi
 .RE
 .sp
@@ -1818,26 +1817,26 @@ options:
 .PP
 tags
 .RS 4
-List the repository tags\&.
+List the repository tags.
 .sp
 .RS 4
 .nf
-This lists both regular and local tags\&. When the \-v/\-\-verbose switch
-is used, a third column "local" is printed for local tags\&.
+This lists both regular and local tags. When the \-v/\-\-verbose switch
+is used, a third column "local" is printed for local tags.
 .fi
 .RE
 .RE
 .PP
 tip [\-p]
 .RS 4
-The tip revision (usually just called the tip) is the most recently added changeset in the repository, the most recently changed head\&.
+The tip revision (usually just called the tip) is the most recently added changeset in the repository, the most recently changed head.
 .sp
 .RS 4
 .nf
-If you have just made a commit, that commit will be the tip\&. If
+If you have just made a commit, that commit will be the tip. If
 you have just pulled changes from another repository, the tip of
-that repository becomes the current tip\&. The "tip" tag is special
-and cannot be renamed or assigned to a different changeset\&.
+that repository becomes the current tip. The "tip" tag is special
+and cannot be renamed or assigned to a different changeset.
 .fi
 .RE
 .sp
@@ -1851,9 +1850,9 @@ options:
 .RE
 .RE
 .PP
-unbundle [\-u] FILE\&...
+unbundle [\-u] FILE...
 .RS 4
-Apply one or more compressed changegroup files generated by the bundle command\&.
+Apply one or more compressed changegroup files generated by the bundle command.
 .sp
 .RS 4
 .nf
@@ -1865,34 +1864,34 @@ options:
 .PP
 update [\-C] [\-d DATE] [[\-r] REV]
 .RS 4
-Update the working directory to the specified revision, or the tip of the current branch if none is specified\&.
+Update the working directory to the specified revision, or the tip of the current branch if none is specified.
 .sp
 .RS 4
 .nf
 If the requested revision is a descendant of the working
 directory, any outstanding changes in the working directory will
-be merged into the result\&. If it is not directly descended but is
+be merged into the result. If it is not directly descended but is
 on the same named branch, update aborts with a suggestion to use
-merge or update \-C instead\&.
+merge or update \-C instead.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If the requested revision is on a different named branch and the
-working directory is clean, update quietly switches branches\&.
+working directory is clean, update quietly switches branches.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-If you want to update just one file to an older revision, use revert\&.
+If you want to update just one file to an older revision, use revert.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-See \'hg help dates\' for a list of formats valid for \-\-date\&.
+See \'hg help dates\' for a list of formats valid for \-\-date.
 .fi
 .RE
 .sp
@@ -1914,14 +1913,14 @@ aliases: up checkout co
 .PP
 verify
 .RS 4
-Verify the integrity of the current repository\&.
+Verify the integrity of the current repository.
 .sp
 .RS 4
 .nf
 This will perform an extensive check of the repository\'s
 integrity, validating the hashes and checksums of each entry in
 the changelog, manifest, and tracked files, as well as the
-integrity of their crosslinks and indices\&.
+integrity of their crosslinks and indices.
 .fi
 .RE
 .RE
@@ -1935,14 +1934,14 @@ output version and copyright information
 .RS 4
 .nf
 Some commands allow the user to specify a date:
-backout, commit, import, tag: Specify the commit date\&.
-log, revert, update: Select revision(s) by date\&.
+backout, commit, import, tag: Specify the commit date.
+log, revert, update: Select revision(s) by date.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Many date formats are valid\&. Here are some examples:
+Many date formats are valid. Here are some examples:
 .fi
 .RE
 .sp
@@ -1978,10 +1977,10 @@ Lastly, there is Mercurial\'s internal format:
 .sp
 .RS 4
 .nf
-This is the internal representation format for dates\&. unixtime is
-the number of seconds since the epoch (1970\-01\-01 00:00 UTC)\&. offset
+This is the internal representation format for dates. unixtime is
+the number of seconds since the epoch (1970\-01\-01 00:00 UTC). offset
 is the offset of the local timezone, in seconds west of UTC (negative
-if the timezone is east of UTC)\&.
+if the timezone is east of UTC).
 .fi
 .RE
 .sp
@@ -1999,55 +1998,55 @@ The log command also accepts date ranges:
 "\-{days}" \- within a given number of days of today
 .fi
 .RE
-.SH "FILE NAME PATTERNS"
+.SH "FILE PATTERNS"
 .sp
 .RS 4
 .nf
 Mercurial accepts several notations for identifying one or more
-files at a time\&.
+files at a time.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 By default, Mercurial treats filenames as shell\-style extended
-glob patterns\&.
+glob patterns.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-Alternate pattern notations must be specified explicitly\&.
+Alternate pattern notations must be specified explicitly.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 To use a plain path name without any pattern matching, start a
-name with "path:"\&.  These path names must match completely, from
-the root of the current repository\&.
+name with "path:".  These path names must match completely, from
+the root of the current repository.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-To use an extended glob, start a name with "glob:"\&.  Globs are
-rooted at the current directory; a glob such as "*\&.c" will match
-files ending in "\&.c" in the current directory only\&.
+To use an extended glob, start a name with "glob:".  Globs are
+rooted at the current directory; a glob such as "*.c" will match
+files ending in ".c" in the current directory only.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The supported glob syntax extensions are "**" to match any string
-across path separators, and "{a,b}" to mean "a or b"\&.
+across path separators, and "{a,b}" to mean "a or b".
 .fi
 .RE
 .sp
 .RS 4
 .nf
-To use a Perl/Python regular expression, start a name with "re:"\&.
-Regexp pattern matching is anchored at the root of the repository\&.
+To use a Perl/Python regular expression, start a name with "re:".
+Regexp pattern matching is anchored at the root of the repository.
 .fi
 .RE
 .sp
@@ -2073,12 +2072,12 @@ Glob examples:
 .sp
 .RS 4
 .nf
-glob:*\&.c       any name ending in "\&.c" in the current directory
-*\&.c            any name ending in "\&.c" in the current directory
-**\&.c           any name ending in "\&.c" in the current directory, or
+glob:*.c       any name ending in ".c" in the current directory
+*.c            any name ending in ".c" in the current directory
+**.c           any name ending in ".c" in the current directory, or
                any subdirectory
-foo/*\&.c        any name ending in "\&.c" in the directory foo
-foo/**\&.c       any name ending in "\&.c" in the directory foo, or any
+foo/*.c        any name ending in ".c" in the directory foo
+foo/**.c       any name ending in ".c" in the directory foo, or any
                subdirectory
 .fi
 .RE
@@ -2091,7 +2090,7 @@ Regexp examples:
 .sp
 .RS 4
 .nf
-re:\&.*\e\&.c$      any name ending in "\&.c", anywhere in the repository
+re:.*\e.c$      any name ending in ".c", anywhere in the repository
 .fi
 .RE
 .SH "ENVIRONMENT VARIABLES"
@@ -2100,115 +2099,115 @@ HG
 .RS 4
 Path to the
 \fIhg\fR
-executable, automatically passed when running hooks, extensions or external tools\&. If unset or empty, an executable named
+executable, automatically passed when running hooks, extensions or external tools. If unset or empty, an executable named
 \fIhg\fR
-(with com/exe/bat/cmd extension on Windows) is searched\&.
+(with com/exe/bat/cmd extension on Windows) is searched.
 .RE
 .PP
 HGEDITOR
 .RS 4
-This is the name of the editor to use when committing\&. See EDITOR\&.
+This is the name of the editor to use when committing. See EDITOR.
 .sp
 .RS 4
 .nf
-(deprecated, use \&.hgrc)
+(deprecated, use .hgrc)
 .fi
 .RE
 .RE
 .PP
 HGENCODING
 .RS 4
-This overrides the default locale setting detected by Mercurial\&. This setting is used to convert data including usernames, changeset descriptions, tag names, and branches\&. This setting can be overridden with the \-\-encoding command\-line option\&.
+This overrides the default locale setting detected by Mercurial. This setting is used to convert data including usernames, changeset descriptions, tag names, and branches. This setting can be overridden with the \-\-encoding command\-line option.
 .RE
 .PP
 HGENCODINGMODE
 .RS 4
-This sets Mercurial\'s behavior for handling unknown characters while transcoding user inputs\&. The default is "strict", which causes Mercurial to abort if it can\'t translate a character\&. Other settings include "replace", which replaces unknown characters, and "ignore", which drops them\&. This setting can be overridden with the \-\-encodingmode command\-line option\&.
+This sets Mercurial\'s behavior for handling unknown characters while transcoding user inputs. The default is "strict", which causes Mercurial to abort if it can\'t translate a character. Other settings include "replace", which replaces unknown characters, and "ignore", which drops them. This setting can be overridden with the \-\-encodingmode command\-line option.
 .RE
 .PP
 HGMERGE
 .RS 4
-An executable to use for resolving merge conflicts\&. The program will be executed with three arguments: local file, remote file, ancestor file\&.
+An executable to use for resolving merge conflicts. The program will be executed with three arguments: local file, remote file, ancestor file.
 .sp
 .RS 4
 .nf
-(deprecated, use \&.hgrc)
+(deprecated, use .hgrc)
 .fi
 .RE
 .RE
 .PP
 HGRCPATH
 .RS 4
-A list of files or directories to search for hgrc files\&. Item separator is ":" on Unix, ";" on Windows\&. If HGRCPATH is not set, platform default search path is used\&. If empty, only \&.hg/hgrc of current repository is read\&.
+A list of files or directories to search for hgrc files. Item separator is ":" on Unix, ";" on Windows. If HGRCPATH is not set, platform default search path is used. If empty, only .hg/hgrc of current repository is read.
 .sp
 .RS 4
 .nf
 For each element in path, if a directory, all entries in directory
-ending with "\&.rc" are added to path\&.  Else, element itself is
-added to path\&.
+ending with ".rc" are added to path.  Else, element itself is
+added to path.
 .fi
 .RE
 .RE
 .PP
 HGUSER
 .RS 4
-This is the string used for the author of a commit\&.
+This is the string used for the author of a commit.
 .sp
 .RS 4
 .nf
-(deprecated, use \&.hgrc)
+(deprecated, use .hgrc)
 .fi
 .RE
 .RE
 .PP
 EMAIL
 .RS 4
-If HGUSER is not set, this will be used as the author for a commit\&.
+If HGUSER is not set, this will be used as the author for a commit.
 .RE
 .PP
 LOGNAME
 .RS 4
 If neither HGUSER nor EMAIL is set, LOGNAME will be used (with
 \fI@hostname\fR
-appended) as the author value for a commit\&.
+appended) as the author value for a commit.
 .RE
 .PP
 VISUAL
 .RS 4
-This is the name of the editor to use when committing\&. See EDITOR\&.
+This is the name of the editor to use when committing. See EDITOR.
 .RE
 .PP
 EDITOR
 .RS 4
-Sometimes Mercurial needs to open a text file in an editor for a user to modify, for example when writing commit messages\&. The editor it uses is determined by looking at the environment variables HGEDITOR, VISUAL and EDITOR, in that order\&. The first non\-empty one is chosen\&. If all of them are empty, the editor defaults to
-\fIvi\fR\&.
+Sometimes Mercurial needs to open a text file in an editor for a user to modify, for example when writing commit messages. The editor it uses is determined by looking at the environment variables HGEDITOR, VISUAL and EDITOR, in that order. The first non\-empty one is chosen. If all of them are empty, the editor defaults to
+\fIvi\fR.
 .RE
 .PP
 PYTHONPATH
 .RS 4
-This is used by Python to find imported modules and may need to be set appropriately if Mercurial is not installed system\-wide\&.
+This is used by Python to find imported modules and may need to be set appropriately if Mercurial is not installed system\-wide.
 .RE
 .SH "SPECIFYING SINGLE REVISIONS"
 .sp
 .RS 4
 .nf
 Mercurial accepts several notations for identifying individual
-revisions\&.
+revisions.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-A plain integer is treated as a revision number\&.  Negative
+A plain integer is treated as a revision number.  Negative
 integers are treated as offsets from the tip, with \-1 denoting the
-tip\&.
+tip.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 A 40\-digit hexadecimal string is treated as a unique revision
-identifier\&.
+identifier.
 .fi
 .RE
 .sp
@@ -2216,39 +2215,39 @@ identifier\&.
 .nf
 A hexadecimal string less than 40 characters long is treated as a
 unique revision identifier, and referred to as a short\-form
-identifier\&.  A short\-form identifier is only valid if it is the
-prefix of one full\-length identifier\&.
+identifier.  A short\-form identifier is only valid if it is the
+prefix of one full\-length identifier.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 Any other string is treated as a tag name, which is a symbolic
-name associated with a revision identifier\&.  Tag names may not
-contain the ":" character\&.
+name associated with a revision identifier.  Tag names may not
+contain the ":" character.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The reserved name "tip" is a special tag that always identifies
-the most recent revision\&.
+the most recent revision.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-The reserved name "null" indicates the null revision\&. This is the
-revision of an empty repository, and the parent of revision 0\&.
+The reserved name "null" indicates the null revision. This is the
+revision of an empty repository, and the parent of revision 0.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-The reserved name "\&." indicates the working directory parent\&. If
-no working directory is checked out, it is equivalent to null\&.
-If an uncommitted merge is in progress, "\&." is the revision of
-the first parent\&.
+The reserved name "." indicates the working directory parent. If
+no working directory is checked out, it is equivalent to null.
+If an uncommitted merge is in progress, "." is the revision of
+the first parent.
 .fi
 .RE
 .SH "SPECIFYING MULTIPLE REVISIONS"
@@ -2257,83 +2256,84 @@ the first parent\&.
 .nf
 When Mercurial accepts more than one revision, they may be
 specified individually, or provided as a continuous range,
-separated by the ":" character\&.
+separated by the ":" character.
 .fi
 .RE
 .sp
 .RS 4
 .nf
 The syntax of range notation is [BEGIN]:[END], where BEGIN and END
-are revision identifiers\&.  Both BEGIN and END are optional\&.  If
-BEGIN is not specified, it defaults to revision number 0\&.  If END
-is not specified, it defaults to the tip\&.  The range ":" thus
-means "all revisions"\&.
+are revision identifiers.  Both BEGIN and END are optional.  If
+BEGIN is not specified, it defaults to revision number 0.  If END
+is not specified, it defaults to the tip.  The range ":" thus
+means "all revisions".
 .fi
 .RE
 .sp
 .RS 4
 .nf
 If BEGIN is greater than END, revisions are treated in reverse
-order\&.
+order.
 .fi
 .RE
 .sp
 .RS 4
 .nf
-A range acts as a closed interval\&.  This means that a range of 3:5
-gives 3, 4 and 5\&.  Similarly, a range of 4:2 gives 4, 3, and 2\&.
+A range acts as a closed interval.  This means that a range of 3:5
+gives 3, 4 and 5.  Similarly, a range of 4:2 gives 4, 3, and 2.
 .fi
 .RE
-.SH "FILES"
+.SH FILES
 .PP
-\&.hgignore
+.hgignore
 .RS 4
-This file contains regular expressions (one per line) that describe file names that should be ignored by hg\&. For details, see hgignore(5)\&.
+This file contains regular expressions (one per line) that describe file names that should be ignored by hg. For details, see hgignore(5).
 .RE
 .PP
-\&.hgtags
+.hgtags
 .RS 4
-This file contains changeset hash values and text tag names (one of each separated by spaces) that correspond to tagged versions of the repository contents\&.
+This file contains changeset hash values and text tag names (one of each separated by spaces) that correspond to tagged versions of the repository contents.
 .RE
 .PP
-/etc/mercurial/hgrc, $HOME/\&.hgrc, \&.hg/hgrc
+/etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc
 .RS 4
-This file contains defaults and configuration\&. Values in \&.hg/hgrc override those in $HOME/\&.hgrc, and these override settings made in the global /etc/mercurial/hgrc configuration\&. See hgrc(5) for details of the contents and format of these files\&.
+This file contains defaults and configuration. Values in .hg/hgrc override those in $HOME/.hgrc, and these override settings made in the global /etc/mercurial/hgrc configuration. See hgrc(5) for details of the contents and format of these files.
 .RE
-Some commands (e\&.g\&. revert) produce backup files ending in \&.orig, if the \&.orig file already exists and is not tracked by Mercurial, it will be overwritten\&.
+Some commands (e.g. revert) produce backup files ending in .orig, if the .orig file already exists and is not tracked by Mercurial, it will be overwritten.
 .sp
-.SH "BUGS"
-Probably lots, please post them to the mailing list (See Resources below) when you find them\&.
+.SH BUGS
+Probably lots, please post them to the mailing list (See Resources below) when you find them.
 .sp
 .SH "SEE ALSO"
-hgignore(5), hgrc(5)
+.IR hgignore (8),
+.IR hgrc (8).
 .sp
-.SH "AUTHOR"
-Written by Matt Mackall <mpm@selenic\&.com>
+.SH AUTHOR
+Written by Matt Mackall <mpm@selenic.com>
 .sp
-.SH "RESOURCES"
-\fIMain Web Site\fR\&[1]
+.SH RESOURCES
+\fIMain Web Site\fR[1]
 .sp
-\fISource code repository\fR\&[2]
+\fISource code repository\fR[2]
 .sp
-\fIMailing list\fR\&[3]
+\fIMailing list\fR[3]
 .sp
-.SH "COPYING"
-Copyright (C) 2005\-2007 Matt Mackall\&. Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
+.SH COPYING
+Copyright (C) 2005\-2007 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License (GPL).
 .sp
-.SH "NOTES"
+.SH NOTES
 .IP " 1." 4
 Main Web Site
 .RS 4
-\%http://selenic.com/mercurial
+http://selenic.com/mercurial
 .RE
 .IP " 2." 4
 Source code repository
 .RS 4
-\%http://selenic.com/hg
+http://selenic.com/hg
 .RE
 .IP " 3." 4
 Mailing list
 .RS 4
-\%http://selenic.com/mailman/listinfo/mercurial
+http://selenic.com/mailman/listinfo/mercurial
 .RE
diff --git a/sys/man/1/python b/sys/man/1/python
index 865d6497c..a3a5eede8 100644
--- a/sys/man/1/python
+++ b/sys/man/1/python
@@ -1,8 +1,4 @@
-.TH PYTHON "1" "$Date: 2005-03-21 01:16:03 +1100 (Mon, 21 Mar 2005) $"
-
-./" To view this file while editing, run it through groff:
-./"   groff -Tascii -man python.man | less
-
+.TH PYTHON 1
 .SH NAME
 python \- an interpreted, interactive, object-oriented programming language
 .SH SYNOPSIS