From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id SMM4JRSHvWJPgQEAbAwnHQ (envelope-from ) for ; Thu, 30 Jun 2022 13:20:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IJsqJBSHvWKAGwAAG6o9tA (envelope-from ) for ; Thu, 30 Jun 2022 13:20:52 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 523CA1E7A5 for ; Thu, 30 Jun 2022 13:20:52 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 683335F707; Thu, 30 Jun 2022 11:20:49 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 493155F41A for ; Thu, 30 Jun 2022 11:20:46 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3020B5FBD0; Thu, 30 Jun 2022 07:20:44 -0400 (EDT) Received: (nullmailer pid 3923545 invoked by uid 1000); Thu, 30 Jun 2022 11:20:42 -0000 From: David Bremner To: michaeljgruber+grubix+git@gmail.com, notmuch@notmuchmail.org Subject: [PATCH] doc: replace symlink with duplicate page for nmbug Date: Thu, 30 Jun 2022 08:20:34 -0300 Message-Id: <20220630112034.3923518-1-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <0dce59bb4edc9c10ab2baf8d6d33cb3f204fc1f3.1656411268.git.git@grubix.eu> References: <0dce59bb4edc9c10ab2baf8d6d33cb3f204fc1f3.1656411268.git.git@grubix.eu> MIME-Version: 1.0 Message-ID-Hash: 4ZVYVDT46TPFCSB7HMYSQ54JZO63OVDM X-Message-ID-Hash: 4ZVYVDT46TPFCSB7HMYSQ54JZO63OVDM X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Michael J Gruber X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656588052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=irYoawpgTq9+VdLm68jiG3OhVUTEQKXVpfhvGdIN+HA=; b=EO8YgyEZAZxFFGJEr8skVQ2IEmA4C9CufksSnxxpX+xV4HfhQ/e9lDytlUETShmP5jrptv robhXew48y3LF6lp/heqdXGp/DnVayWkNUVm1GvigPyi/H8PQn5wGh4o9Hps6VMAWyWy63 fJ5atuv4TQ/p+n6NwHTAqHvOQEFcyt4CQTCFLtqQ3Nctb/44H4qIEReyc5PXuX2Hme8zOP m/h6V3DbE+uXYhh9EpG2VwJdP+3X433FHpkCCCB9SLusRoIcxoluXyD+H7/reuxm1Q0ZfV GLFwRdghtBTdb+qQRuosojYdKqTulrbiMlHemY8Zk4j2w9fT/a06yjpyBUysqw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656588052; a=rsa-sha256; cv=none; b=ChviubTHaosxvLJPnB3FVyV6KR3nuH/UHxcnru5YyV7+D+JsENZI8by3Y2IN+nxEsaCXAl YfCo/rzPoX2XWAnKTBnGuoSejAQFotrBA2b0GYLWjt8ZISQF/ACrdp9gkrsckw9PrHOG1C cm5j6U9AZ1pHgi2NpkL9gB2TxZURinb4BMvcHc1i5ZaDmltrjUzGYAmLXiZFGx4gHr4Mbx ZpMb428W0KfeOeRuPBoPu2vXIXdG6gDE1aRqahW53ci/FZ5K4w8iEfbPOvuzjcQHODERnY KAlO9qe/VgnarXgsmbDVYmhmvWfhrpwYw8oWCza5ALqRDg7HcP+C0czlJbflzA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -2.21 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 523CA1E7A5 X-Spam-Score: -2.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: RK9AJFm/pibL This automatically propagates to the info version of the pages, which saves having maintain two sets of symlinks. --- What do you think about this as an alternative approach? It seems slightly more maintainable to me, although I am willing to be convinced otherwise. If it is an improvement we could do the same for the notmuch-setup page. doc/Makefile.local | 3 ++- doc/conf.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 2f67f4de..123ef10b 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -19,6 +19,7 @@ MAN_RST_FILES := $(MAN1_RST) $(MAN5_RST) $(MAN7_RST) ALL_RST_FILES := $(MAN_RST_FILES) $(srcdir)/doc/notmuch-emacs.rst MAN1_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN1_RST:.rst=.1)) +MAN1_ROFF := $(MAN1_ROFF) $(DOCBUILDDIR)/man/man1/nmbug.1 MAN5_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN5_RST:.rst=.5)) MAN7_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN7_RST:.rst=.7)) MAN_ROFF_FILES := $(MAN1_ROFF) $(MAN5_ROFF) $(MAN7_ROFF) @@ -26,6 +27,7 @@ MAN_ROFF_FILES := $(MAN1_ROFF) $(MAN5_ROFF) $(MAN7_ROFF) MAN_GZIP_FILES := $(addsuffix .gz,${MAN_ROFF_FILES}) MAN1_TEXI := $(patsubst $(srcdir)/doc/man1/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN1_RST)) +MAN1_TEXI := $(MAN1_TEXI) $(DOCBUILDDIR)/texinfo/nmbug.info MAN5_TEXI := $(patsubst $(srcdir)/doc/man5/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN5_RST)) MAN7_TEXI := $(patsubst $(srcdir)/doc/man7/%.rst,$(DOCBUILDDIR)/texinfo/%.texi,$(MAN7_RST)) INFO_TEXI_FILES := $(MAN1_TEXI) $(MAN5_TEXI) $(MAN7_TEXI) @@ -131,7 +133,6 @@ install-man: ${MAN_GZIP_FILES} install -m0644 $(filter %.5.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man5 install -m0644 $(filter %.7.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man7 cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz - cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch-git.1.gz nmbug.1.gz endif ifneq ($(HAVE_SPHINX)$(HAVE_MAKEINFO),11) diff --git a/doc/conf.py b/doc/conf.py index f01c0058..ed27c3f4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -127,6 +127,10 @@ man_pages = [ u'manage notmuch tags with git', [notmuch_authors], 1), + ('man1/notmuch-git', 'nmbug', + u'manage notmuch bugs with git', + [notmuch_authors], 1), + ('man5/notmuch-hooks', 'notmuch-hooks', u'hooks for notmuch', [notmuch_authors], 5), -- 2.35.2