summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-17 16:00:17 -0500
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-17 16:00:17 -0500
commit791fb2c96794ea71a7e79b0c347b123f18defcce (patch)
treec9de46149603415354f72cf394be97c8a2d17c38
parentb1bf5f6fc8335b71d841ba8b82a3d771a8690ea1 (diff)
parentcc6bbbeb1c824da64a59fbd1a483c780bc121c3b (diff)
downloadb4-791fb2c96794ea71a7e79b0c347b123f18defcce.tar.gz
Merge branch 'levraiphilippeblain_gmail_com'
Incorporate patches from Philippe Blain. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--.gitignore1
-rw-r--r--README.rst3
-rw-r--r--man/b4.53
-rw-r--r--man/b4.5.rst3
-rw-r--r--setup.py6
5 files changed, 12 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 5d6f10a..e0d7c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ __pycache__
*.patch
*.mbx
*.cover
+.venv
diff --git a/README.rst b/README.rst
index 99fa339..274cf0e 100644
--- a/README.rst
+++ b/README.rst
@@ -33,4 +33,5 @@ Setting up a symlink should also be possible.
Support
-------
For support or with any other questions, please email
-tools@linux.kernel.org.
+tools@linux.kernel.org, or browse the list archive at
+https://linux.kernel.org/g/tools.
diff --git a/man/b4.5 b/man/b4.5
index cdbd1d0..cc8bddf 100644
--- a/man/b4.5
+++ b/man/b4.5
@@ -402,7 +402,8 @@ Default configuration, with explanations:
.UNINDENT
.SH SUPPORT
.sp
-Please email \fI\%tools@linux.kernel.org\fP with support requests.
+Please email \fI\%tools@linux.kernel.org\fP with support requests,
+or browse the list archive at \fI\%https://linux.kernel.org/g/tools\fP\&.
.SH AUTHOR
mricon@kernel.org
diff --git a/man/b4.5.rst b/man/b4.5.rst
index 9e0d995..2e1f5b0 100644
--- a/man/b4.5.rst
+++ b/man/b4.5.rst
@@ -275,4 +275,5 @@ Default configuration, with explanations::
SUPPORT
-------
-Please email tools@linux.kernel.org with support requests.
+Please email tools@linux.kernel.org with support requests,
+or browse the list archive at https://linux.kernel.org/g/tools.
diff --git a/setup.py b/setup.py
index ed24367..867b5cf 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,10 @@ NAME = 'b4'
setup(
version=find_version('b4/__init__.py'),
- url='https://git.kernel.org/pub/scm/utils/b4/b4.git',
+ url='https://git.kernel.org/pub/scm/utils/b4/b4.git/tree/README.rst',
+ project_urls={
+ 'Community': 'https://linux.kernel.org/g/tools'
+ },
name=NAME,
description='A tool to work with public-inbox and patch archives',
author='Konstantin Ryabitsev',
@@ -35,6 +38,7 @@ setup(
license='GPLv2+',
long_description=read('man/b4.5.rst'),
long_description_content_type='text/x-rst',
+ data_files = [('share/man/man5', ['man/b4.5'])],
keywords=['git', 'lore.kernel.org', 'patches'],
install_requires=[
'requests'