Merge remote-tracking branch 'origin/edit' into next

* origin/edit:
  edit: unlink temporary file when done
  v2writable: replace: kill git processes before reindexing
  edit: drop unwanted headers before noop check
  edit|purge: improve output on rewrites
  edit: new tool to perform edits
  doc: document the --prune option for -index
  admin: expose ->config
  AdminEdit: move editability checks from -purge
  admin: beef up resolve_inboxes to handle purge options
  purge: start moving common options to AdminEdit module
  admin: remove warning arg for unconfigured inboxes
  v2writable: implement ->replace call
  import: switch to "replace_oids" interface for purge
  import: extract_author_info becomes extract_commit_info
  v2writable: consolidate overview and indexing call

diff --combined Documentation/include.mk
index 10bd29f0ed21b101423680e6160c3cfa5c7f12f1,f5f46d0bbac8e2331cdca716922f73b9a856a84e..8501adc86873393e9c89aa82c91ecbd23a64c72f
--- 1/Documentation/include.mk
--- 2/Documentation/include.mk
+++ b/Documentation/include.mk
@@@ -32,7 -32,7 +32,8 @@@ podtext = $(PODTEXT) $(PODTEXT_OPTS
  # MakeMaker only seems to support manpage sections 1 and 3...
  m1 =
  m1 += public-inbox-compact
 +m1 += public-inbox-convert
+ m1 += public-inbox-edit
  m1 += public-inbox-httpd
  m1 += public-inbox-index
  m1 += public-inbox-mda
@@@ -151,7 -151,7 +152,7 @@@ rsync-doc
        $(RSYNC) --chmod=Fugo=r -av $(rsync_docs) $(rsync_xdocs) $(RSYNC_DEST)
  
  clean-doc:
 -      $(RM) $(man1) $(man5) $(man7) $(gz_docs) $(docs_html) $(mantxt)
 +      $(RM) $(man1) $(man5) $(man7) $(man8) $(gz_docs) $(docs_html) $(mantxt)
        $(RM) $(gz_xdocs) $(xdocs_html) $(xdocs)
  
  clean :: clean-doc

diff --combined Documentation/public-inbox-index.pod
index c15c1cacb9eb0930bd84f9cf2c3f0bdd40952015,7679376c3664e76d6196d65aee15caaae55bd9a5..610dacbe7df9b2937dad1f2bd465842209e168da
--- 1/Documentation/public-inbox-index.pod
--- 2/Documentation/public-inbox-index.pod
+++ b/Documentation/public-inbox-index.pod
@@@ -42,6 -42,13 +42,13 @@@ Xapian database
  
  This does not touch the NNTP article number database.
  
+ =item --prune
+ 
+ Run L<git-gc(1)> to prune and expire reflogs if discontiguous history
+ is detected.  This is intended to be used in mirrors after running
+ L<public-inbox-edit(1)> or L<public-inbox-purge(1)> to ensure data
+ is expunged from mirrors.
+ 
  =back
  
  =head1 FILES
@@@ -52,6 -59,8 +59,6 @@@ C<$GIT_DIR/public-inbox/> directory
  
  v2 repositories are described in L<public-inbox-v2-format>.
  
 -=back
 -
  =head1 ENVIRONMENT
  
  =over 8