From ba2e8d771682a3c53b2169de9e223b4ff0efb96d Mon Sep 17 00:00:00 2001 From: Nick Crews Date: Fri, 15 Oct 2021 11:34:15 -0600 Subject: [PATCH 1/3] Rename `blacklist` -> `blocklist` A simple change, but also quite easy. See https://en.wikipedia.org/wiki/Master/slave_(technology) --- docs/locale/en/LC_MESSAGES/using.po | 4 ++-- docs/using/recipes.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/locale/en/LC_MESSAGES/using.po b/docs/locale/en/LC_MESSAGES/using.po index dc5b43da..e34e06d0 100644 --- a/docs/locale/en/LC_MESSAGES/using.po +++ b/docs/locale/en/LC_MESSAGES/using.po @@ -3924,7 +3924,7 @@ msgstr "" #~ msgid "" #~ "ENV DEBIAN_FRONTEND noninteractive # Remove" -#~ " the manpage blacklist, install man, " +#~ " the manpage blocklist, install man, " #~ "install docs RUN rm " #~ "/etc/dpkg/dpkg.cfg.d/excludes \\" #~ msgstr "" @@ -4886,7 +4886,7 @@ msgstr "" #~ msgstr "" #~ msgid "" -#~ "# Remove the manpage blacklist, install" +#~ "# Remove the manpage blocklist, install" #~ " man, install docs RUN rm " #~ "/etc/dpkg/dpkg.cfg.d/excludes \\" #~ msgstr "" diff --git a/docs/using/recipes.md b/docs/using/recipes.md index e230c2b6..8e3f5888 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -258,7 +258,7 @@ FROM $BASE_CONTAINER USER root -# Remove the manpage blacklist, install man, install docs +# Remove the manpage blocklist, install man, install docs RUN rm /etc/dpkg/dpkg.cfg.d/excludes && \ apt-get update --yes && \ dpkg -l | grep ^ii | cut -d' ' -f3 | xargs apt-get install --yes --no-install-recommends --reinstall man && \ From d665b0c29afd68378684ddd9d15153bab226118a Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sat, 16 Oct 2021 16:14:27 +0300 Subject: [PATCH 2/3] Revert autogenerated file change --- docs/locale/en/LC_MESSAGES/using.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/locale/en/LC_MESSAGES/using.po b/docs/locale/en/LC_MESSAGES/using.po index e34e06d0..dc5b43da 100644 --- a/docs/locale/en/LC_MESSAGES/using.po +++ b/docs/locale/en/LC_MESSAGES/using.po @@ -3924,7 +3924,7 @@ msgstr "" #~ msgid "" #~ "ENV DEBIAN_FRONTEND noninteractive # Remove" -#~ " the manpage blocklist, install man, " +#~ " the manpage blacklist, install man, " #~ "install docs RUN rm " #~ "/etc/dpkg/dpkg.cfg.d/excludes \\" #~ msgstr "" @@ -4886,7 +4886,7 @@ msgstr "" #~ msgstr "" #~ msgid "" -#~ "# Remove the manpage blocklist, install" +#~ "# Remove the manpage blacklist, install" #~ " man, install docs RUN rm " #~ "/etc/dpkg/dpkg.cfg.d/excludes \\" #~ msgstr "" From e1bee8d59ba9a4a05408de1b1403a92b5859545d Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sat, 16 Oct 2021 16:17:11 +0300 Subject: [PATCH 3/3] Better docs --- docs/using/recipes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/using/recipes.md b/docs/using/recipes.md index 8e3f5888..93845839 100644 --- a/docs/using/recipes.md +++ b/docs/using/recipes.md @@ -258,7 +258,8 @@ FROM $BASE_CONTAINER USER root -# Remove the manpage blocklist, install man, install docs +# `/etc/dpkg/dpkg.cfg.d/excludes` contains several `path-exclude`s, including man pages +# Remove it, then install man, install docs RUN rm /etc/dpkg/dpkg.cfg.d/excludes && \ apt-get update --yes && \ dpkg -l | grep ^ii | cut -d' ' -f3 | xargs apt-get install --yes --no-install-recommends --reinstall man && \