[Libguestfs] [PATCH v2 2/3] fish: Update documentation to use new __INSERT:...___ directive.

[Richard W.M. Jones]

---
 fish/Makefile.am    | 4 +---
 fish/guestfish.pod  | 6 +++---
 po-docs/language.mk | 3 ---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/fish/Makefile.am b/fish/Makefile.am
index 0e01ed9fd..dff56b2e2 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -201,9 +201,7 @@ stamp-guestfish.pod: guestfish.pod guestfish-actions.pod guestfish-commands.pod
 	$(PODWRAPPER) \
 	  --man guestfish.1 \
 	  --html $(top_builddir)/website/guestfish.1.html \
-	  --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
-	  --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
-	  --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \
+	  --path $(srcdir) \
 	  --license GPLv2+ \
 	  --warning ro-option \
 	  $<
diff --git a/fish/guestfish.pod b/fish/guestfish.pod
index 06644c5b8..fd230c7bb 100644
--- a/fish/guestfish.pod
+++ b/fish/guestfish.pod
@@ -1133,7 +1133,7 @@ F<test1.img>):
 
  guestfish -N blankdisk.img=disk:200M
 
-__PREPOPTS__
+__INCLUDE:guestfish-prepopts.pod__
 
 =head1 ADDING REMOTE STORAGE
 
@@ -1403,11 +1403,11 @@ With I<-l> or I<--list>, this list all commands.
 
 This exits guestfish.  You can also use C<^D> key.
 
-__FISH_COMMANDS__
+__INCLUDE:guestfish-commands.pod__
 
 =head1 COMMANDS
 
-__ACTIONS__
+__INCLUDE:guestfish-actions.pod__
 
 =head1 EXIT STATUS
 
diff --git a/po-docs/language.mk b/po-docs/language.mk
index b7d574db3..108cf8c4c 100644
--- a/po-docs/language.mk
+++ b/po-docs/language.mk
@@ -131,9 +131,6 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis
 	  --no-strict-checks \
 	  --man $@ \
 	  --license GPLv2+ \
-	  --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \
-	  --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \
-	  --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \
 	  $<
 
 virt-builder.1: virt-builder.pod customize-synopsis.pod customize-options.pod
-- 
2.23.0