From 148ade883d98e7f72f2a3fd01862922d4b49f90c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Jan 2018 10:53:32 +0100 Subject: Merging upstream version 20180118. Signed-off-by: Daniel Baumann --- share/man/Makefile | 2 ++ share/man/container-auto.1.txt | 2 ++ share/man/container-console.1.txt | 2 ++ share/man/container-create-curl.1.txt | 2 ++ share/man/container-create-debconf.1.txt | 2 ++ share/man/container-create-debootstrap.1.txt | 2 ++ share/man/container-create.1.txt | 2 ++ share/man/container-enter.1.txt | 2 ++ share/man/container-key.1.txt | 2 ++ share/man/container-limit.1.txt | 2 ++ share/man/container-list.1.txt | 2 ++ share/man/container-move.1.txt | 2 ++ share/man/container-remove.1.txt | 2 ++ share/man/container-restart.1.txt | 2 ++ share/man/container-shell.1.txt | 2 ++ share/man/container-start.1.txt | 2 ++ share/man/container-status.1.txt | 2 ++ share/man/container-stop.1.txt | 2 ++ share/man/container-tools.7.txt | 2 ++ share/man/container-top.1.txt | 2 ++ share/man/container-version.1.txt | 2 ++ share/man/container.1.txt | 2 ++ 22 files changed, 44 insertions(+) (limited to 'share/man') diff --git a/share/man/Makefile b/share/man/Makefile index 5141ced..2f482be 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -3,6 +3,8 @@ # container-tools - Manage systemd-nspawn containers # Copyright (C) 2014-2017 Daniel Baumann # +# SPDX-License-Identifier: GPL-3.0+ +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt index 5aaf0d1..79603dd 100644 --- a/share/man/container-auto.1.txt +++ b/share/man/container-auto.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt index add4fc0..390c3a6 100644 --- a/share/man/container-console.1.txt +++ b/share/man/container-console.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt index 8e267ce..7ec8ca2 100644 --- a/share/man/container-create-curl.1.txt +++ b/share/man/container-create-curl.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt index 2b5c37c..b487adc 100644 --- a/share/man/container-create-debconf.1.txt +++ b/share/man/container-create-debconf.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt index 5b3b815..5241dda 100644 --- a/share/man/container-create-debootstrap.1.txt +++ b/share/man/container-create-debootstrap.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt index 22f9c8e..2f41b58 100644 --- a/share/man/container-create.1.txt +++ b/share/man/container-create.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt index 43d1721..703628a 100644 --- a/share/man/container-enter.1.txt +++ b/share/man/container-enter.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-key.1.txt b/share/man/container-key.1.txt index 070047b..df9605f 100644 --- a/share/man/container-key.1.txt +++ b/share/man/container-key.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt index 534bd76..9a2c532 100644 --- a/share/man/container-limit.1.txt +++ b/share/man/container-limit.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt index f629e33..48beae6 100644 --- a/share/man/container-list.1.txt +++ b/share/man/container-list.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt index 0c682d3..126b3c1 100644 --- a/share/man/container-move.1.txt +++ b/share/man/container-move.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt index 917311d..8dd6fdc 100644 --- a/share/man/container-remove.1.txt +++ b/share/man/container-remove.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt index c2b2d39..0239691 100644 --- a/share/man/container-restart.1.txt +++ b/share/man/container-restart.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt index 760e0c5..02705f3 100644 --- a/share/man/container-shell.1.txt +++ b/share/man/container-shell.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt index 5210d08..88ee984 100644 --- a/share/man/container-start.1.txt +++ b/share/man/container-start.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt index 8da969f..2cfd28d 100644 --- a/share/man/container-status.1.txt +++ b/share/man/container-status.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2016 Simon Spöehel // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index 95c67e4..85eb46b 100644 --- a/share/man/container-stop.1.txt +++ b/share/man/container-stop.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index 86266eb..5e7a53b 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-top.1.txt b/share/man/container-top.1.txt index 5cc2a0a..4012ccb 100644 --- a/share/man/container-top.1.txt +++ b/share/man/container-top.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt index d3a59f8..e1e4d2d 100644 --- a/share/man/container-version.1.txt +++ b/share/man/container-version.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or diff --git a/share/man/container.1.txt b/share/man/container.1.txt index 864e53f..5029d25 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -1,6 +1,8 @@ // container-tools - Manage systemd-nspawn containers // Copyright (C) 2014-2017 Daniel Baumann // +// SPDX-License-Identifier: GPL-3.0+ +// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or -- cgit v1.2.3