From patchwork Sat Mar 1 15:36:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Zullinger X-Patchwork-Id: 13997603 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4981E1487D1 for ; Sat, 1 Mar 2025 15:36:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843376; cv=none; b=BUampj7Gvnc8PRqcC5Pt/x12JnQGvjrvQaw4B/2vBK7lCSmh5aga+EabF64IdG7UW6EFo8z+f4sp5b6ZAUJFCsxaUA35eHv7v7Pxs/rXze5XK/+FX86v3z/RAEov4p6Ju4xfOsDs5gRXb2N77mSHK6oJhx5iUP3feBytRIhGUig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843376; c=relaxed/simple; bh=CoP88hG5sa9VNVTKkpObI1kTOiH3LuCmF6Anx62nLb4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ukfukORAVj94F0FkYhBy7vEyTh7ff+n0SwRaSfooomN3rsSLf3fAqDsvLFf04sTb8NLQzqCrhMK6dO6Rf5BCxHFGOZ8At/UmYf3G8BmUC8AsMigH3g92Jz31hy4VVJUuA0IW7z7w8cs/i1BlPxtOVOX6t/GaKzPyS/MXOXmjRJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=zgJ3DuYG; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=AnPhhwir; arc=none smtp.client-ip=202.12.124.154 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="zgJ3DuYG"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="AnPhhwir" Received: from phl-compute-13.internal (phl-compute-13.phl.internal [10.202.2.53]) by mailfhigh.stl.internal (Postfix) with ESMTP id 4D53825401A0; Sat, 1 Mar 2025 10:36:13 -0500 (EST) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-13.internal (MEProxy); Sat, 01 Mar 2025 10:36:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1740843373; x= 1740929773; bh=nUZub2ucFTZuqHsR/fcuM/50P1dmZTMhsUQnxZrFlF0=; b=z gJ3DuYGxxDYTuZJsWZn+1IMJaSQ2nEi6pr915m4R5ggCo7aHE2bIE/a7yDpLd87Q FbZTJuYgBceM+a1vAsM+Hynpe4pIGh1PMeIsscmWfcXSL2C1tsDtTVwVdE/KFEzW Urr/6XyR2nzn8pGyBaKuPXXWbRVqBxPMs2p36xb5YFjLHLdTntbOsbAwT4ZH3AC1 2ichMdqTr6qd5aDzM1ix9KNw/dn3Pe4GBMDjjLZYq+aEZvX8W0fCTAxpNECZecqA 9TJ9++EsgDani7sxz4iC9/pZf1GcPiH7OAAF2LQpoDlfn4I34KSpmyivVphDtFwe JveqGlsc2gCXsZ0Q8jaVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1740843373; x=1740929773; bh=n UZub2ucFTZuqHsR/fcuM/50P1dmZTMhsUQnxZrFlF0=; b=AnPhhwirPXPpKerlD YC1khKRCwIp9RFtTsywfRiaSVQZT0e5QMLKEfhq5dLBwwIRyew+pJKfVMb4r5sJW gz3RyH0PBZnzwRC/kUHwUWIsNnkG7BAKu6sNdn76x56b6Z+vYDcwRiaceODTjP4b A57627cNHFE7VL49lxJzedsZTd8qxediU/9tBPUgu/NsUuJFBy6IZjyUKukf87O0 UnTTdpSWcBxAMRb4k4Xlbm4VmSbKXdl/FtC+wF4Z2kLyDO5hEFtk8myLpeEDNTFR cHTlegCsLvagKeg/q1vOMpdaut0aSyWmjFpTPn1fPSyXnnCk50Q5YxNl9kYi4CxI 95DDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelfeeiiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefvohguugcukghulhhlihhnghgvrhcuoehtmhiisehpohgsohigrdgtoh hmqeenucggtffrrghtthgvrhhnpeejuefggfehieeugeeuheevgfegudetheetuedvveeu ueeileeuhfeigeefkeekieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehtmhiisehpohgsohigrdgtohhmpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrd horhhgpdhrtghpthhtohepphhssehpkhhsrdhimhdprhgtphhtthhopehsrghnuggrlhhs segtrhhushhthihtohhothhhphgrshhtvgdrnhgvthdprhgtphhtthhopehgihhtshhtvg hrsehpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: ia13843cf:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 1 Mar 2025 10:36:12 -0500 (EST) From: Todd Zullinger To: git@vger.kernel.org Cc: Patrick Steinhardt , "brian m. carlson" , Junio C Hamano Subject: [PATCH v2 1/3] doc: update howto-index.sh for .adoc extensions Date: Sat, 1 Mar 2025 10:36:02 -0500 Message-ID: <20250301153607.95746-2-tmz@pobox.com> X-Mailer: git-send-email 2.49.0.rc0 In-Reply-To: <20250301153607.95746-1-tmz@pobox.com> References: <20250301153607.95746-1-tmz@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20). This left broken links in the generated howto-index.html. Signed-off-by: Todd Zullinger --- Documentation/howto/howto-index.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/howto/howto-index.sh b/Documentation/howto/howto-index.sh index eecd123a93..ace49830a8 100755 --- a/Documentation/howto/howto-index.sh +++ b/Documentation/howto/howto-index.sh @@ -9,9 +9,9 @@ people describing how they use Git in their workflow. EOF -for txt +for adoc do - title=$(expr "$txt" : '.*/\(.*\)\.txt$') + title=$(expr "$adoc" : '.*/\(.*\)\.adoc$') from=$(sed -ne ' /^$/q /^From:[ ]/{ @@ -21,7 +21,7 @@ do s/^/by / p } - ' "$txt") + ' "$adoc") abstract=$(sed -ne ' /^Abstract:[ ]/{ @@ -39,13 +39,13 @@ do x p q - }' "$txt") + }' "$adoc") - if grep 'Content-type: text/asciidoc' >/dev/null $txt + if grep 'Content-type: text/asciidoc' >/dev/null $adoc then - file=$(expr "$txt" : '\(.*\)\.txt$').html + file=$(expr "$adoc" : '\(.*\)\.adoc$').html else - file="$txt" + file="$adoc" fi echo "* link:howto/$(basename "$file")[$title] $from From patchwork Sat Mar 1 15:36:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Zullinger X-Patchwork-Id: 13997604 Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 525671DE3CE for ; Sat, 1 Mar 2025 15:36:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843377; cv=none; b=fJOnA0b7sW8s0th439sZXz9q6J0VJGoS3dPOCPCZI+IEDsjMtotldAmCAUvaZ7hwJPt/vbKE0TtWaHrYzT8DvwdUfe0Rir4sFjA0LhLD2B7eZDe7wchnq1kditDHEI8Ukvkz6lA1tRtABrpEmsgOIxco+Vf8GTVfjdNyoDvViWM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843377; c=relaxed/simple; bh=e2MPSCnGjtqAcv5gY3bDoqPNOe7HukU0+t/sPMZacak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oWmUGGtFGZDcayNUi18W5Uf5PkG8RRQIzlD+vxXPiQfUJNsFrb1qoPsWtbUxXbzqVAIWGCrKFxAp7emBcfymIYudR81jO+zOJetNmTXWOXnjfjfXtKyuHl0Nx6azpCftXjXy/B1s+tOeKDznLt572d3524fyFr0IaRb9PhMNgNI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=iWOfluqk; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=BMp+dTHx; arc=none smtp.client-ip=202.12.124.146 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="iWOfluqk"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="BMp+dTHx" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.stl.internal (Postfix) with ESMTP id 58D2611400CA; Sat, 1 Mar 2025 10:36:14 -0500 (EST) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-03.internal (MEProxy); Sat, 01 Mar 2025 10:36:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1740843374; x= 1740929774; bh=iF8a7pvaC5ulhy9z/UMQ3cs70SfNpgsAgjmbPvb9ZOc=; b=i WOfluqkQQfcZN8zhd1ATjBV+2OwRQVm9DEGYxS/Pt7D+sSlH9A1wGH12JLuVnIOZ 6105QlljC85QJX3cEOelR0Wg25pT1UaoosYZl32dbVbE+S+hu+Gz3QdgZ6Zy1b9O V/U7uDTJQp0U/tuHKlgBu7m12OahMxsXPDHbdROD/GOaNJ2eCd5pmmuItHs6NqxC idMv41AoGYMynVuPTC0A/7LJDzd/EgIQ0Xva6+47xC4osQjYISuw1lI+auDv0zKV O9X0XNYcdoB3H8jmcVMxpHnsGyrzjixtY6dhHiWgfTRvU1KrSFDUBCOxx3h4gdpg mxIP96ykrLDGPydvkpKnw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1740843374; x=1740929774; bh=i F8a7pvaC5ulhy9z/UMQ3cs70SfNpgsAgjmbPvb9ZOc=; b=BMp+dTHxGneu4kGo9 OSUufCrNBBxeyQEHskRaLqSNgn3umU80S6vK/Rg1ROUVg5cwaH6ZyUI2+quPBLU1 9OVM01SfQv/W8+jfrzgzCkVyuDVCos0G0EIC2nEjWzekuCwvdWbYkRtbejFvdaHI KNs6U2wfTNyn/UrCzHqiXprSUQNI624/QkU/nP8N2ynYEkkxAStEt7rnYNMe0upO yVhmD008FU9boCLbWatDHWx0blAAHthSWOtDUil4ZuCngd1yzYCohiihnOSbHpkh ppz6F1Od+oohwq/T5f0G/4IYke3CXagzSRU+1ka6yjEDa8q8mEQh8yk74ZAIeo5l YpnmA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelfeeijecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefvohguugcukghulhhlihhnghgvrhcuoehtmhiisehpohgsohigrdgtoh hmqeenucggtffrrghtthgvrhhnpeejuefggfehieeugeeuheevgfegudetheetuedvveeu ueeileeuhfeigeefkeekieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehtmhiisehpohgsohigrdgtohhmpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrd horhhgpdhrtghpthhtohepphhssehpkhhsrdhimhdprhgtphhtthhopehsrghnuggrlhhs segtrhhushhthihtohhothhhphgrshhtvgdrnhgvthdprhgtphhtthhopehgihhtshhtvg hrsehpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: ia13843cf:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 1 Mar 2025 10:36:13 -0500 (EST) From: Todd Zullinger To: git@vger.kernel.org Cc: Patrick Steinhardt , "brian m. carlson" , Junio C Hamano Subject: [PATCH v2 2/3] contrib/contacts: rename .txt to .adoc Date: Sat, 1 Mar 2025 10:36:03 -0500 Message-ID: <20250301153607.95746-3-tmz@pobox.com> X-Mailer: git-send-email 2.49.0.rc0 In-Reply-To: <20250301153607.95746-1-tmz@pobox.com> References: <20250301153607.95746-1-tmz@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20). Do the same for contrib/contacts. Signed-off-by: Todd Zullinger --- contrib/contacts/Makefile | 2 +- contrib/contacts/{git-contacts.txt => git-contacts.adoc} | 0 contrib/contacts/meson.build | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename contrib/contacts/{git-contacts.txt => git-contacts.adoc} (100%) diff --git a/contrib/contacts/Makefile b/contrib/contacts/Makefile index a2990f0dcb..9c4ca4f3bc 100644 --- a/contrib/contacts/Makefile +++ b/contrib/contacts/Makefile @@ -34,7 +34,7 @@ GIT_CONTACTS := git-contacts GIT_CONTACTS_DOC := git-contacts.1 GIT_CONTACTS_XML := git-contacts.xml -GIT_CONTACTS_TXT := git-contacts.txt +GIT_CONTACTS_TXT := git-contacts.adoc GIT_CONTACTS_HTML := git-contacts.html doc: $(GIT_CONTACTS_DOC) $(GIT_CONTACTS_HTML) diff --git a/contrib/contacts/git-contacts.txt b/contrib/contacts/git-contacts.adoc similarity index 100% rename from contrib/contacts/git-contacts.txt rename to contrib/contacts/git-contacts.adoc diff --git a/contrib/contacts/meson.build b/contrib/contacts/meson.build index 6ec92f47c4..73d82dfe52 100644 --- a/contrib/contacts/meson.build +++ b/contrib/contacts/meson.build @@ -16,7 +16,7 @@ if get_option('docs').contains('man') '@INPUT@', ], depends: documentation_deps, - input: 'git-contacts.txt', + input: 'git-contacts.adoc', output: 'git-contacts.xml', ) @@ -47,7 +47,7 @@ if get_option('docs').contains('html') '@INPUT@', ], depends: documentation_deps, - input: 'git-contacts.txt', + input: 'git-contacts.adoc', output: 'git-contacts.html', install: true, install_dir: get_option('datadir') / 'doc/git-doc', From patchwork Sat Mar 1 15:36:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todd Zullinger X-Patchwork-Id: 13997605 Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 563771E25E3 for ; Sat, 1 Mar 2025 15:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843377; cv=none; b=TWA6N1yqjI29wf/904qtZ4K70IYcLlR9HAFS+iOTlP63hAyIGTU7Bgz7CzLR8SqeZB9tKcLIDVK/x2dkQUJ1bhA2ez67mN6SnXrB3cEm/XQNhKKQmMT9mdosNf5M4cEx08KVxQGIVp2ln9rqZ0gKvxOShC/nyNUsenKngKXxSbs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740843377; c=relaxed/simple; bh=laokikOpz3oBAxLv3Egn2xLlZi/7GeEJLp1L/MkE354=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kv8gwmTE6DackTNJftRNFNgthpSYZqgUeBd6ov09MwG98wpoP03cqmPGZzLEjGtXF1OltTyxeTvxXIOtB4OoIr8VTpLNjLxeFZ6vYczhTR+shm1DyAT/drQ7vc/TwU0/Hrx3xZucwvC96Kpjo7C/OFyevxhWwy1RPpQUdMXDlLk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=wvlgNAyS; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=jEpwDbXR; arc=none smtp.client-ip=202.12.124.146 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="wvlgNAyS"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="jEpwDbXR" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id 558EA11400EE; Sat, 1 Mar 2025 10:36:15 -0500 (EST) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-01.internal (MEProxy); Sat, 01 Mar 2025 10:36:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1740843375; x= 1740929775; bh=Ilxpj4tWfJRzGPuSTzxwrswoRZrBatkK+SOy1Ua78UE=; b=w vlgNAySlPE3RvciAWHEy7Xqxec91hdSPYxQThTuAH5eQSxaVZ7fxLwpZOB4KsKSk 9DcNtWGKi20b1ttSDnUEaoLQGaNShWn7lTQsQGdshAve9MzbNOmaL9QIzAichtOS iEKUz1Iw3eXeyh6pALA8nLliJy7MjWlv2WjmgVrUC2cTy0sAd3mPZd8mOFRH/L3p aFBzDRMuYvN1chWkRhfC73G+T10i+S92+N1knnOGUCZQfLTKKc87uS+jez2ivuJh w1wGNu1oDrvssYxcoBxCRRm2kk9HyUlT9lJxw7uCWlnucDzA8KGwWE2ol70s+9pc aEwJywjzL6p+qRuaJAJ5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1740843375; x=1740929775; bh=I lxpj4tWfJRzGPuSTzxwrswoRZrBatkK+SOy1Ua78UE=; b=jEpwDbXRJMa3JqILz za3dY+mAChdPZPuK383h07kSDdonsmyB9XKJ/S59LPUK3m+C8sXq0KWCwAZ0k8tM xb31VMvcWOYfSxCaMfaBNOOFYMY6IyUoxGuCzRV0zaCCjm1Yq5apPV91tEGZLDfH 3IXdmIA2t0qWIxHWMvPIPFlQNusIr178EO2mqTPOqQw5qHu/q1CdqzmXMlqi/mOA ZMjBB/2nktuWo4eMA4bYNZVz/6T0dOJnrhjvPXDi+lRdoJj3CoZXs87jmRQXOgA1 kQWexaDTmjYfUC6FoqIXKocm19DxCfrUEj5o+a/rBZV11NhmDcm1VGVcXqS5Luc1 DwAVQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelfeeiiecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefvohguugcukghulhhlihhnghgvrhcuoehtmhiisehpohgsohigrdgtoh hmqeenucggtffrrghtthgvrhhnpeejuefggfehieeugeeuheevgfegudetheetuedvveeu ueeileeuhfeigeefkeekieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehtmhiisehpohgsohigrdgtohhmpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrd horhhgpdhrtghpthhtohepphhssehpkhhsrdhimhdprhgtphhtthhopehsrghnuggrlhhs segtrhhushhthihtohhothhhphgrshhtvgdrnhgvthdprhgtphhtthhopehgihhtshhtvg hrsehpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: ia13843cf:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 1 Mar 2025 10:36:14 -0500 (EST) From: Todd Zullinger To: git@vger.kernel.org Cc: Patrick Steinhardt , "brian m. carlson" , Junio C Hamano Subject: [PATCH v2 3/3] contrib/subtree: rename .txt to .adoc Date: Sat, 1 Mar 2025 10:36:04 -0500 Message-ID: <20250301153607.95746-4-tmz@pobox.com> X-Mailer: git-send-email 2.49.0.rc0 In-Reply-To: <20250301153607.95746-1-tmz@pobox.com> References: <20250301153607.95746-1-tmz@pobox.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20). Do the same for contrib/subtree. Signed-off-by: Todd Zullinger --- contrib/subtree/Makefile | 2 +- contrib/subtree/{git-subtree.txt => git-subtree.adoc} | 0 contrib/subtree/meson.build | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename contrib/subtree/{git-subtree.txt => git-subtree.adoc} (100%) diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 8fe0bfd401..c0c9f21cb7 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -50,7 +50,7 @@ GIT_SUBTREE := git-subtree GIT_SUBTREE_DOC := git-subtree.1 GIT_SUBTREE_XML := git-subtree.xml -GIT_SUBTREE_TXT := git-subtree.txt +GIT_SUBTREE_TXT := git-subtree.adoc GIT_SUBTREE_HTML := git-subtree.html GIT_SUBTREE_TEST := ../../git-subtree diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.adoc similarity index 100% rename from contrib/subtree/git-subtree.txt rename to contrib/subtree/git-subtree.adoc diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build index a752a188df..9c72b23625 100644 --- a/contrib/subtree/meson.build +++ b/contrib/subtree/meson.build @@ -32,7 +32,7 @@ if get_option('docs').contains('man') '@INPUT@', ], depends: documentation_deps, - input: 'git-subtree.txt', + input: 'git-subtree.adoc', output: 'git-subtree.xml', ) @@ -63,7 +63,7 @@ if get_option('docs').contains('html') '@INPUT@', ], depends: documentation_deps, - input: 'git-subtree.txt', + input: 'git-subtree.adoc', output: 'git-subtree.html', install: true, install_dir: get_option('datadir') / 'doc/git-doc', From patchwork Sat Mar 1 18:25:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junio C Hamano X-Patchwork-Id: 13997649 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DFFD8F7D for ; Sat, 1 Mar 2025 18:25:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740853515; cv=none; b=eppCG+jB6mtF8M0VS0pgMBcrtUtNE0Esqq/rmBsCZen0rcy8afRCXtfmDsa+IyFmmaCoBuJkstIBqi3ZxzY64RKf/0vfJL/bMXT8z0OlcRrTaMGYQ14iZZfiJTtE4lqR9/2EuF1Be7OHgh18grKkHVKuXvciBOwmi612/Om8xaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740853515; c=relaxed/simple; bh=I+g/w1LnQ1jF3i5SPnd0/fcjZrVXZJqIfHMz1iRBKeA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=Mu/CjIFztXhXbu/LV56K7hEBXG6gRaIR5oxlwVZCsKn5hkGiL9JURKM2oBZR62vQiPzf4vKn45KoJUevrl2u6DGqRAp9O2K0u2GuCiOsfstwB7OfEwMKb1yuTMsLAQ7HLpY+bJHaD0FHGrua5uE4UwiVtuLsPJ3s01g4vTdiD5o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=HqIHyl1N; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=5cgajItN; arc=none smtp.client-ip=103.168.172.144 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="HqIHyl1N"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="5cgajItN" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.phl.internal (Postfix) with ESMTP id C66E6138113F; Sat, 1 Mar 2025 13:25:12 -0500 (EST) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-10.internal (MEProxy); Sat, 01 Mar 2025 13:25:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1740853512; x=1740939912; bh=66f1mijh1B vaAswTFApIE+5Vve5aXaSr8CdEw9UM/jM=; b=HqIHyl1N1S621ncWOMCUZKy5pG 43fEBYMe36koAYMhmnEQNALpFlmcP1MPXLmHzaG7m2MzaNTJzvUOvFlUdd3r1vm+ 349vwNc6M4fvxasfkKc40cbs5CIFUOz/Od6xEsfa1K8xsvD4qzqz5jWkOpmOb9nA BYazagG5Sz5HWHUO3Qqcof/9djwo9hOCwnxqdKbD48kkN9KLlySb2WDbgc1993J3 hBbq6cESK09RcN5TJlbhfhZ94w4gf42oyPNGooCNmhuoeMafLTKBV4K4uzOcw0Sh sLYpqbWhPk0DZkAJgkePskimunmKkw23toMDJJwM3p7KjdMcFGKG0HZg/VmA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1740853512; x=1740939912; bh=66f1mijh1BvaAswTFApIE+5Vve5aXaSr8Cd Ew9UM/jM=; b=5cgajItN/iOU/6zh65JO1kRYaVLynclfAFySMcq2gUBxBPgSutH oJhgPsKjwc77iJKg1qawW0D6dieEInu86ybG+P/eko2YWFvB19vzQ6kZskSA3Ihi P5WLbPCk3zHmXkPDWlzAV92hriFkxe5psvCDRLjXnCi4uPUgWl21YWbQRmmzGlNS 0oezkcXB3xHCNa8PF/mMIq7ML/UWbFYa4vSvgkf9zaE4Hm+4sxoi94nfVQJnloCQ ATfXRs8FA+1RWH6bH5v50P5tIhl5nF+O1R8Y1HaP0ld3o3w856zHHqWwSPQ3YjsN sLU26DE3Kadd9wbsyMPtIM4iVN4wMOoRYYw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdelgedtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfgfgggtsehttdertddtredt necuhfhrohhmpefluhhnihhoucevucfjrghmrghnohcuoehgihhtshhtvghrsehpohgsoh igrdgtohhmqeenucggtffrrghtthgvrhhnpeefveetteejheeugeffledvteeiveffueef jeelueffteeigffgfedthfefieegieenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehgihhtshhtvghrsehpohgsohigrdgtohhmpdhnsggprhgt phhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrh drkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepthhmiiesphhosghogidrtghomhdprhgt phhtthhopehpshesphhkshdrihhmpdhrtghpthhtohepshgrnhgurghlshestghruhhsth ihthhoohhthhhprghsthgvrdhnvghtpdhrtghpthhtohepghhithhsthgvrhesphhosgho gidrtghomh X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 1 Mar 2025 13:25:12 -0500 (EST) From: Junio C Hamano To: git@vger.kernel.org Cc: Todd Zullinger , Patrick Steinhardt , "brian m. carlson" Subject: [PATCH v2 4/3] doc: fix build-docdep.perl In-Reply-To: (Junio C. Hamano's message of "Sat, 01 Mar 2025 10:20:27 -0800") References: <20250301153607.95746-1-tmz@pobox.com> Date: Sat, 01 Mar 2025 10:25:10 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We renamed from .txt to .adoc all the asciidoc source files and necessary includes. We also need to adjust the build-docdep tool to work on files whose suffix is .adoc when computing the documentation dependencies. Signed-off-by: Junio C Hamano --- Documentation/build-docdep.perl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git c/Documentation/build-docdep.perl w/Documentation/build-docdep.perl index 315efaa2fa..781da12b2e 100755 --- c/Documentation/build-docdep.perl +++ w/Documentation/build-docdep.perl @@ -4,15 +4,15 @@ my %include = (); my %included = (); -for my $text (<*.txt>) { - open I, '<', $text || die "cannot read: $text"; +for my $adoc (<*.adoc>) { + open I, '<', $adoc || die "cannot read: $adoc"; while () { if (/^include::/) { chomp; s/^include::\s*//; s/\[\]//; s/{build_dir}/${build_dir}/; - $include{$text}{$_} = 1; + $include{$adoc}{$_} = 1; $included{$_} = 1; } } @@ -23,14 +23,14 @@ my $changed = 1; while ($changed) { $changed = 0; - while (my ($text, $included) = each %include) { + while (my ($adoc, $included) = each %include) { for my $i (keys %$included) { - # $text has include::$i; if $i includes $j - # $text indirectly includes $j. + # $adoc has include::$i; if $i includes $j + # $adoc indirectly includes $j. if (exists $include{$i}) { for my $j (keys %{$include{$i}}) { - if (!exists $include{$text}{$j}) { - $include{$text}{$j} = 1; + if (!exists $include{$adoc}{$j}) { + $include{$adoc}{$j} = 1; $included{$j} = 1; $changed = 1; } @@ -40,10 +40,10 @@ } } -foreach my $text (sort keys %include) { - my $included = $include{$text}; - if (! exists $included{$text} && - (my $base = $text) =~ s/\.txt$//) { +foreach my $adoc (sort keys %include) { + my $included = $include{$adoc}; + if (! exists $included{$adoc} && + (my $base = $adoc) =~ s/\.adoc$//) { print "$base.html $base.xml : ", join(" ", sort keys %$included), "\n"; } }