From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 +JZ7J3xKvmI7gwAAbAwnHQ (envelope-from ) for ; Fri, 01 Jul 2022 03:14:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0MCDJ3xKvmJ4/QAA9RJhRA (envelope-from ) for ; Fri, 01 Jul 2022 03:14:36 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (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 261123F2A4 for ; Fri, 1 Jul 2022 03:14:36 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 1A92C5F707; Fri, 1 Jul 2022 01:14:33 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 326E95E00F for ; Fri, 1 Jul 2022 01:14:30 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id A33965FBD0; Thu, 30 Jun 2022 21:14:28 -0400 (EDT) Received: (nullmailer pid 4084833 invoked by uid 1000); Fri, 01 Jul 2022 01:14:27 -0000 From: David Bremner To: Michael J Gruber , David Bremner Subject: [PATCH v2] doc: replace symlink with copies for nmbug, notmuch-setup Date: Thu, 30 Jun 2022 22:14:20 -0300 Message-Id: <20220701011420.4084819-1-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: VJJVE7A4MKQ4OPKBU4THZ7XQ65XNC52E X-Message-ID-Hash: VJJVE7A4MKQ4OPKBU4THZ7XQ65XNC52E 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: notmuch@notmuchmail.org 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=1656638076; 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=SQurPTV0Q4gXjw3kFlK+OhPfMAHeG9hbrfHq6zF0YeQ=; b=L+fTKsjUFSxWjA6QUsW3FVVLYBN26qFnkGUGM3i4lNBlIR9mzA+G688iOYOxdOYYmt1jeY lm7xXvejm4bzYQ3pR8MfTS7+eISXUZ7WeacPb/bR9cVIEbj818nKTikYgs2wMVgdKNG5Zb 52z83jruZkdNn7vrjZ5LeLUfh4fjiqtqO7EnlD6pccQ1mLijdBKlYBx89b079iINfR1via fS+kSgNnvibn0hSVc4rx2wi5PXKj0zB9iNqXoVxQ6yrB09RD3fKHRNkYxzsys5NzMDA2Ny 3sQSrkZ/h2OKtghzwmuS+lBFvseIfYo6FcUZhCtUIql2ul0FNK4z/n53ZCX5fQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656638076; a=rsa-sha256; cv=none; b=FtIOQd0wYqjZLSgmkxSeJ+dae2RZ8ST1HtADFtX3G5HajiG+HYy964ZU+wGv+gQ5tKJCF0 BJrLUeQNcih9RK0V41bz+mb/DWd9DkZ6rm0i4E0MJ4WX+dM+s9rYLdnC3CrnBlk9mSHyS0 XKCkIEYO2jKgL4vXXz2noGK6HGi8DttRunwHx9Z3pVjpp5zZrACl8IEF6vVcI5QLdP9wnw 4Z47/uiyLkHEt49HHE/ZPASymyqjloQ9uMbF3tKk7OLj1vRmtEv4wySmqkHz18Kb9f9HYa Dlnk+XrS9GJBJFRaAlNiqT50Nni3bevI+1o9B2Wu2bIfom0kS8qngNJSP7s+Mw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.24 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 261123F2A4 X-Spam-Score: -0.24 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2iAKzbLflbH/ Previously only man page aliases were being added as symlinks. The addition to man_pages in conf.py automatically propagates to the list of generated info pages. Installation of the new pages is handled by existing recipes. --- doc/Makefile.local | 7 ++++--- doc/conf.py | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/Makefile.local b/doc/Makefile.local index 2f67f4de..51c729cf 100644 --- a/doc/Makefile.local +++ b/doc/Makefile.local @@ -18,7 +18,9 @@ MAN7_RST := $(wildcard $(srcdir)/doc/man7/*.rst) MAN_RST_FILES := $(MAN1_RST) $(MAN5_RST) $(MAN7_RST) ALL_RST_FILES := $(MAN_RST_FILES) $(srcdir)/doc/notmuch-emacs.rst +COPY_ROFF1 := $(patsubst %,$(DOCBUILDDIR)/man/man1/%.1,nmbug notmuch-setup) MAN1_ROFF := $(patsubst $(srcdir)/doc/%,$(DOCBUILDDIR)/man/%,$(MAN1_RST:.rst=.1)) +MAN1_ROFF := $(MAN1_ROFF) $(COPY_ROFF1) 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) @@ -33,7 +35,8 @@ ifeq ($(WITH_EMACS),1) INFO_TEXI_FILES += $(DOCBUILDDIR)/texinfo/notmuch-emacs.texi endif -INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) +COPY_INFO1 := $(patsubst $(DOCBUILDDIR)/man/man1/%.1,$(DOCBUILDDIR)/texinfo/%.info,$(COPY_ROFF1)) +INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info) $(COPY_INFO1) .PHONY: sphinx-html sphinx-texinfo sphinx-info @@ -130,8 +133,6 @@ install-man: ${MAN_GZIP_FILES} install -m0644 $(filter %.1.gz,$(MAN_GZIP_FILES)) $(DESTDIR)/$(mandir)/man1 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..7f94cbed 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), @@ -163,6 +167,10 @@ man_pages = [ u'syntax for notmuch queries', [notmuch_authors], 7), + ('man1/notmuch', 'notmuch-setup', + u'getting started with notmuch', + [notmuch_authors], 1), + ('man7/notmuch-sexp-queries', 'notmuch-sexp-queries', u's-expression syntax for notmuch queries', [notmuch_authors], 7), -- 2.35.2