diff --git a/doc/news/version_1.20200102.mdwn b/doc/news/version_1.20200102.mdwn
deleted file mode 100644
index 372a457..0000000
--- a/doc/news/version_1.20200102.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-git-repair 1.20200102 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Relicensed AGPL.
-   * Merge from git-annex.
-   * Removed the network-uri build flag.
-   * Increased required version of several dependencies.
-   * Added dependencies on deepseq, attoparsec and filepath-bytestring."""]]
\ No newline at end of file
diff --git a/doc/news/version_1.20230814.mdwn b/doc/news/version_1.20230814.mdwn
new file mode 100644
index 0000000..e496f83
--- /dev/null
+++ b/doc/news/version_1.20230814.mdwn
@@ -0,0 +1,3 @@
+git-repair 1.20230814 released with [[!toggle text="these changes"]]
+[[!toggleable text="""  * Merge from git-annex.
+  * Support building with unix-compat 0.7"""]]
\ No newline at end of file

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index dea2ec7..c656c35 100644
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -1,12 +1,27 @@
-My experience with git repair:
+# Experience n°1
 
-git repair
-Running git fsck ...
-Stack space overflow: current size 8388608 bytes.
-Use `+RTS -Ksize -RTS' to increase it.
+    % git repair
+    Running git fsck ...
+    Stack space overflow: current size 8388608 bytes.
+    Use `+RTS -Ksize -RTS' to increase it.
 
-git repair +RTS -K32M -RTS
-git-repair: Most RTS options are disabled. Link with -rtsopts to enable them.
+    % git repair +RTS -K32M -RTS
+    git-repair: Most RTS options are disabled. Link with -rtsopts to enable them.
 
 Whats up guys? Are we playing catch 22 here?
 
+# Experience n°2
+
+I've been running
+
+    LANG=C TMPDIR=/mnt/1/tmp TMP=/mnt/1/tmp git-repair --force
+
+on a BUP repository for more than a wekk.  The output so far looks like:
+
+    Initialized empty Git repository in /mnt/1/tmp/tmprepo8ymhUQ/.git/
+    fatal: /mnt/1/monnier-broken.bup: '/mnt/1/monnier-broken.bup' is outside repository at '/mnt/1/monnier-broken.bup'
+    Initialized empty Git repository in /mnt/1/tmp/tmprepoz8b3XR/.git/
+    fatal: /mnt/1/monnier-broken.bup: '/mnt/1/monnier-broken.bup' is outside repository at '/mnt/1/monnier-broken.bup'
+    [...]
+
+where those two lines repeat every few hours.  Should I assume it's stuck in some kind of inf-loop, or will it actually end at some point?

diff --git a/doc/news/version_1.20170626.mdwn b/doc/news/version_1.20170626.mdwn
deleted file mode 100644
index 9e9830a..0000000
--- a/doc/news/version_1.20170626.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-git-repair 1.20170626 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Merge from git-annex.
-   * Removes dependency on MissingH, adding a dependency on split instead.
-   * Fixes build with directory-1.3."""]]
\ No newline at end of file
diff --git a/doc/news/version_1.20220404.mdwn b/doc/news/version_1.20220404.mdwn
new file mode 100644
index 0000000..448e807
--- /dev/null
+++ b/doc/news/version_1.20220404.mdwn
@@ -0,0 +1,3 @@
+git-repair 1.20220404 released with [[!toggle text="these changes"]]
+[[!toggleable text="""  * Avoid treating refs that are not commit objects as evidence of
+    repository corruption."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20161118.mdwn b/doc/news/version_1.20161118.mdwn
deleted file mode 100644
index c687f46..0000000
--- a/doc/news/version_1.20161118.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-git-repair 1.20161118 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix build with recent versions of cabal and ghc."""]]
\ No newline at end of file
diff --git a/doc/news/version_1.20210629.mdwn b/doc/news/version_1.20210629.mdwn
new file mode 100644
index 0000000..9f00951
--- /dev/null
+++ b/doc/news/version_1.20210629.mdwn
@@ -0,0 +1,5 @@
+git-repair 1.20210629 released with [[!toggle text="these changes"]]
+[[!toggleable text="""  * Fixed bug that interrupting the program while it was fixing repository
+    corruption would lose objects that were contained in pack files.
+  * Fix reversion in version 1.20200504 that prevented fetching
+    missing objects from remotes."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20161111.mdwn b/doc/news/version_1.20161111.mdwn
deleted file mode 100644
index baba58b..0000000
--- a/doc/news/version_1.20161111.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
-git-repair 1.20161111 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * git-repair.cabal: Add Setup-Depends.
-   * Updated cabal file explictly lists source files. The tarball
-     on hackage will include only the files needed for cabal install;
-     it is NOT the full git-repair source tree.
-   * debian/changelog: Converted to symlinks to CHANGELOG.
-   * Merge from git-annex.
-   * Makefile: Support building with stack as well as cabal.
-   * Makefile: The CABAL variable has been renamed to BUILDER."""]]
\ No newline at end of file
diff --git a/doc/news/version_1.20210111.mdwn b/doc/news/version_1.20210111.mdwn
new file mode 100644
index 0000000..d32b1c8
--- /dev/null
+++ b/doc/news/version_1.20210111.mdwn
@@ -0,0 +1,5 @@
+git-repair 1.20210111 released with [[!toggle text="these changes"]]
+[[!toggleable text="""  * Improve output to not give the impression it's stalled running fsck
+    when it's found a problem and is working to repair it.
+  * Merge from git-annex.
+  * Makefile: Support building with cabal 3.0."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20200504.mdwn b/doc/news/version_1.20200504.mdwn
new file mode 100644
index 0000000..545cd64
--- /dev/null
+++ b/doc/news/version_1.20200504.mdwn
@@ -0,0 +1,5 @@
+git-repair 1.20200504 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix a few documentation typos.
+   * Improve fetching from a remote with an url in host:path format.
+   * Merge from git-annex."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20200102-1.mdwn b/doc/news/version_1.20200102-1.mdwn
deleted file mode 100644
index e15d9c5..0000000
--- a/doc/news/version_1.20200102-1.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-git-repair 1.20200102-1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * New upstream release.
-     - Tighten build-dep on optparse-applicative
-     - Add build-deps on split, filepath-bytestring, attoparsec, data-default
-     - Drop build-dep on missingh.
-   * Drop all patches.
-     Either merged upstream or obsoleted by upstream changes.
-   * d/copyright updates:
-     - Main project license is now AGPL-3+
-     - Add stanza for Utility/Attoparsec.hs
-     - Update copyright years.
-   * Stop adding upstream entries to debian/changelog.
-   * wrap-and-sort -abst"""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20200102-1.mdwn b/doc/news/version_1.20200102-1.mdwn
new file mode 100644
index 0000000..e15d9c5
--- /dev/null
+++ b/doc/news/version_1.20200102-1.mdwn
@@ -0,0 +1,14 @@
+git-repair 1.20200102-1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * New upstream release.
+     - Tighten build-dep on optparse-applicative
+     - Add build-deps on split, filepath-bytestring, attoparsec, data-default
+     - Drop build-dep on missingh.
+   * Drop all patches.
+     Either merged upstream or obsoleted by upstream changes.
+   * d/copyright updates:
+     - Main project license is now AGPL-3+
+     - Add stanza for Utility/Attoparsec.hs
+     - Update copyright years.
+   * Stop adding upstream entries to debian/changelog.
+   * wrap-and-sort -abst"""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20200102-1.mdwn b/doc/news/version_1.20200102-1.mdwn
deleted file mode 100644
index e15d9c5..0000000
--- a/doc/news/version_1.20200102-1.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-git-repair 1.20200102-1 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * New upstream release.
-     - Tighten build-dep on optparse-applicative
-     - Add build-deps on split, filepath-bytestring, attoparsec, data-default
-     - Drop build-dep on missingh.
-   * Drop all patches.
-     Either merged upstream or obsoleted by upstream changes.
-   * d/copyright updates:
-     - Main project license is now AGPL-3+
-     - Add stanza for Utility/Attoparsec.hs
-     - Update copyright years.
-   * Stop adding upstream entries to debian/changelog.
-   * wrap-and-sort -abst"""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20151215.mdwn b/doc/news/version_1.20151215.mdwn
deleted file mode 100644
index 79b16f1..0000000
--- a/doc/news/version_1.20151215.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-git-repair 1.20151215 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix insecure temporary permissions and potential denial of
-     service attack when creating temp dirs. Closes: #[807341](http://bugs.debian.org/807341)
-   * Merge from git-annex."""]]
\ No newline at end of file
diff --git a/doc/news/version_1.20200102-1.mdwn b/doc/news/version_1.20200102-1.mdwn
new file mode 100644
index 0000000..e15d9c5
--- /dev/null
+++ b/doc/news/version_1.20200102-1.mdwn
@@ -0,0 +1,14 @@
+git-repair 1.20200102-1 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * New upstream release.
+     - Tighten build-dep on optparse-applicative
+     - Add build-deps on split, filepath-bytestring, attoparsec, data-default
+     - Drop build-dep on missingh.
+   * Drop all patches.
+     Either merged upstream or obsoleted by upstream changes.
+   * d/copyright updates:
+     - Main project license is now AGPL-3+
+     - Add stanza for Utility/Attoparsec.hs
+     - Update copyright years.
+   * Stop adding upstream entries to debian/changelog.
+   * wrap-and-sort -abst"""]]
\ No newline at end of file

