diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
tree | 9fd64956ee60304c15387eb394cd649e49f01467 /doc/local.mk | |
parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'doc/local.mk')
-rw-r--r-- | doc/local.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/local.mk b/doc/local.mk index 445be17027..89285b9f35 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -179,19 +179,31 @@ sub_commands_mans = \ $(srcdir)/%D%/guix-archive.1 \ $(srcdir)/%D%/guix-build.1 \ $(srcdir)/%D%/guix-challenge.1 \ + $(srcdir)/%D%/guix-container.1 \ + $(srcdir)/%D%/guix-copy.1 \ $(srcdir)/%D%/guix-deploy.1 \ + $(srcdir)/%D%/guix-describe.1 \ $(srcdir)/%D%/guix-download.1 \ $(srcdir)/%D%/guix-edit.1 \ $(srcdir)/%D%/guix-environment.1 \ $(srcdir)/%D%/guix-gc.1 \ + $(srcdir)/%D%/guix-git.1 \ + $(srcdir)/%D%/guix-graph.1 \ $(srcdir)/%D%/guix-hash.1 \ + $(srcdir)/%D%/guix-home.1 \ $(srcdir)/%D%/guix-import.1 \ $(srcdir)/%D%/guix-lint.1 \ + $(srcdir)/%D%/guix-offload.1 \ + $(srcdir)/%D%/guix-pack.1 \ $(srcdir)/%D%/guix-package.1 \ + $(srcdir)/%D%/guix-processes.1 \ $(srcdir)/%D%/guix-publish.1 \ $(srcdir)/%D%/guix-pull.1 \ $(srcdir)/%D%/guix-refresh.1 \ + $(srcdir)/%D%/guix-repl.1 \ + $(srcdir)/%D%/guix-shell.1 \ $(srcdir)/%D%/guix-size.1 \ + $(srcdir)/%D%/guix-style.1 \ $(srcdir)/%D%/guix-system.1 \ $(srcdir)/%D%/guix-time-machine.1 \ $(srcdir)/%D%/guix-weather.1 |