diff --git a/CHANGELOG b/CHANGELOG
index 50f9332..528034e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-repair (1.20200103) UNRELEASED; urgency=medium
+
+  * Fix a few documentation typos.
+
+ -- Joey Hess <id@joeyh.name>  Wed, 01 Apr 2020 13:12:33 -0400
+
 git-repair (1.20200102) unstable; urgency=medium
 
   * Relicensed AGPL.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 503c2c2..9ff06de 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -27,7 +27,7 @@ Then to install it:
 ## how it works
 
 `git-repair` starts by deleting all corrupt objects, and
-retreiving all missing objects that it can from the remotes of the
+retrieving all missing objects that it can from the remotes of the
 repository.
 
 If that is not sufficient to fully recover the repository, it can also
diff --git a/git-repair.1 b/git-repair.1
index 7780095..8b72d1f 100644
--- a/git-repair.1
+++ b/git-repair.1
@@ -9,7 +9,7 @@ git\-repair [\-\-force]
 This can fix a corrupt or broken git repository, which git fsck would
 only complain has problems.
 .PP
-It does by deleting all corrupt objects, and retreiving all missing
+It does by deleting all corrupt objects, and retrieving all missing
 objects that it can from the remotes of the repository.
 .PP
 If that is not sufficient to fully recover the repository, it can also
diff --git a/git-repair.cabal b/git-repair.cabal
index f273cb3..2637586 100644
--- a/git-repair.cabal
+++ b/git-repair.cabal
@@ -10,7 +10,7 @@ License-File: COPYRIGHT
 Build-Type: Custom
 Homepage: http://git-repair.branchable.com/
 Category: Utility
-Synopsis: repairs a damanged git repisitory
+Synopsis: repairs a damaged git repository
 Description:
  git-repair can repair various forms of damage to git repositories.
  .

diff --git a/doc/news/version_1.20141027.mdwn b/doc/news/version_1.20141027.mdwn
deleted file mode 100644
index b65c652..0000000
--- a/doc/news/version_1.20141027.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-git-repair 1.20140613 released
diff --git a/doc/news/version_1.20200102.mdwn b/doc/news/version_1.20200102.mdwn
new file mode 100644
index 0000000..372a457
--- /dev/null
+++ b/doc/news/version_1.20200102.mdwn
@@ -0,0 +1,7 @@
+git-repair 1.20200102 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Relicensed AGPL.
+   * Merge from git-annex.
+   * Removed the network-uri build flag.
+   * Increased required version of several dependencies.
+   * Added dependencies on deepseq, attoparsec and filepath-bytestring."""]]
\ No newline at end of file

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
new file mode 100644
index 0000000..dea2ec7
--- /dev/null
+++ b/doc/index/discussion.mdwn
@@ -0,0 +1,12 @@
+My experience with git repair:
+
+git repair
+Running git fsck ...
+Stack space overflow: current size 8388608 bytes.
+Use `+RTS -Ksize -RTS' to increase it.
+
+git repair +RTS -K32M -RTS
+git-repair: Most RTS options are disabled. Link with -rtsopts to enable them.
+
+Whats up guys? Are we playing catch 22 here?
+

diff --git a/doc/news/version_1.20170626.mdwn b/doc/news/version_1.20170626.mdwn
new file mode 100644
index 0000000..9e9830a
--- /dev/null
+++ b/doc/news/version_1.20170626.mdwn
@@ -0,0 +1,5 @@
+git-repair 1.20170626 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Merge from git-annex.
+   * Removes dependency on MissingH, adding a dependency on split instead.
+   * Fixes build with directory-1.3."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20161118.mdwn b/doc/news/version_1.20161118.mdwn
new file mode 100644
index 0000000..c687f46
--- /dev/null
+++ b/doc/news/version_1.20161118.mdwn
@@ -0,0 +1,3 @@
+git-repair 1.20161118 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix build with recent versions of cabal and ghc."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20161111.mdwn b/doc/news/version_1.20161111.mdwn
new file mode 100644
index 0000000..baba58b
--- /dev/null
+++ b/doc/news/version_1.20161111.mdwn
@@ -0,0 +1,10 @@
+git-repair 1.20161111 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * git-repair.cabal: Add Setup-Depends.
+   * Updated cabal file explictly lists source files. The tarball
+     on hackage will include only the files needed for cabal install;
+     it is NOT the full git-repair source tree.
+   * debian/changelog: Converted to symlinks to CHANGELOG.
+   * Merge from git-annex.
+   * Makefile: Support building with stack as well as cabal.
+   * Makefile: The CABAL variable has been renamed to BUILDER."""]]
\ No newline at end of file

diff --git a/doc/news/version_1.20151215.mdwn b/doc/news/version_1.20151215.mdwn
new file mode 100644
index 0000000..79b16f1
--- /dev/null
+++ b/doc/news/version_1.20151215.mdwn
@@ -0,0 +1,5 @@
+git-repair 1.20151215 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix insecure temporary permissions and potential denial of
+     service attack when creating temp dirs. Closes: #[807341](http://bugs.debian.org/807341)
+   * Merge from git-annex."""]]
\ No newline at end of file

diff --git a/doc/index.mdwn b/doc/index.mdwn
index a6778ed..503c2c2 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -49,3 +49,7 @@ tags.
 
 Since this command unpacks all packs in the repository, you may want to
 run `git gc` afterwards.
+
+## news
+
+[[!inline pages="news/* and !*/Discussion" show="4" archive=yes]]
diff --git a/doc/news/version_1.20141027.mdwn b/doc/news/version_1.20141027.mdwn
new file mode 100644
index 0000000..b65c652
--- /dev/null
+++ b/doc/news/version_1.20141027.mdwn
@@ -0,0 +1 @@
+git-repair 1.20140613 released

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 1d9a7a9..a6778ed 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -44,7 +44,7 @@ or the stash, if they were unable to be recovered. This command does not
 try to clean up either the reflog or the stash. 
 
 Also note that the `--force` option never touches tags, even if they are no
-longer usable due to missing data, so fack may also find problems with
+longer usable due to missing data, so fsck may also find problems with
 tags.
 
 Since this command unpacks all packs in the repository, you may want to

diff --git a/debian/control b/debian/control
index bf14911..1defbd2 100644
--- a/debian/control
+++ b/debian/control
@@ -27,3 +27,7 @@ Description: repair various forms of damage to git repositorie
  git-repair can repair various forms of damage to git repositories.
  .
  It is a complement to git fsck, which finds problems, but does not fix them.
+ .
+ As well as avoiding the need to rm -rf a damaged repository and re-clone,
+ using git-repair can help rescue commits you've made to the damaged
+ repository and not yet pushed out.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index e081051..1d9a7a9 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -3,6 +3,10 @@
 It is a complement to `git fsck`, which finds problems, but does not fix
 them.
 
+As well as avoiding the need to rm -rf a damaged repository and re-clone,
+using git-repair can help rescue commits you've made to the damaged
+repository and not yet pushed out.
+
 ## download
 
 * `git clone git://git-repair.branchable.com/ git-repair`
diff --git a/git-repair.cabal b/git-repair.cabal
index 286a712..41b00c1 100644
--- a/git-repair.cabal
+++ b/git-repair.cabal
@@ -16,6 +16,10 @@ Description:
  .
  It is a complement to git fsck, which finds problems, but does not fix
  them.
+ .
+ As well as avoiding the need to rm -rf a damaged repository and re-clone,
+ using git-repair can help rescue commits you've made to the damaged
+ repository and not yet pushed out.
 
 Executable git-repair
   Main-Is: git-repair.hs

diff --git a/doc/index.mdwn b/doc/index.mdwn
index d4b7e03..e081051 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -5,10 +5,7 @@ them.
 
 ## download
 
-* git
-
-	git clone git://git-repair.branchable.com/ git-repair
-
+* `git clone git://git-repair.branchable.com/ git-repair`
 * from [Hackage](http://hackage.haskell.org/package/git-repair)
 
 ## install

diff --git a/doc/index.mdwn b/doc/index.mdwn
index f880bc6..d4b7e03 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -5,8 +5,12 @@ them.
 
 ## download
 
+* git
+
 	git clone git://git-repair.branchable.com/ git-repair
 
+* from [Hackage](http://hackage.haskell.org/package/git-repair)
+
 ## install
 
 This is a Haskell program, developed as a spinoff of

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 4ff28c8..f880bc6 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -43,4 +43,4 @@ longer usable due to missing data, so fack may also find problems with
 tags.
 
 Since this command unpacks all packs in the repository, you may want to
-run `git gc`afterwards.
+run `git gc` afterwards.

diff --git a/doc/index.mdwn b/doc/index.mdwn
index e924db8..4ff28c8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -3,17 +3,21 @@
 It is a complement to `git fsck`, which finds problems, but does not fix
 them.
 
+## download
+
+	git clone git://git-repair.branchable.com/ git-repair
+
 ## install
 
 This is a Haskell program, developed as a spinoff of
 [git-annex](http://git-annex.branchable.com/).
 
-You can clone the source `git clone git://git-repair.branchable.com/ git-repair`
-
 To build it, you will need to install the
 [Haskell Platform](http://www.haskell.org/platform/).
 
-Then you can run `cabal update; cabal install git-repair --bindir=$HOME/bin`
+Then to install it:
+
+	cabal update; cabal install git-repair --bindir=$HOME/bin
 
 ## how it works
 

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b8b43b1..e924db8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,3 +1,42 @@
-This is my wiki. There's nothing here yet.
+`git-repair` can repair various forms of damage to git repositories.
 
-All wikis are supposed to have a [[SandBox]], so this one does too.
+It is a complement to `git fsck`, which finds problems, but does not fix
+them.
+
+## install
+
+This is a Haskell program, developed as a spinoff of
+[git-annex](http://git-annex.branchable.com/).
+
+You can clone the source `git clone git://git-repair.branchable.com/ git-repair`
+
+To build it, you will need to install the
+[Haskell Platform](http://www.haskell.org/platform/).
+
+Then you can run `cabal update; cabal install git-repair --bindir=$HOME/bin`
+
+## how it works
+
+`git-repair` starts by deleting all corrupt objects, and
+retreiving all missing objects that it can from the remotes of the
+repository.
+
+If that is not sufficient to fully recover the repository, it can also
+reset branches back to commits before the corruption happened, delete
+branches that are no longer available due to the lost data, and remove any
+missing files from the index. It will only do this if run with the
+`--force` option, since that rewrites history and throws out missing data.
+
+After running this command, you will probably want to run `git fsck` to
+verify it fixed the repository.
+
+Note that fsck may still complain about objects referenced by the reflog,
+or the stash, if they were unable to be recovered. This command does not
+try to clean up either the reflog or the stash. 
+
+Also note that the `--force` option never touches tags, even if they are no
+longer usable due to missing data, so fack may also find problems with
+tags.
+
+Since this command unpacks all packs in the repository, you may want to
+run `git gc`afterwards.

diff --git a/doc/index.mdwn b/doc/index.mdwn
new file mode 100644
index 0000000..b8b43b1
--- /dev/null
+++ b/doc/index.mdwn
@@ -0,0 +1,3 @@
+This is my wiki. There's nothing here yet.
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
diff --git a/index.mdwn b/index.mdwn
deleted file mode 100644
index b8b43b1..0000000
--- a/index.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-This is my wiki. There's nothing here yet.
-
-All wikis are supposed to have a [[SandBox]], so this one does too.