summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-09-25 13:13:40 +0200
committerThomas Haller <thaller@redhat.com>2019-09-30 18:05:50 +0200
commitf3165395b062d84fd50c31961b0e88468f70275d (patch)
treefcef873d6560e4330e66c35b7d5c80847a0e800a
parent450b23d70f1124849ba44b3f72b7efa67084b1c0 (diff)
downloadNetworkManager-th/cleanup-file-header-comments.tar.gz
all: manually drop code comments with file descriptionth/cleanup-file-header-comments
-rw-r--r--clients/cli/agent.c3
-rw-r--r--clients/cli/agent.h3
-rw-r--r--clients/cli/common.c3
-rw-r--r--clients/cli/common.h3
-rw-r--r--clients/cli/connections.c3
-rw-r--r--clients/cli/connections.h3
-rw-r--r--clients/cli/devices.c3
-rw-r--r--clients/cli/devices.h3
-rw-r--r--clients/cli/general.c3
-rw-r--r--clients/cli/general.h3
-rw-r--r--clients/cli/nmcli.c4
-rw-r--r--clients/cli/nmcli.h3
-rw-r--r--clients/cli/polkit-agent.c3
-rw-r--r--clients/cli/polkit-agent.h3
-rw-r--r--clients/cli/settings.c3
-rw-r--r--clients/cli/settings.h3
-rw-r--r--clients/cli/utils.c3
-rw-r--r--clients/cli/utils.h3
-rw-r--r--clients/common/nm-client-utils.c3
-rw-r--r--clients/common/nm-client-utils.h3
-rw-r--r--clients/common/nm-meta-setting-access.c3
-rw-r--r--clients/common/nm-meta-setting-access.h3
-rw-r--r--clients/common/nm-meta-setting-desc.c3
-rw-r--r--clients/common/nm-meta-setting-desc.h3
-rw-r--r--clients/nm-online.c1
-rwxr-xr-xcontrib/scripts/checkpatch.pl3
-rwxr-xr-xcontrib/scripts/nm-import-openconnect3
-rwxr-xr-xcontrib/scripts/nm-import-openvpn4
-rwxr-xr-xcontrib/scripts/nm-import-vpnc3
-rwxr-xr-xcontrib/test/modemu.pl3
-rw-r--r--dispatcher/nm-dispatcher-utils.c3
-rw-r--r--dispatcher/nm-dispatcher-utils.h3
-rw-r--r--dispatcher/nm-dispatcher.c3
-rw-r--r--dispatcher/tests/test-dispatcher-envp.c1
-rwxr-xr-xexamples/js/get_ips.js1
-rwxr-xr-xexamples/lua/lgi/add-connection.lua3
-rwxr-xr-xexamples/lua/lgi/change-vpn-username.lua3
-rwxr-xr-xexamples/lua/lgi/deactivate-all.lua3
-rwxr-xr-xexamples/lua/lgi/get-basic-nm-info.lua3
-rwxr-xr-xexamples/lua/lgi/get-ips.lua3
-rwxr-xr-xexamples/lua/lgi/list-connections.lua3
-rwxr-xr-xexamples/lua/lgi/list-devices.lua3
-rwxr-xr-xexamples/lua/lgi/show-wifi-networks.lua3
-rwxr-xr-xexamples/python/gi/add_connection.py1
-rwxr-xr-xexamples/python/gi/checkpoint.py3
-rwxr-xr-xexamples/python/gi/deactivate-all.py1
-rwxr-xr-xexamples/python/gi/device-state-ip4config.py1
-rwxr-xr-xexamples/python/gi/dns.py1
-rwxr-xr-xexamples/python/gi/get-lldp-neighbors.py1
-rwxr-xr-xexamples/python/gi/get_ips.py1
-rwxr-xr-xexamples/python/gi/list-connections.py1
-rwxr-xr-xexamples/python/gi/nm-wg-set1
-rwxr-xr-xexamples/python/gi/setting-user-data.py2
-rwxr-xr-xexamples/python/gi/show-wifi-networks.py2
-rw-r--r--libnm-core/nm-core-types.h3
-rw-r--r--libnm-core/nm-crypto-gnutls.c4
-rw-r--r--libnm-core/nm-crypto-impl.h1
-rw-r--r--libnm-core/nm-crypto-nss.c1
-rw-r--r--libnm-core/nm-crypto.c1
-rw-r--r--libnm-core/nm-crypto.h1
-rw-r--r--libnm-core/nm-json.h1
-rw-r--r--libnm-core/nm-keyfile-internal.h3
-rw-r--r--libnm-core/nm-keyfile-utils.c3
-rw-r--r--libnm-core/nm-keyfile-utils.h3
-rw-r--r--libnm-core/nm-keyfile.c3
-rw-r--r--libnm-core/tests/test-crypto.c1
-rw-r--r--libnm-core/tests/test-general.c7
-rw-r--r--libnm-core/tests/test-keyfile.c2
-rw-r--r--libnm-core/tests/test-secrets.c2
-rw-r--r--libnm-core/tests/test-setting.c1
-rw-r--r--libnm-core/tests/test-settings-defaults.c2
-rwxr-xr-xlibnm/generate-plugin-docs.pl1
-rwxr-xr-xlibnm/generate-setting-docs.py2
-rw-r--r--libnm/nm-types.h3
-rw-r--r--libnm/tests/test-libnm.c6
-rw-r--r--libnm/tests/test-nm-client.c1
-rw-r--r--libnm/tests/test-remote-settings-client.c1
-rw-r--r--libnm/tests/test-secret-agent.c1
-rw-r--r--shared/nm-default.h3
-rw-r--r--shared/nm-glib-aux/nm-c-list.h3
-rw-r--r--shared/nm-glib-aux/nm-dbus-aux.c3
-rw-r--r--shared/nm-glib-aux/nm-dbus-aux.h3
-rw-r--r--shared/nm-glib-aux/nm-dedup-multi.c3
-rw-r--r--shared/nm-glib-aux/nm-dedup-multi.h3
-rw-r--r--shared/nm-glib-aux/nm-enum-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-enum-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-errno.c3
-rw-r--r--shared/nm-glib-aux/nm-errno.h3
-rw-r--r--shared/nm-glib-aux/nm-hash-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-hash-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-io-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-io-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-keyfile-aux.c3
-rw-r--r--shared/nm-glib-aux/nm-keyfile-aux.h3
-rw-r--r--shared/nm-glib-aux/nm-logging-fwd.h3
-rw-r--r--shared/nm-glib-aux/nm-macros-internal.h3
-rw-r--r--shared/nm-glib-aux/nm-obj.h3
-rw-r--r--shared/nm-glib-aux/nm-random-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-random-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-secret-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-secret-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.h3
-rw-r--r--shared/nm-glib-aux/nm-time-utils.c3
-rw-r--r--shared/nm-glib-aux/nm-time-utils.h3
-rw-r--r--shared/nm-libnm-core-aux/nm-dispatcher-api.h3
-rw-r--r--shared/nm-libnm-core-aux/nm-libnm-core-aux.c3
-rw-r--r--shared/nm-libnm-core-aux/nm-libnm-core-aux.h3
-rw-r--r--shared/nm-libnm-core-intern/nm-common-macros.h3
-rw-r--r--shared/nm-libnm-core-intern/nm-libnm-core-utils.c2
-rw-r--r--shared/nm-libnm-core-intern/nm-libnm-core-utils.h2
-rw-r--r--shared/nm-std-aux/c-list-util.c3
-rw-r--r--shared/nm-std-aux/c-list-util.h3
-rw-r--r--shared/nm-test-utils-impl.c1
-rw-r--r--shared/nm-udev-aux/nm-udev-utils.c3
-rw-r--r--shared/nm-udev-aux/nm-udev-utils.h3
-rw-r--r--shared/nm-utils/nm-compat.c3
-rw-r--r--shared/nm-utils/nm-compat.h3
-rw-r--r--shared/nm-utils/nm-vpn-editor-plugin-call.h3
-rw-r--r--shared/systemd/nm-sd-utils-shared.c3
-rw-r--r--shared/systemd/nm-sd-utils-shared.h3
-rw-r--r--shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h3
-rw-r--r--src/NetworkManagerUtils.c3
-rw-r--r--src/NetworkManagerUtils.h3
-rw-r--r--src/devices/adsl/nm-atm-manager.c3
-rw-r--r--src/devices/adsl/nm-device-adsl.c3
-rw-r--r--src/devices/adsl/nm-device-adsl.h3
-rw-r--r--src/devices/bluetooth/nm-bluez-common.h3
-rw-r--r--src/devices/bluetooth/nm-bluez-manager.c3
-rw-r--r--src/devices/bluetooth/nm-bluez5-dun.c3
-rw-r--r--src/devices/bluetooth/nm-bluez5-dun.h3
-rw-r--r--src/devices/bluetooth/nm-bt-error.c3
-rw-r--r--src/devices/bluetooth/nm-bt-error.h3
-rw-r--r--src/devices/bluetooth/nm-device-bt.c3
-rw-r--r--src/devices/bluetooth/nm-device-bt.h3
-rw-r--r--src/devices/nm-acd-manager.c3
-rw-r--r--src/devices/nm-acd-manager.h3
-rw-r--r--src/devices/nm-device-6lowpan.c3
-rw-r--r--src/devices/nm-device-6lowpan.h3
-rw-r--r--src/devices/nm-device-bond.c3
-rw-r--r--src/devices/nm-device-bond.h3
-rw-r--r--src/devices/nm-device-bridge.c3
-rw-r--r--src/devices/nm-device-bridge.h3
-rw-r--r--src/devices/nm-device-dummy.c3
-rw-r--r--src/devices/nm-device-dummy.h3
-rw-r--r--src/devices/nm-device-ethernet-utils.c3
-rw-r--r--src/devices/nm-device-ethernet-utils.h3
-rw-r--r--src/devices/nm-device-ethernet.c3
-rw-r--r--src/devices/nm-device-ethernet.h3
-rw-r--r--src/devices/nm-device-factory.c3
-rw-r--r--src/devices/nm-device-factory.h3
-rw-r--r--src/devices/nm-device-generic.c3
-rw-r--r--src/devices/nm-device-generic.h3
-rw-r--r--src/devices/nm-device-infiniband.c3
-rw-r--r--src/devices/nm-device-infiniband.h3
-rw-r--r--src/devices/nm-device-ip-tunnel.c3
-rw-r--r--src/devices/nm-device-ip-tunnel.h3
-rw-r--r--src/devices/nm-device-logging.h3
-rw-r--r--src/devices/nm-device-macsec.c3
-rw-r--r--src/devices/nm-device-macsec.h3
-rw-r--r--src/devices/nm-device-macvlan.c3
-rw-r--r--src/devices/nm-device-macvlan.h3
-rw-r--r--src/devices/nm-device-ppp.c3
-rw-r--r--src/devices/nm-device-ppp.h3
-rw-r--r--src/devices/nm-device-private.h3
-rw-r--r--src/devices/nm-device-tun.c3
-rw-r--r--src/devices/nm-device-tun.h3
-rw-r--r--src/devices/nm-device-veth.c3
-rw-r--r--src/devices/nm-device-veth.h3
-rw-r--r--src/devices/nm-device-vlan.c3
-rw-r--r--src/devices/nm-device-vlan.h3
-rw-r--r--src/devices/nm-device-vxlan.c3
-rw-r--r--src/devices/nm-device-vxlan.h3
-rw-r--r--src/devices/nm-device-wpan.c3
-rw-r--r--src/devices/nm-device-wpan.h3
-rw-r--r--src/devices/nm-device.c3
-rw-r--r--src/devices/nm-device.h3
-rw-r--r--src/devices/nm-lldp-listener.c3
-rw-r--r--src/devices/nm-lldp-listener.h3
-rw-r--r--src/devices/ovs/nm-device-ovs-bridge.c3
-rw-r--r--src/devices/ovs/nm-device-ovs-bridge.h3
-rw-r--r--src/devices/ovs/nm-device-ovs-interface.c3
-rw-r--r--src/devices/ovs/nm-device-ovs-interface.h3
-rw-r--r--src/devices/ovs/nm-device-ovs-port.c3
-rw-r--r--src/devices/ovs/nm-device-ovs-port.h3
-rw-r--r--src/devices/ovs/nm-ovs-factory.c3
-rw-r--r--src/devices/ovs/nm-ovsdb.c3
-rw-r--r--src/devices/ovs/nm-ovsdb.h3
-rw-r--r--src/devices/team/nm-device-team.c3
-rw-r--r--src/devices/team/nm-device-team.h4
-rw-r--r--src/devices/team/nm-team-factory.c3
-rw-r--r--src/devices/tests/test-acd.c3
-rw-r--r--src/devices/tests/test-lldp.c3
-rw-r--r--src/devices/wifi/nm-device-iwd.c3
-rw-r--r--src/devices/wifi/nm-device-iwd.h3
-rw-r--r--src/devices/wifi/nm-device-olpc-mesh.c4
-rw-r--r--src/devices/wifi/nm-device-olpc-mesh.h4
-rw-r--r--src/devices/wifi/nm-device-wifi-p2p.c3
-rw-r--r--src/devices/wifi/nm-device-wifi-p2p.h3
-rw-r--r--src/devices/wifi/nm-device-wifi.c3
-rw-r--r--src/devices/wifi/nm-device-wifi.h3
-rw-r--r--src/devices/wifi/nm-iwd-manager.c3
-rw-r--r--src/devices/wifi/nm-iwd-manager.h3
-rw-r--r--src/devices/wifi/nm-wifi-ap.c3
-rw-r--r--src/devices/wifi/nm-wifi-ap.h3
-rw-r--r--src/devices/wifi/nm-wifi-factory.c3
-rw-r--r--src/devices/wifi/nm-wifi-p2p-peer.c3
-rw-r--r--src/devices/wifi/nm-wifi-p2p-peer.h3
-rw-r--r--src/devices/wifi/tests/test-devices-wifi.c1
-rw-r--r--src/devices/wwan/nm-device-modem.c3
-rw-r--r--src/devices/wwan/nm-device-modem.h3
-rw-r--r--src/devices/wwan/nm-modem-broadband.c3
-rw-r--r--src/devices/wwan/nm-modem-broadband.h3
-rw-r--r--src/devices/wwan/nm-modem-manager.c3
-rw-r--r--src/devices/wwan/nm-modem-manager.h3
-rw-r--r--src/devices/wwan/nm-modem-ofono.c3
-rw-r--r--src/devices/wwan/nm-modem-ofono.h3
-rw-r--r--src/devices/wwan/nm-modem.c3
-rw-r--r--src/devices/wwan/nm-modem.h3
-rw-r--r--src/devices/wwan/nm-service-providers.c1
-rw-r--r--src/devices/wwan/nm-wwan-factory.c3
-rw-r--r--src/dhcp/nm-dhcp-client-logging.h3
-rw-r--r--src/dhcp/nm-dhcp-client.c4
-rw-r--r--src/dhcp/nm-dhcp-client.h3
-rw-r--r--src/dhcp/nm-dhcp-dhclient-utils.h3
-rw-r--r--src/dhcp/nm-dhcp-dhclient.c3
-rw-r--r--src/dhcp/nm-dhcp-dhcpcanon.c3
-rw-r--r--src/dhcp/nm-dhcp-dhcpcd.c4
-rw-r--r--src/dhcp/nm-dhcp-helper-api.h3
-rw-r--r--src/dhcp/nm-dhcp-helper.c3
-rw-r--r--src/dhcp/nm-dhcp-listener.c4
-rw-r--r--src/dhcp/nm-dhcp-listener.h3
-rw-r--r--src/dhcp/nm-dhcp-manager.c4
-rw-r--r--src/dhcp/nm-dhcp-manager.h3
-rw-r--r--src/dhcp/nm-dhcp-utils.c4
-rw-r--r--src/dhcp/nm-dhcp-utils.h3
-rw-r--r--src/dhcp/tests/test-dhcp-dhclient.c1
-rw-r--r--src/dhcp/tests/test-dhcp-utils.c4
-rw-r--r--src/dns/nm-dns-dnsmasq.c1
-rw-r--r--src/dns/nm-dns-dnsmasq.h3
-rw-r--r--src/dns/nm-dns-manager.c4
-rw-r--r--src/dns/nm-dns-manager.h4
-rw-r--r--src/dns/nm-dns-plugin.c4
-rw-r--r--src/dns/nm-dns-plugin.h3
-rw-r--r--src/dns/nm-dns-systemd-resolved.c1
-rw-r--r--src/dns/nm-dns-systemd-resolved.h3
-rw-r--r--src/dns/nm-dns-unbound.c1
-rw-r--r--src/dns/nm-dns-unbound.h4
-rw-r--r--src/dnsmasq/nm-dnsmasq-manager.c3
-rw-r--r--src/dnsmasq/nm-dnsmasq-manager.h3
-rw-r--r--src/dnsmasq/nm-dnsmasq-utils.c3
-rw-r--r--src/dnsmasq/nm-dnsmasq-utils.h3
-rw-r--r--src/dnsmasq/tests/test-dnsmasq-utils.c1
-rw-r--r--src/initrd/nm-initrd-generator.c3
-rw-r--r--src/initrd/nm-initrd-generator.h3
-rw-r--r--src/initrd/nmi-cmdline-reader.c3
-rw-r--r--src/initrd/nmi-dt-reader.c3
-rw-r--r--src/initrd/nmi-ibft-reader.c3
-rw-r--r--src/initrd/tests/test-cmdline-reader.c3
-rw-r--r--src/initrd/tests/test-dt-reader.c3
-rw-r--r--src/initrd/tests/test-ibft-reader.c3
-rw-r--r--src/main-utils.c3
-rw-r--r--src/main-utils.h3
-rw-r--r--src/main.c3
-rw-r--r--src/ndisc/nm-fake-ndisc.c3
-rw-r--r--src/ndisc/nm-fake-ndisc.h3
-rw-r--r--src/ndisc/nm-lndp-ndisc.c3
-rw-r--r--src/ndisc/nm-lndp-ndisc.h3
-rw-r--r--src/ndisc/nm-ndisc-private.h3
-rw-r--r--src/ndisc/nm-ndisc.c3
-rw-r--r--src/ndisc/nm-ndisc.h3
-rw-r--r--src/ndisc/tests/test-ndisc-fake.c3
-rw-r--r--src/ndisc/tests/test-ndisc-linux.c3
-rw-r--r--src/nm-act-request.c3
-rw-r--r--src/nm-act-request.h3
-rw-r--r--src/nm-active-connection.c3
-rw-r--r--src/nm-active-connection.h3
-rw-r--r--src/nm-audit-manager.c3
-rw-r--r--src/nm-audit-manager.h3
-rw-r--r--src/nm-auth-manager.c3
-rw-r--r--src/nm-auth-manager.h3
-rw-r--r--src/nm-auth-subject.c3
-rw-r--r--src/nm-auth-subject.h3
-rw-r--r--src/nm-auth-utils.c3
-rw-r--r--src/nm-auth-utils.h3
-rw-r--r--src/nm-checkpoint-manager.c3
-rw-r--r--src/nm-checkpoint-manager.h3
-rw-r--r--src/nm-checkpoint.c3
-rw-r--r--src/nm-checkpoint.h3
-rw-r--r--src/nm-config-data.c3
-rw-r--r--src/nm-config-data.h3
-rw-r--r--src/nm-config.c3
-rw-r--r--src/nm-config.h3
-rw-r--r--src/nm-connectivity.c3
-rw-r--r--src/nm-connectivity.h3
-rw-r--r--src/nm-core-utils.c3
-rw-r--r--src/nm-core-utils.h3
-rw-r--r--src/nm-dbus-manager.c3
-rw-r--r--src/nm-dbus-manager.h3
-rw-r--r--src/nm-dbus-object.c3
-rw-r--r--src/nm-dbus-object.h3
-rw-r--r--src/nm-dbus-utils.c3
-rw-r--r--src/nm-dbus-utils.h3
-rw-r--r--src/nm-dcb.c3
-rw-r--r--src/nm-dcb.h3
-rw-r--r--src/nm-dhcp4-config.c3
-rw-r--r--src/nm-dhcp4-config.h3
-rw-r--r--src/nm-dhcp6-config.c3
-rw-r--r--src/nm-dhcp6-config.h3
-rw-r--r--src/nm-dispatcher.c3
-rw-r--r--src/nm-dispatcher.h3
-rw-r--r--src/nm-firewall-manager.c3
-rw-r--r--src/nm-firewall-manager.h3
-rw-r--r--src/nm-hostname-manager.c3
-rw-r--r--src/nm-hostname-manager.h4
-rw-r--r--src/nm-iface-helper.c3
-rw-r--r--src/nm-ip4-config.c3
-rw-r--r--src/nm-ip4-config.h3
-rw-r--r--src/nm-ip6-config.c3
-rw-r--r--src/nm-ip6-config.h3
-rw-r--r--src/nm-keep-alive.c2
-rw-r--r--src/nm-keep-alive.h2
-rw-r--r--src/nm-logging.c3
-rw-r--r--src/nm-logging.h3
-rw-r--r--src/nm-manager.c3
-rw-r--r--src/nm-manager.h3
-rw-r--r--src/nm-netns.c3
-rw-r--r--src/nm-netns.h3
-rw-r--r--src/nm-pacrunner-manager.c3
-rw-r--r--src/nm-pacrunner-manager.h3
-rw-r--r--src/nm-policy.c3
-rw-r--r--src/nm-policy.h3
-rw-r--r--src/nm-proxy-config.c3
-rw-r--r--src/nm-proxy-config.h3
-rw-r--r--src/nm-rfkill-manager.c3
-rw-r--r--src/nm-rfkill-manager.h3
-rw-r--r--src/nm-session-monitor.c3
-rw-r--r--src/nm-session-monitor.h3
-rw-r--r--src/nm-sleep-monitor.c3
-rw-r--r--src/nm-sleep-monitor.h3
-rw-r--r--src/nm-types.h3
-rw-r--r--src/platform/nm-fake-platform.c3
-rw-r--r--src/platform/nm-fake-platform.h3
-rw-r--r--src/platform/nm-linux-platform.c4
-rw-r--r--src/platform/nm-linux-platform.h3
-rw-r--r--src/platform/nm-netlink.c3
-rw-r--r--src/platform/nm-netlink.h3
-rw-r--r--src/platform/nm-platform-private.h3
-rw-r--r--src/platform/nm-platform-utils.c3
-rw-r--r--src/platform/nm-platform-utils.h3
-rw-r--r--src/platform/nm-platform.c3
-rw-r--r--src/platform/nm-platform.h3
-rw-r--r--src/platform/nmp-netns.c3
-rw-r--r--src/platform/nmp-netns.h3
-rw-r--r--src/platform/nmp-object.c3
-rw-r--r--src/platform/nmp-object.h3
-rw-r--r--src/platform/nmp-rules-manager.c2
-rw-r--r--src/platform/nmp-rules-manager.h2
-rw-r--r--src/platform/tests/test-nmp-object.c3
-rw-r--r--src/platform/tests/test-platform-general.c3
-rw-r--r--src/platform/wifi/nm-wifi-utils-nl80211.c3
-rw-r--r--src/platform/wifi/nm-wifi-utils-nl80211.h3
-rw-r--r--src/platform/wifi/nm-wifi-utils-private.h3
-rw-r--r--src/platform/wifi/nm-wifi-utils-wext.c3
-rw-r--r--src/platform/wifi/nm-wifi-utils-wext.h3
-rw-r--r--src/platform/wifi/nm-wifi-utils.c3
-rw-r--r--src/platform/wifi/nm-wifi-utils.h3
-rw-r--r--src/platform/wpan/nm-wpan-utils.c3
-rw-r--r--src/platform/wpan/nm-wpan-utils.h3
-rw-r--r--src/ppp/nm-ppp-manager-call.c3
-rw-r--r--src/ppp/nm-ppp-manager-call.h3
-rw-r--r--src/ppp/nm-ppp-manager.c3
-rw-r--r--src/ppp/nm-ppp-manager.h3
-rw-r--r--src/ppp/nm-ppp-plugin-api.h3
-rw-r--r--src/ppp/nm-ppp-status.h3
-rw-r--r--src/ppp/nm-pppd-plugin.c3
-rw-r--r--src/ppp/nm-pppd-plugin.h3
-rw-r--r--src/settings/nm-agent-manager.c3
-rw-r--r--src/settings/nm-agent-manager.h3
-rw-r--r--src/settings/nm-secret-agent.c3
-rw-r--r--src/settings/nm-secret-agent.h3
-rw-r--r--src/settings/nm-settings-connection.c3
-rw-r--r--src/settings/nm-settings-connection.h3
-rw-r--r--src/settings/nm-settings-plugin.c3
-rw-r--r--src/settings/nm-settings-plugin.h3
-rw-r--r--src/settings/nm-settings-utils.c3
-rw-r--r--src/settings/nm-settings.c4
-rw-r--r--src/settings/nm-settings.h4
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c4
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h4
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.c6
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.h13
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c3
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c4
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h4
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-parser.c4
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-parser.h4
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-plugin.c4
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-plugin.h4
-rw-r--r--src/settings/plugins/ifupdown/tests/test-ifupdown.c1
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-plugin.c3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-plugin.h3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-reader.c3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-reader.h3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-storage.c3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-storage.h3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-utils.c3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-utils.h3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-writer.c3
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-writer.h3
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile-settings.c3
-rw-r--r--src/supplicant/nm-supplicant-config.c3
-rw-r--r--src/supplicant/nm-supplicant-config.h3
-rw-r--r--src/supplicant/nm-supplicant-interface.c3
-rw-r--r--src/supplicant/nm-supplicant-interface.h3
-rw-r--r--src/supplicant/nm-supplicant-manager.c3
-rw-r--r--src/supplicant/nm-supplicant-manager.h3
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.c3
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.h3
-rw-r--r--src/supplicant/nm-supplicant-types.h3
-rw-r--r--src/supplicant/tests/test-supplicant-config.c3
-rw-r--r--src/systemd/nm-sd-utils-core.c3
-rw-r--r--src/systemd/nm-sd-utils-core.h3
-rw-r--r--src/systemd/nm-sd.c3
-rw-r--r--src/systemd/nm-sd.h3
-rw-r--r--src/systemd/sd-adapt-core/nm-sd-adapt-core.c3
-rw-r--r--src/systemd/sd-adapt-core/nm-sd-adapt-core.h3
-rw-r--r--src/tests/config/nm-test-device.c3
-rw-r--r--src/tests/config/nm-test-device.h3
-rw-r--r--src/tests/config/test-config.c1
-rw-r--r--src/tests/test-core-with-expect.c1
-rw-r--r--src/tests/test-core.c1
-rw-r--r--src/tests/test-dcb.c1
-rw-r--r--src/tests/test-ip4-config.c1
-rw-r--r--src/tests/test-ip6-config.c1
-rw-r--r--src/tests/test-utils.c1
-rw-r--r--src/tests/test-wired-defname.c1
-rw-r--r--src/vpn/nm-vpn-connection.c3
-rw-r--r--src/vpn/nm-vpn-connection.h3
-rw-r--r--src/vpn/nm-vpn-manager.c3
-rw-r--r--src/vpn/nm-vpn-manager.h3
-rwxr-xr-xtools/enums-to-docbook.pl2
451 files changed, 434 insertions, 876 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 2c17fddc63..e11d755628 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * nmcli - command-line tool for controlling NetworkManager
- * Functions for running NM secret agent.
- *
* Copyright 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/agent.h b/clients/cli/agent.h
index 500301ddfa..dc79334124 100644
--- a/clients/cli/agent.h
+++ b/clients/cli/agent.h
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * nmcli - command-line tool for controlling NetworkManager
- * Functions for running NM secret agent.
- *
* Copyright 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 9b2d07aacd..73848a7f8a 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * nmcli - command-line tool for controlling NetworkManager
- * Common functions and data shared between files.
- *
* Copyright 2012 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/common.h b/clients/cli/common.h
index 50574a1baf..b3e7c1ccef 100644
--- a/clients/cli/common.h
+++ b/clients/cli/common.h
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * nmcli - command-line tool for controlling NetworkManager
- * Common functions and data shared between files.
- *
* Copyright 2012 - 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 003400d5fe..7f1275cabe 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/connections.h b/clients/cli/connections.h
index d92c27e27e..5c02af2eea 100644
--- a/clients/cli/connections.h
+++ b/clients/cli/connections.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* (C) Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index ea914ef5e5..f182aaf565 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/devices.h b/clients/cli/devices.h
index 06b14ef94e..3a418f174a 100644
--- a/clients/cli/devices.h
+++ b/clients/cli/devices.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* (C) Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/general.c b/clients/cli/general.c
index 55371d13fd..344dc28eaa 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/general.h b/clients/cli/general.h
index adaf458071..65d2366fc9 100644
--- a/clients/cli/general.h
+++ b/clients/cli/general.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 7eb9ef82dd..af78f10156 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Jiri Klimes <jklimes@redhat.com>
- *
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index c55daaafdf..379ba336f4 100644
--- a/clients/cli/nmcli.h
+++ b/clients/cli/nmcli.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index d667cb3e4b..b43eb17907 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/polkit-agent.h b/clients/cli/polkit-agent.h
index 3064b15da3..4a89846f52 100644
--- a/clients/cli/polkit-agent.h
+++ b/clients/cli/polkit-agent.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 5f7a2640c6..7289efb78d 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2015 Red Hat, Inc.
*/
diff --git a/clients/cli/settings.h b/clients/cli/settings.h
index c01d8270ef..2df08018ac 100644
--- a/clients/cli/settings.h
+++ b/clients/cli/settings.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2014 Red Hat, Inc.
*/
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 615b2c0597..3e6a94ed3a 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 Lennart Poettering
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/cli/utils.h b/clients/cli/utils.h
index 9f8c26bb48..9b799a97e7 100644
--- a/clients/cli/utils.h
+++ b/clients/cli/utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 85e26f310c..8e53d325fb 100644
--- a/clients/common/nm-client-utils.c
+++ b/clients/common/nm-client-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2017 Red Hat, Inc.
*/
diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h
index f983fc0732..607dd218ad 100644
--- a/clients/common/nm-client-utils.h
+++ b/clients/common/nm-client-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2017 Red Hat, Inc.
*/
diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c
index 1da99aa0fa..9b2a89964b 100644
--- a/clients/common/nm-meta-setting-access.c
+++ b/clients/common/nm-meta-setting-access.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright 2010 - 2017 Red Hat, Inc.
*/
diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h
index 6158db927e..40b76b4f27 100644
--- a/clients/common/nm-meta-setting-access.h
+++ b/clients/common/nm-meta-setting-access.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright 2010 - 2017 Red Hat, Inc.
*/
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index 40faa485ed..5b37676685 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 2f184e4945..b5ed54b613 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/clients/common/nm-meta-setting-desc.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nmcli - command-line tool to control NetworkManager
- *
+/*
* Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/clients/nm-online.c b/clients/nm-online.c
index cb1be8799c..de9c3794f0 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2006 - 2008 Novell, Inc.
* Copyright (C) 2008 - 2014 Red Hat, Inc.
- *
*/
/*
diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl
index 0b014e780f..5b402f1b30 100755
--- a/contrib/scripts/checkpatch.pl
+++ b/contrib/scripts/checkpatch.pl
@@ -1,7 +1,8 @@
#!/usr/bin/perl -n
# SPDX-License-Identifier: GPL-2.0+
-
+#
# Copyright 2018 Red Hat, Inc.
+#
# $ perldoc checkpatch.pl for eye-pleasing view of the manual:
diff --git a/contrib/scripts/nm-import-openconnect b/contrib/scripts/nm-import-openconnect
index 36e4a35e1a..67df191a6c 100755
--- a/contrib/scripts/nm-import-openconnect
+++ b/contrib/scripts/nm-import-openconnect
@@ -3,11 +3,10 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Script for importing/converting OpenConnect VPN configuration files for NetworkManager
-- In general, the implementation follows the logic of import() from
-- https://git.gnome.org/browse/network-manager-openconnect/tree/properties/nm-openconnect.c
---
----------------------
-- Helper functions --
diff --git a/contrib/scripts/nm-import-openvpn b/contrib/scripts/nm-import-openvpn
index fa1bade007..7a02f0c8d0 100755
--- a/contrib/scripts/nm-import-openvpn
+++ b/contrib/scripts/nm-import-openvpn
@@ -3,11 +3,11 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Script for importing/converting OpenVPN configuration files for NetworkManager
-- In general, the implementation follows the logic of import() from
-- https://git.gnome.org/browse/network-manager-openvpn/tree/properties/import-export.c
---
+
----------------------
-- Helper functions --
diff --git a/contrib/scripts/nm-import-vpnc b/contrib/scripts/nm-import-vpnc
index 50c08ca610..f90e89b6f2 100755
--- a/contrib/scripts/nm-import-vpnc
+++ b/contrib/scripts/nm-import-vpnc
@@ -3,11 +3,10 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Script for importing/converting Cisco VPN configuration files (.pcf) to NetworkManager
-- In general, the implementation follows the logic of import() from
-- https://git.gnome.org/browse/network-manager-vpnc/tree/properties/nm-vpnc.c
---
----------------------
-- Helper functions --
diff --git a/contrib/test/modemu.pl b/contrib/test/modemu.pl
index ed9fea03d9..7bc61a79c1 100755
--- a/contrib/test/modemu.pl
+++ b/contrib/test/modemu.pl
@@ -1,7 +1,8 @@
#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0+
-
+#
# Copyright 2018 Red Hat, Inc.
+#
# $ perldoc modemu.pl for eye-pleasing view of the manual:
diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c
index 82f42f4c68..13a7f7896b 100644
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/dispatcher/nm-dispatcher-utils.h b/dispatcher/nm-dispatcher-utils.h
index 6d7a8fd657..ba355f31b3 100644
--- a/dispatcher/nm-dispatcher-utils.h
+++ b/dispatcher/nm-dispatcher-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 92df95be10..9aeeef6815 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index dd2161e73d..240b89513f 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2011 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/examples/js/get_ips.js b/examples/js/get_ips.js
index e5cd84be9b..b7d5792ff0 100755
--- a/examples/js/get_ips.js
+++ b/examples/js/get_ips.js
@@ -1,6 +1,5 @@
#!/usr/bin/env gjs
// SPDX-License-Identifier: GPL-2.0+
-
/*
* Copyright 2014,2017 Red Hat, Inc.
*/
diff --git a/examples/lua/lgi/add-connection.lua b/examples/lua/lgi/add-connection.lua
index 6e31154c11..f85d47f2e8 100755
--- a/examples/lua/lgi/add-connection.lua
+++ b/examples/lua/lgi/add-connection.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Adding an Ethernet connection to NetworkManager in Lua.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local GLib = lgi.GLib
diff --git a/examples/lua/lgi/change-vpn-username.lua b/examples/lua/lgi/change-vpn-username.lua
index 9b2b3490c4..558d11fdf8 100755
--- a/examples/lua/lgi/change-vpn-username.lua
+++ b/examples/lua/lgi/change-vpn-username.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- This example changes username in a VPN profile.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local NM = lgi.NM
diff --git a/examples/lua/lgi/deactivate-all.lua b/examples/lua/lgi/deactivate-all.lua
index 9a9ac810b1..ea416773ab 100755
--- a/examples/lua/lgi/deactivate-all.lua
+++ b/examples/lua/lgi/deactivate-all.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Deactivate all active connections (of certain type).
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local NM = lgi.NM
diff --git a/examples/lua/lgi/get-basic-nm-info.lua b/examples/lua/lgi/get-basic-nm-info.lua
index 9d84e1342b..038916f88a 100755
--- a/examples/lua/lgi/get-basic-nm-info.lua
+++ b/examples/lua/lgi/get-basic-nm-info.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- This example gets basic information about NetworkManager.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local NM = lgi.NM
diff --git a/examples/lua/lgi/get-ips.lua b/examples/lua/lgi/get-ips.lua
index b1861cbec3..e909fe8201 100755
--- a/examples/lua/lgi/get-ips.lua
+++ b/examples/lua/lgi/get-ips.lua
@@ -3,14 +3,13 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- This example shows how to get addresses, routes and DNS information from
-- NMIP4Config and NMIP6Config (got out of NMDevice)
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local NM = lgi.NM
diff --git a/examples/lua/lgi/list-connections.lua b/examples/lua/lgi/list-connections.lua
index 50dd97ceb8..f22bcef395 100755
--- a/examples/lua/lgi/list-connections.lua
+++ b/examples/lua/lgi/list-connections.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Getting and printing all NetworkManager connection in Lua.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local GLib = lgi.GLib
diff --git a/examples/lua/lgi/list-devices.lua b/examples/lua/lgi/list-devices.lua
index a1410b49fc..9f87d3e3be 100755
--- a/examples/lua/lgi/list-devices.lua
+++ b/examples/lua/lgi/list-devices.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- Getting basic information about network interfaces known to NetworkManager.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local GLib = lgi.GLib
diff --git a/examples/lua/lgi/show-wifi-networks.lua b/examples/lua/lgi/show-wifi-networks.lua
index 6accf3eb38..d1f24a4770 100755
--- a/examples/lua/lgi/show-wifi-networks.lua
+++ b/examples/lua/lgi/show-wifi-networks.lua
@@ -3,13 +3,12 @@
--
-- Copyright 2015 Red Hat, Inc.
--
---
+
-- This example lists Wi-Fi access points NetworkManager scanned on Wi-Fi devices.
-- The example uses libnm library using GObject introspection via Lua lgi module.
-- Most distribution ship the module as lua-lgi package.
-- libnm guide: https://developer.gnome.org/libnm/1.0/
-- Lua-lgi guide: https://github.com/pavouk/lgi/blob/master/docs/guide.md
---
local lgi = require 'lgi'
local NM = lgi.NM
diff --git a/examples/python/gi/add_connection.py b/examples/python/gi/add_connection.py
index cd7ea4225a..b650b9f388 100755
--- a/examples/python/gi/add_connection.py
+++ b/examples/python/gi/add_connection.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
-
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/examples/python/gi/checkpoint.py b/examples/python/gi/checkpoint.py
index ba4e1dc650..c5b20d683c 100755
--- a/examples/python/gi/checkpoint.py
+++ b/examples/python/gi/checkpoint.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
-
+#
# Copyright 2017 Red Hat, Inc.
+#
import sys
diff --git a/examples/python/gi/deactivate-all.py b/examples/python/gi/deactivate-all.py
index 6f0e3ab92e..a10c0ebb4b 100755
--- a/examples/python/gi/deactivate-all.py
+++ b/examples/python/gi/deactivate-all.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
-
#
# Copyright 2015 Red Hat, Inc.
#
diff --git a/examples/python/gi/device-state-ip4config.py b/examples/python/gi/device-state-ip4config.py
index cfead08197..18848d07fc 100755
--- a/examples/python/gi/device-state-ip4config.py
+++ b/examples/python/gi/device-state-ip4config.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
#
-#
# Copyright (C) 2012 Red Hat, Inc.
#
diff --git a/examples/python/gi/dns.py b/examples/python/gi/dns.py
index ecca579400..f93f97e514 100755
--- a/examples/python/gi/dns.py
+++ b/examples/python/gi/dns.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
#
-#
# Copyright (C) 2016 Red Hat, Inc.
#
diff --git a/examples/python/gi/get-lldp-neighbors.py b/examples/python/gi/get-lldp-neighbors.py
index 2cb1c7f61d..d1bed32c6b 100755
--- a/examples/python/gi/get-lldp-neighbors.py
+++ b/examples/python/gi/get-lldp-neighbors.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
#
-#
# Copyright (C) 2015 Red Hat, Inc.
#
diff --git a/examples/python/gi/get_ips.py b/examples/python/gi/get_ips.py
index 5a5419b4df..12378117a7 100755
--- a/examples/python/gi/get_ips.py
+++ b/examples/python/gi/get_ips.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
#
-#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/examples/python/gi/list-connections.py b/examples/python/gi/list-connections.py
index da88726376..eee687c9e8 100755
--- a/examples/python/gi/list-connections.py
+++ b/examples/python/gi/list-connections.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
-
#
# Copyright 2012 - 2014 Red Hat, Inc.
#
diff --git a/examples/python/gi/nm-wg-set b/examples/python/gi/nm-wg-set
index 27ce55102c..a151c6094b 100755
--- a/examples/python/gi/nm-wg-set
+++ b/examples/python/gi/nm-wg-set
@@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Copyright 2018 - 2019 Red Hat, Inc.
+#
# nm-wg-set: modify an existing WireGuard connection profile.
#
diff --git a/examples/python/gi/setting-user-data.py b/examples/python/gi/setting-user-data.py
index 4ada5d1ec0..dac81b78a8 100755
--- a/examples/python/gi/setting-user-data.py
+++ b/examples/python/gi/setting-user-data.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
# SPDX-License-Identifier: GPL-2.0+
-
#
# Copyright 2017 Red Hat, Inc.
+#
#
# set and show user-data for a connection:
diff --git a/examples/python/gi/show-wifi-networks.py b/examples/python/gi/show-wifi-networks.py
index 4c7607b30c..e1ee4c3d5d 100755
--- a/examples/python/gi/show-wifi-networks.py
+++ b/examples/python/gi/show-wifi-networks.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# SPDX-License-Identifier: GPL-2.0+
# coding=utf-8
+# SPDX-License-Identifier: GPL-2.0+
#
# Copyright (C) 2013 Red Hat, Inc.
#
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index 7bf9b9b379..9293c59042 100644
--- a/libnm-core/nm-core-types.h
+++ b/libnm-core/nm-core-types.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2014 - 2018 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c
index f212763da1..ca763948fb 100644
--- a/libnm-core/nm-crypto-gnutls.c
+++ b/libnm-core/nm-crypto-gnutls.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
- *
+/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2015 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-crypto-impl.h b/libnm-core/nm-crypto-impl.h
index f30bf0cd6c..b547031bc4 100644
--- a/libnm-core/nm-crypto-impl.h
+++ b/libnm-core/nm-crypto-impl.h
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2018 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c
index 7b5fc7b4f4..6dc57ce563 100644
--- a/libnm-core/nm-crypto-nss.c
+++ b/libnm-core/nm-crypto-nss.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2009 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index 8ee6cbe0f0..d57678dfff 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2018 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-crypto.h b/libnm-core/nm-crypto.h
index adb3ca50df..fd9270a150 100644
--- a/libnm-core/nm-crypto.h
+++ b/libnm-core/nm-crypto.h
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2014 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h
index 8ee2c13425..331ef2d7a0 100644
--- a/libnm-core/nm-json.h
+++ b/libnm-core/nm-json.h
@@ -2,6 +2,7 @@
/*
* Copyright 2017, 2018 Red Hat, Inc.
*/
+
#ifndef __NM_JSON_H__
#define __NM_JSON_H__
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index 6d8d139e72..42003a5f5f 100644
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index 1a5b7e230b..4299d019b1 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2010 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h
index 0ba4336a7c..ec9d151a8a 100644
--- a/libnm-core/nm-keyfile-utils.h
+++ b/libnm-core/nm-keyfile-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2010-2015 Red Hat, Inc.
*/
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index 11f0c33e4a..535acccf7d 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 - 2009 Novell, Inc.
* Copyright (C) 2008 - 2017 Red Hat, Inc.
*/
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index 780f735b1e..af5c8cfb30 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
* Dan Williams <dcbw@redhat.com>
- *
* Copyright 2007 - 2011 Red Hat, Inc.
*/
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index c477844c55..9583ac35ee 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -1,13 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT SC WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
* Copyright 2008 - 2018 Red Hat, Inc.
- *
*/
#define NM_GLIB_COMPAT_H_TEST
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
index 3e0bb26c0c..0ac3c9b16e 100644
--- a/libnm-core/tests/test-keyfile.c
+++ b/libnm-core/tests/test-keyfile.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- *
* Copyright 2015 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index 7422b56308..8e41f4de3b 100644
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- *
* Copyright 2008 - 2011 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
index 1cbdf07cd0..0de7a66bf2 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2008 - 2017 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index a343e7da2e..f54eb5dbb7 100644
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- *
* Copyright 2008 - 2011 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl
index 41e7945dcb..eef557898a 100755
--- a/libnm/generate-plugin-docs.pl
+++ b/libnm/generate-plugin-docs.pl
@@ -1,6 +1,5 @@
#!/usr/bin/env perl
# SPDX-License-Identifier: GPL-2.0+
-
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/libnm/generate-setting-docs.py b/libnm/generate-setting-docs.py
index 4ccb77e479..8f0c6b1deb 100755
--- a/libnm/generate-setting-docs.py
+++ b/libnm/generate-setting-docs.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
# SPDX-License-Identifier: LGPL-2.1+
+#
# Copyright 2009 - 2017 Red Hat, Inc.
+#
from __future__ import print_function
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index b0a46f34c0..57626ffc19 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2014 - 2018 Red Hat, Inc.
*/
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index 43d18497f1..ff560faea5 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -1,11 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT SC WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 92df8c2630..dce000dc27 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010 - 2014 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index bdc7d13d0a..c19eb5e195 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010 - 2011 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 3c153a4af5..2f3d074aef 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010 - 2014 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/shared/nm-default.h b/shared/nm-default.h
index cb2c40cd93..9b04a6ad3d 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2015 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-c-list.h b/shared/nm-glib-aux/nm-c-list.h
index 98d6f7d448..361fe4047e 100644
--- a/shared/nm-glib-aux/nm-c-list.h
+++ b/shared/nm-glib-aux/nm-c-list.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2014 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-dbus-aux.c b/shared/nm-glib-aux/nm-dbus-aux.c
index 51db326a75..4ace649290 100644
--- a/shared/nm-glib-aux/nm-dbus-aux.c
+++ b/shared/nm-glib-aux/nm-dbus-aux.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-dbus-aux.h b/shared/nm-glib-aux/nm-dbus-aux.h
index d5e3bf4780..cb9d558447 100644
--- a/shared/nm-glib-aux/nm-dbus-aux.h
+++ b/shared/nm-glib-aux/nm-dbus-aux.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-dedup-multi.c b/shared/nm-glib-aux/nm-dedup-multi.c
index f36871590e..40c0bc0918 100644
--- a/shared/nm-glib-aux/nm-dedup-multi.c
+++ b/shared/nm-glib-aux/nm-dedup-multi.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-dedup-multi.h b/shared/nm-glib-aux/nm-dedup-multi.h
index 9752b7b51b..25b2dcb740 100644
--- a/shared/nm-glib-aux/nm-dedup-multi.h
+++ b/shared/nm-glib-aux/nm-dedup-multi.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-enum-utils.c b/shared/nm-glib-aux/nm-enum-utils.c
index abb2503cf8..e2fb49b1c3 100644
--- a/shared/nm-glib-aux/nm-enum-utils.c
+++ b/shared/nm-glib-aux/nm-enum-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-enum-utils.h b/shared/nm-glib-aux/nm-enum-utils.h
index e58dda3efd..45c127db73 100644
--- a/shared/nm-glib-aux/nm-enum-utils.h
+++ b/shared/nm-glib-aux/nm-enum-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-errno.c b/shared/nm-glib-aux/nm-errno.c
index e2fff1e48d..add722068e 100644
--- a/shared/nm-glib-aux/nm-errno.c
+++ b/shared/nm-glib-aux/nm-errno.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-errno.h b/shared/nm-glib-aux/nm-errno.h
index 4205df0524..7ef6b6680e 100644
--- a/shared/nm-glib-aux/nm-errno.h
+++ b/shared/nm-glib-aux/nm-errno.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-hash-utils.c b/shared/nm-glib-aux/nm-hash-utils.c
index 4bd64c2595..a628b3d8aa 100644
--- a/shared/nm-glib-aux/nm-hash-utils.c
+++ b/shared/nm-glib-aux/nm-hash-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-hash-utils.h b/shared/nm-glib-aux/nm-hash-utils.h
index 115cd5b145..f6fa97921b 100644
--- a/shared/nm-glib-aux/nm-hash-utils.h
+++ b/shared/nm-glib-aux/nm-hash-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-io-utils.c b/shared/nm-glib-aux/nm-io-utils.c
index 77c72e4cf9..1a1966b5cc 100644
--- a/shared/nm-glib-aux/nm-io-utils.c
+++ b/shared/nm-glib-aux/nm-io-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-io-utils.h b/shared/nm-glib-aux/nm-io-utils.h
index ad63dce546..2e6ae15f65 100644
--- a/shared/nm-glib-aux/nm-io-utils.h
+++ b/shared/nm-glib-aux/nm-io-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/shared/nm-glib-aux/nm-keyfile-aux.c
index 12427e0856..47cccf1fe5 100644
--- a/shared/nm-glib-aux/nm-keyfile-aux.c
+++ b/shared/nm-glib-aux/nm-keyfile-aux.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.h b/shared/nm-glib-aux/nm-keyfile-aux.h
index 5ce07d29c3..f1713fe4d9 100644
--- a/shared/nm-glib-aux/nm-keyfile-aux.h
+++ b/shared/nm-glib-aux/nm-keyfile-aux.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-logging-fwd.h b/shared/nm-glib-aux/nm-logging-fwd.h
index 9841c09d5e..eecba8bead 100644
--- a/shared/nm-glib-aux/nm-logging-fwd.h
+++ b/shared/nm-glib-aux/nm-logging-fwd.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/shared/nm-glib-aux/nm-macros-internal.h
index 09f96ef6ba..7accb2b04a 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/shared/nm-glib-aux/nm-macros-internal.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2012 Colin Walters <walters@verbum.org>.
* (C) Copyright 2014 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-obj.h b/shared/nm-glib-aux/nm-obj.h
index 37f13892d3..c107065eba 100644
--- a/shared/nm-glib-aux/nm-obj.h
+++ b/shared/nm-glib-aux/nm-obj.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-random-utils.c b/shared/nm-glib-aux/nm-random-utils.c
index 3e881f415a..ce8fa4c7bb 100644
--- a/shared/nm-glib-aux/nm-random-utils.c
+++ b/shared/nm-glib-aux/nm-random-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-random-utils.h b/shared/nm-glib-aux/nm-random-utils.h
index 05cc22b9e5..172e3f8ec1 100644
--- a/shared/nm-glib-aux/nm-random-utils.h
+++ b/shared/nm-glib-aux/nm-random-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-secret-utils.c b/shared/nm-glib-aux/nm-secret-utils.c
index 00ce4c5098..f53e0512f6 100644
--- a/shared/nm-glib-aux/nm-secret-utils.c
+++ b/shared/nm-glib-aux/nm-secret-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
* (C) Copyright 2015 - 2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/shared/nm-glib-aux/nm-secret-utils.h b/shared/nm-glib-aux/nm-secret-utils.h
index 4403ceb763..2c8de9aa5c 100644
--- a/shared/nm-glib-aux/nm-secret-utils.h
+++ b/shared/nm-glib-aux/nm-secret-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index a344f9d502..20f0a551e6 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2016 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/shared/nm-glib-aux/nm-shared-utils.h
index 95719c4455..eb879430a7 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/shared/nm-glib-aux/nm-shared-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2016 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-time-utils.c b/shared/nm-glib-aux/nm-time-utils.c
index c35230536c..fecad2afd4 100644
--- a/shared/nm-glib-aux/nm-time-utils.c
+++ b/shared/nm-glib-aux/nm-time-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-time-utils.h b/shared/nm-glib-aux/nm-time-utils.h
index b260a1ed11..e7c256a554 100644
--- a/shared/nm-glib-aux/nm-time-utils.h
+++ b/shared/nm-glib-aux/nm-time-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-aux/nm-dispatcher-api.h b/shared/nm-libnm-core-aux/nm-dispatcher-api.h
index 1af91f7b2d..96f512e0e8 100644
--- a/shared/nm-libnm-core-aux/nm-dispatcher-api.h
+++ b/shared/nm-libnm-core-aux/nm-dispatcher-api.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-aux/nm-libnm-core-aux.c b/shared/nm-libnm-core-aux/nm-libnm-core-aux.c
index bb439c9428..68c0e5de19 100644
--- a/shared/nm-libnm-core-aux/nm-libnm-core-aux.c
+++ b/shared/nm-libnm-core-aux/nm-libnm-core-aux.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-aux/nm-libnm-core-aux.h b/shared/nm-libnm-core-aux/nm-libnm-core-aux.h
index 43ac61fc2c..30a97cb77f 100644
--- a/shared/nm-libnm-core-aux/nm-libnm-core-aux.h
+++ b/shared/nm-libnm-core-aux/nm-libnm-core-aux.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2019 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-intern/nm-common-macros.h b/shared/nm-libnm-core-intern/nm-common-macros.h
index 2c770e8bc9..bcd58fa86e 100644
--- a/shared/nm-libnm-core-intern/nm-common-macros.h
+++ b/shared/nm-libnm-core-intern/nm-common-macros.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2016 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c
index 0818db4802..9bf0b1202e 100644
--- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.c
+++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.c
@@ -1,6 +1,4 @@
// SPDX-License-Identifier: LGPL-2.1+
-/*
- */
#include "nm-default.h"
diff --git a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h
index 1f47ccb375..42e9fc6491 100644
--- a/shared/nm-libnm-core-intern/nm-libnm-core-utils.h
+++ b/shared/nm-libnm-core-intern/nm-libnm-core-utils.h
@@ -1,6 +1,4 @@
// SPDX-License-Identifier: LGPL-2.1+
-/*
- */
#ifndef __NM_LIBNM_SHARED_UTILS_H__
#define __NM_LIBNM_SHARED_UTILS_H__
diff --git a/shared/nm-std-aux/c-list-util.c b/shared/nm-std-aux/c-list-util.c
index 6d8f95b6e4..a49e9f00a4 100644
--- a/shared/nm-std-aux/c-list-util.c
+++ b/shared/nm-std-aux/c-list-util.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-std-aux/c-list-util.h b/shared/nm-std-aux/c-list-util.h
index 82f2929a86..1c322d2364 100644
--- a/shared/nm-std-aux/c-list-util.h
+++ b/shared/nm-std-aux/c-list-util.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
index 24dff53a79..7e21d5e114 100644
--- a/shared/nm-test-utils-impl.c
+++ b/shared/nm-test-utils-impl.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2010 - 2015 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/shared/nm-udev-aux/nm-udev-utils.c b/shared/nm-udev-aux/nm-udev-utils.c
index 0101eb176e..1b0927dfff 100644
--- a/shared/nm-udev-aux/nm-udev-utils.c
+++ b/shared/nm-udev-aux/nm-udev-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-udev-utils.c - udev utils functions
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-udev-aux/nm-udev-utils.h b/shared/nm-udev-aux/nm-udev-utils.h
index 943f5aacbe..92fce699a3 100644
--- a/shared/nm-udev-aux/nm-udev-utils.h
+++ b/shared/nm-udev-aux/nm-udev-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-udev-utils.h - udev utils functions
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
index c24df3282b..4ea5084deb 100644
--- a/shared/nm-utils/nm-compat.c
+++ b/shared/nm-utils/nm-compat.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-utils/nm-compat.h b/shared/nm-utils/nm-compat.h
index b5fe6a6ebd..1062d882af 100644
--- a/shared/nm-utils/nm-compat.h
+++ b/shared/nm-utils/nm-compat.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h
index 5355807b59..ab47308399 100644
--- a/shared/nm-utils/nm-vpn-editor-plugin-call.h
+++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c
index 393d5b1d1f..3fd0c05089 100644
--- a/shared/systemd/nm-sd-utils-shared.c
+++ b/shared/systemd/nm-sd-utils-shared.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* Copyright (C) 2018 Red Hat, Inc.
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/shared/systemd/nm-sd-utils-shared.h b/shared/systemd/nm-sd-utils-shared.h
index b08381b7cb..42ddc3e4f8 100644
--- a/shared/systemd/nm-sd-utils-shared.h
+++ b/shared/systemd/nm-sd-utils-shared.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* Copyright (C) 2018 Red Hat, Inc.
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
*/
#ifndef __NM_SD_UTILS_SHARED_H__
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
index e48c8a18fc..7648bd39ea 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 - 2018 Red Hat, Inc.
+/*
+ *Copyright (C) 2014 - 2018 Red Hat, Inc.
*/
#ifndef __NM_SD_ADAPT_SHARED_H__
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 8270d05809..8c90840d54 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2004 - 2016 Red Hat, Inc.
* Copyright 2005 - 2008 Novell, Inc.
*/
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index adb1201bf2..488fffb38a 100644
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2004 - 2016 Red Hat, Inc.
* Copyright 2005 - 2008 Novell, Inc.
*/
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index bc33557ba8..487011ff38 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2013 Red Hat, Inc.
*/
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index ce78847f91..7c2b3e205e 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Pantelis Koukousoulas <pktoss@gmail.com>
*/
diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h
index 82efccf5b8..84176faec7 100644
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/devices/adsl/nm-device-adsl.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Author: Pantelis Koukousoulas <pktoss@gmail.com>
* Copyright (C) 2009 - 2011 Red Hat Inc.
*/
diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h
index 0289da0fe1..ade4434b33 100644
--- a/src/devices/bluetooth/nm-bluez-common.h
+++ b/src/devices/bluetooth/nm-bluez-common.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 22b40c0f85..0b606f0fb3 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 - 2014 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c
index 3038e2635f..72582fae99 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/devices/bluetooth/nm-bluez5-dun.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/devices/bluetooth/nm-bluez5-dun.h
index 6142eac26c..b3f2296567 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.h
+++ b/src/devices/bluetooth/nm-bluez5-dun.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c
index fef027a316..8aa4283d16 100644
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/devices/bluetooth/nm-bt-error.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-bt-error.h b/src/devices/bluetooth/nm-bt-error.h
index 0c5ee2e9ae..258fca8d72 100644
--- a/src/devices/bluetooth/nm-bt-error.h
+++ b/src/devices/bluetooth/nm-bt-error.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index 61a7759e11..774862f9fb 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2011 Red Hat, Inc.
*/
diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/devices/bluetooth/nm-device-bt.h
index d889aefefb..ecb5781b88 100644
--- a/src/devices/bluetooth/nm-device-bt.h
+++ b/src/devices/bluetooth/nm-device-bt.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 Red Hat, Inc.
*/
diff --git a/src/devices/nm-acd-manager.c b/src/devices/nm-acd-manager.c
index 9d1342e2be..f96210e0bc 100644
--- a/src/devices/nm-acd-manager.c
+++ b/src/devices/nm-acd-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2015-2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-acd-manager.h b/src/devices/nm-acd-manager.h
index 18c1cdf0ff..f710e362d0 100644
--- a/src/devices/nm-acd-manager.h
+++ b/src/devices/nm-acd-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2015-2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-6lowpan.c b/src/devices/nm-device-6lowpan.c
index 9bab980c14..ffb1ea39ec 100644
--- a/src/devices/nm-device-6lowpan.c
+++ b/src/devices/nm-device-6lowpan.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-6lowpan.h b/src/devices/nm-device-6lowpan.h
index 1f3d27480c..69968e2504 100644
--- a/src/devices/nm-device-6lowpan.h
+++ b/src/devices/nm-device-6lowpan.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index db182b3e5a..fd1967ac3a 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2011 - 2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-bond.h b/src/devices/nm-device-bond.h
index e7ee465a18..24936013bd 100644
--- a/src/devices/nm-device-bond.h
+++ b/src/devices/nm-device-bond.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2012 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index aadaa7faee..4ad73e4df5 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2011 - 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h
index 1caf0f1f01..1a94c2ae2d 100644
--- a/src/devices/nm-device-bridge.h
+++ b/src/devices/nm-device-bridge.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2012 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-dummy.c b/src/devices/nm-device-dummy.c
index dc346e3ee7..1a060308f9 100644
--- a/src/devices/nm-device-dummy.c
+++ b/src/devices/nm-device-dummy.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-dummy.h b/src/devices/nm-device-dummy.h
index da5bff7c9c..eea54d17a0 100644
--- a/src/devices/nm-device-dummy.h
+++ b/src/devices/nm-device-dummy.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c
index fbc0802723..092f82cb5c 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2011 Red Hat, Inc.
+/*
+ * (C) Copyright 2011 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/devices/nm-device-ethernet-utils.h b/src/devices/nm-device-ethernet-utils.h
index 2ecdfc32f9..d4df367935 100644
--- a/src/devices/nm-device-ethernet-utils.h
+++ b/src/devices/nm-device-ethernet-utils.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2011 Red Hat, Inc.
+/*
+ * (C) Copyright 2011 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DEVICE_ETHERNET_UTILS_H__
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 0e3891a9d1..83f2f61cf4 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2014 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h
index 66778e9182..089622322f 100644
--- a/src/devices/nm-device-ethernet.h
+++ b/src/devices/nm-device-ethernet.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2010 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 6633c35fb0..232e69ef2c 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2014 - 2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h
index 11e83e9508..7a323d49b7 100644
--- a/src/devices/nm-device-factory.h
+++ b/src/devices/nm-device-factory.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2014 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index d35022c176..4dcddb6b56 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h
index 22671ea6ec..1eff0235dc 100644
--- a/src/devices/nm-device-generic.h
+++ b/src/devices/nm-device-generic.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index ca60649d74..8f28a41434 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2011 - 2018 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h
index 8b9458573c..351cf733c7 100644
--- a/src/devices/nm-device-infiniband.h
+++ b/src/devices/nm-device-infiniband.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2011 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
index 22bd1eeda5..c4c2fc6e71 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/devices/nm-device-ip-tunnel.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-ip-tunnel.h b/src/devices/nm-device-ip-tunnel.h
index bf502c91e4..4dd2d89567 100644
--- a/src/devices/nm-device-ip-tunnel.h
+++ b/src/devices/nm-device-ip-tunnel.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h
index f1436cf917..2c56e526b2 100644
--- a/src/devices/nm-device-logging.h
+++ b/src/devices/nm-device-logging.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c
index 98863ff78e..b68bae19c1 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/devices/nm-device-macsec.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-macsec.h b/src/devices/nm-device-macsec.h
index 65c7edd633..bdfcb66b40 100644
--- a/src/devices/nm-device-macsec.h
+++ b/src/devices/nm-device-macsec.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 699301e890..d192c75550 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 - 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h
index c0b13af1f2..2251895a99 100644
--- a/src/devices/nm-device-macvlan.h
+++ b/src/devices/nm-device-macvlan.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-ppp.c b/src/devices/nm-device-ppp.c
index 94add02e0e..32403ff608 100644
--- a/src/devices/nm-device-ppp.c
+++ b/src/devices/nm-device-ppp.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-ppp.h b/src/devices/nm-device-ppp.h
index cd0ad66b99..5a169b37ca 100644
--- a/src/devices/nm-device-ppp.h
+++ b/src/devices/nm-device-ppp.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index 67139dd441..4c38fa7a2a 100644
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2011 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c
index b01b6e50c1..97a5672912 100644
--- a/src/devices/nm-device-tun.c
+++ b/src/devices/nm-device-tun.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 - 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-tun.h b/src/devices/nm-device-tun.h
index 84cdbcfb93..319e2d5b65 100644
--- a/src/devices/nm-device-tun.h
+++ b/src/devices/nm-device-tun.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c
index 407db11d9d..fe2b99b165 100644
--- a/src/devices/nm-device-veth.c
+++ b/src/devices/nm-device-veth.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-veth.h b/src/devices/nm-device-veth.h
index 711a266077..0d07a12683 100644
--- a/src/devices/nm-device-veth.h
+++ b/src/devices/nm-device-veth.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index f2bc2d06e0..04f0856d0b 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2011 - 2012 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h
index 1e2e5d34bf..f421ab80e9 100644
--- a/src/devices/nm-device-vlan.h
+++ b/src/devices/nm-device-vlan.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2012 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c
index e32e9b51e9..e1ecc344c9 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/src/devices/nm-device-vxlan.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 - 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-vxlan.h b/src/devices/nm-device-vxlan.h
index 6ea41eac6c..9e20e1d495 100644
--- a/src/devices/nm-device-vxlan.h
+++ b/src/devices/nm-device-vxlan.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013, 2014 Red Hat, Inc.
*/
diff --git a/src/devices/nm-device-wpan.c b/src/devices/nm-device-wpan.c
index 0c4cd67a3b..a056248183 100644
--- a/src/devices/nm-device-wpan.c
+++ b/src/devices/nm-device-wpan.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Lubomir Rintel <lkundrak@v3.sk>
*/
diff --git a/src/devices/nm-device-wpan.h b/src/devices/nm-device-wpan.h
index 1ea9fc9c11..5a2defaaf4 100644
--- a/src/devices/nm-device-wpan.h
+++ b/src/devices/nm-device-wpan.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Lubomir Rintel <lkundrak@v3.sk>
*/
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 7b0c2bebb8..6b9ec3f9a1 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index eaeac620d2..260e676bc9 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index 3ab2054eb9..4c9e77056d 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/devices/nm-lldp-listener.h b/src/devices/nm-lldp-listener.h
index 5d4ad3a19c..92e1d00ffd 100644
--- a/src/devices/nm-lldp-listener.h
+++ b/src/devices/nm-lldp-listener.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-bridge.c b/src/devices/ovs/nm-device-ovs-bridge.c
index 0d89a72934..07adef0061 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.c
+++ b/src/devices/ovs/nm-device-ovs-bridge.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-bridge.h b/src/devices/ovs/nm-device-ovs-bridge.h
index 0d9f99c03c..9dfe22fef8 100644
--- a/src/devices/ovs/nm-device-ovs-bridge.h
+++ b/src/devices/ovs/nm-device-ovs-bridge.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-interface.c b/src/devices/ovs/nm-device-ovs-interface.c
index 1f5758bde2..11a45eb1f9 100644
--- a/src/devices/ovs/nm-device-ovs-interface.c
+++ b/src/devices/ovs/nm-device-ovs-interface.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-interface.h b/src/devices/ovs/nm-device-ovs-interface.h
index af854d0407..82bf4a936c 100644
--- a/src/devices/ovs/nm-device-ovs-interface.h
+++ b/src/devices/ovs/nm-device-ovs-interface.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-port.c b/src/devices/ovs/nm-device-ovs-port.c
index 576c05fcca..524fd3e125 100644
--- a/src/devices/ovs/nm-device-ovs-port.c
+++ b/src/devices/ovs/nm-device-ovs-port.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-device-ovs-port.h b/src/devices/ovs/nm-device-ovs-port.h
index 50cdf3fe6d..8f5a777636 100644
--- a/src/devices/ovs/nm-device-ovs-port.h
+++ b/src/devices/ovs/nm-device-ovs-port.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-ovs-factory.c b/src/devices/ovs/nm-ovs-factory.c
index 0280ec4220..d6dd13eb04 100644
--- a/src/devices/ovs/nm-ovs-factory.c
+++ b/src/devices/ovs/nm-ovs-factory.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index 535f308642..de75d2fb10 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/devices/ovs/nm-ovsdb.h b/src/devices/ovs/nm-ovsdb.h
index d02e8e233e..919d2d8c1e 100644
--- a/src/devices/ovs/nm-ovsdb.h
+++ b/src/devices/ovs/nm-ovsdb.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index cb8afeea53..fb9c9c6963 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h
index 525ee73bf8..71312c07a7 100644
--- a/src/devices/team/nm-device-team.h
+++ b/src/devices/team/nm-device-team.h
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
- *
*/
#ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index a297156439..3768217b46 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/devices/tests/test-acd.c b/src/devices/tests/test-acd.c
index 53630cecf6..da5e4f2d71 100644
--- a/src/devices/tests/test-acd.c
+++ b/src/devices/tests/test-acd.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index f94730e421..bd71c9e3d6 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 70af762823..8e3aafda12 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Intel Corporation
*/
diff --git a/src/devices/wifi/nm-device-iwd.h b/src/devices/wifi/nm-device-iwd.h
index 339718c8c6..586e02f4b3 100644
--- a/src/devices/wifi/nm-device-iwd.h
+++ b/src/devices/wifi/nm-device-iwd.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Intel Corporation
*/
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index e8436bf73d..515d93895b 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Dan Williams <dcbw@redhat.com>
* Sjoerd Simons <sjoerd.simons@collabora.co.uk>
* Daniel Drake <dsd@laptop.org>
- *
* (C) Copyright 2005 - 2014 Red Hat, Inc.
* (C) Copyright 2008 Collabora Ltd.
* (C) Copyright 2009 One Laptop per Child
diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/devices/wifi/nm-device-olpc-mesh.h
index 839c5d69e0..5db592692f 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.h
+++ b/src/devices/wifi/nm-device-olpc-mesh.h
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Dan Williams <dcbw@redhat.com>
* Sjoerd Simons <sjoerd.simons@collabora.co.uk>
* Daniel Drake <dsd@laptop.org>
- *
* (C) Copyright 2005 Red Hat, Inc.
* (C) Copyright 2008 Collabora Ltd.
* (C) Copyright 2009 One Laptop per Child
diff --git a/src/devices/wifi/nm-device-wifi-p2p.c b/src/devices/wifi/nm-device-wifi-p2p.c
index da3c76e4de..edcf012b18 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.c
+++ b/src/devices/wifi/nm-device-wifi-p2p.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Wi-Fi P2P Device
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/nm-device-wifi-p2p.h b/src/devices/wifi/nm-device-wifi-p2p.h
index d4d7225e20..669d7e9ea7 100644
--- a/src/devices/wifi/nm-device-wifi-p2p.h
+++ b/src/devices/wifi/nm-device-wifi-p2p.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Wi-Fi P2P Device
- *
+/*
* (C) Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 2dc1c6a5b0..283654cf12 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h
index 77e98c8c8c..aaf47143b8 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/devices/wifi/nm-device-wifi.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2016 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
index e8a6560ee1..dd1cad4806 100644
--- a/src/devices/wifi/nm-iwd-manager.c
+++ b/src/devices/wifi/nm-iwd-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Intel Corporation
*/
diff --git a/src/devices/wifi/nm-iwd-manager.h b/src/devices/wifi/nm-iwd-manager.h
index f6f6d45e4f..c50963fe10 100644
--- a/src/devices/wifi/nm-iwd-manager.h
+++ b/src/devices/wifi/nm-iwd-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Intel Corporation
*/
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index 0b839a794c..c7bfd2ed21 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/devices/wifi/nm-wifi-ap.h
index ee9e568cd4..096d1f5e4f 100644
--- a/src/devices/wifi/nm-wifi-ap.h
+++ b/src/devices/wifi/nm-wifi-ap.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c
index 7a3f458eec..821460a547 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/devices/wifi/nm-wifi-factory.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 - 2014 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/devices/wifi/nm-wifi-p2p-peer.c
index 95213e8705..f8da004669 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.c
+++ b/src/devices/wifi/nm-wifi-p2p-peer.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Wi-Fi P2P Peer
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.h b/src/devices/wifi/nm-wifi-p2p-peer.h
index a9d155fd75..07f25cc17b 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.h
+++ b/src/devices/wifi/nm-wifi-p2p-peer.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Wi-Fi P2P Peer
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/devices/wifi/tests/test-devices-wifi.c b/src/devices/wifi/tests/test-devices-wifi.c
index e53f475c40..a960e7a205 100644
--- a/src/devices/wifi/tests/test-devices-wifi.c
+++ b/src/devices/wifi/tests/test-devices-wifi.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2011 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index e81115ca3d..3e6ccc8f5d 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2019 Red Hat, Inc.
*/
diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index 95144728e2..842096e2c4 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Red Hat, Inc.
*/
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index 820c343a31..9910ffdb27 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
*/
diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/devices/wwan/nm-modem-broadband.h
index 9462b67f5b..43041e2b09 100644
--- a/src/devices/wwan/nm-modem-broadband.h
+++ b/src/devices/wwan/nm-modem-broadband.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2012 - Aleksander Morgado <aleksander@gnu.org>
*/
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
index 63470148d4..daccf68a97 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/devices/wwan/nm-modem-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2014 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc.
* Copyright (C) 2009 - 2013 Canonical Ltd.
diff --git a/src/devices/wwan/nm-modem-manager.h b/src/devices/wwan/nm-modem-manager.h
index 3dd3024e11..97a2126ab2 100644
--- a/src/devices/wwan/nm-modem-manager.h
+++ b/src/devices/wwan/nm-modem-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2014 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc.
* Copyright (C) 2009 Canonical Ltd.
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
index 68fc9a701f..b68cd7e849 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/devices/wwan/nm-modem-ofono.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 - 2016 Canonical Ltd.
*/
diff --git a/src/devices/wwan/nm-modem-ofono.h b/src/devices/wwan/nm-modem-ofono.h
index fde86d86ca..4ff2fbdde7 100644
--- a/src/devices/wwan/nm-modem-ofono.h
+++ b/src/devices/wwan/nm-modem-ofono.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 - Canonical Ltd.
*/
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index e6174ccc49..e49cffcfaf 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2014 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc.
*/
diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index 37f8b42fe9..c83ca538b9 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2011 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc.
*/
diff --git a/src/devices/wwan/nm-service-providers.c b/src/devices/wwan/nm-service-providers.c
index f363ebe506..5140f7edfe 100644
--- a/src/devices/wwan/nm-service-providers.c
+++ b/src/devices/wwan/nm-service-providers.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2009 Novell, Inc.
* Author: Tambet Ingo (tambet@gmail.com).
- *
* Copyright (C) 2009 - 2019 Red Hat, Inc.
* Copyright (C) 2012 Lanedo GmbH
*/
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c
index c81a8175bd..9a85f9368f 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/devices/wwan/nm-wwan-factory.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-client-logging.h b/src/dhcp/nm-dhcp-client-logging.h
index b9f80c49d1..4e69c69812 100644
--- a/src/dhcp/nm-dhcp-client-logging.h
+++ b/src/dhcp/nm-dhcp-client-logging.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 6eec21a9c2..2e05f05bf2 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2005 - 2010 Red Hat, Inc.
- *
+/*
+ * Copyright (C) 2005 - 2010 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index ea74c8b3e3..80d199068d 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2005 - 2010 Red Hat, Inc.
+/*
+ * Copyright (C) 2005 - 2010 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DHCP_CLIENT_H__
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index ae14692343..20fa7afef3 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2010 Red Hat, Inc.
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index ae27494c1e..a32c3ebf7f 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-dhcp-dhclient.c - dhclient specific hooks for NetworkManager
- *
+/*
* Copyright (C) 2005 - 2012 Red Hat, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c
index c87d7d82c9..f9cc0f0a37 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/dhcp/nm-dhcp-dhcpcanon.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-dhcp-dhcpcanon.c - dhcpcanon specific hooks for NetworkManager
- *
+/*
* Copyright (C) 2017 juga <juga at riseup dot net>
*/
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
index 221ccf826d..1690bce519 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/dhcp/nm-dhcp-dhcpcd.c
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-dhcp-dhcpcd.c - dhcpcd specific hooks for NetworkManager
- *
+/*
* Copyright (C) 2008 Roy Marples
* Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
- *
*/
#include "nm-default.h"
diff --git a/src/dhcp/nm-dhcp-helper-api.h b/src/dhcp/nm-dhcp-helper-api.h
index c6b03cd719..e4b64f2de2 100644
--- a/src/dhcp/nm-dhcp-helper-api.h
+++ b/src/dhcp/nm-dhcp-helper-api.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2016 Red Hat, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-helper.c b/src/dhcp/nm-dhcp-helper.c
index 0064c8d800..17f9db7f3b 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/dhcp/nm-dhcp-helper.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c
index 2618816f03..d687367611 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/dhcp/nm-dhcp-listener.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright 2014 - 2016 Red Hat, Inc.
- *
+/*
+ * Copyright 2014 - 2016 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/dhcp/nm-dhcp-listener.h b/src/dhcp/nm-dhcp-listener.h
index 4a473e3b99..bb853a19ce 100644
--- a/src/dhcp/nm-dhcp-listener.h
+++ b/src/dhcp/nm-dhcp-listener.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright 2014 Red Hat, Inc.
+/*
+ * Copyright 2014 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DHCP_LISTENER_H__
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index 055ae3f4b5..a27f5572bb 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-dhcp-manager.c - Handle the DHCP daemon for NetworkManager
- *
+/*
* Copyright (C) 2005 - 2013 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index 3b627e7793..8bc427875d 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-dhcp-manager.c - Handle the DHCP daemon for NetworkManager
- *
+/*
* Copyright (C) 2005 - 2010 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c
index f28cf00aef..c5da3e0227 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/dhcp/nm-dhcp-utils.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2005 - 2010 Red Hat, Inc.
- *
+/*
+ * Copyright (C) 2005 - 2010 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/dhcp/nm-dhcp-utils.h b/src/dhcp/nm-dhcp-utils.h
index 2572dd4fe3..e4c3331478 100644
--- a/src/dhcp/nm-dhcp-utils.h
+++ b/src/dhcp/nm-dhcp-utils.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DHCP_UTILS_H__
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index f4af36b899..8f45a36b28 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2010 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c
index 327907ebaf..d038906964 100644
--- a/src/dhcp/tests/test-dhcp-utils.c
+++ b/src/dhcp/tests/test-dhcp-utils.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2008 - 2014 Red Hat, Inc.
- *
+/*
+ * Copyright (C) 2008 - 2014 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index 4265a66660..a5028e426d 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
- *
*/
#include "nm-default.h"
diff --git a/src/dns/nm-dns-dnsmasq.h b/src/dns/nm-dns-dnsmasq.h
index e1b3372cdb..579e7686da 100644
--- a/src/dns/nm-dns-dnsmasq.h
+++ b/src/dns/nm-dns-dnsmasq.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2010 Red Hat, Inc.
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DNS_DNSMASQ_H__
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 3234c4e798..c7ca0b47f4 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
* Copyright (C) 2004 - 2017 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
- * and others
*/
#include "nm-default.h"
diff --git a/src/dns/nm-dns-manager.h b/src/dns/nm-dns-manager.h
index de0a2d7850..2a0c9deee3 100644
--- a/src/dns/nm-dns-manager.h
+++ b/src/dns/nm-dns-manager.h
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
* Copyright (C) 2004 - 2013 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
- * and others
*/
#ifndef __NETWORKMANAGER_DNS_MANAGER_H__
diff --git a/src/dns/nm-dns-plugin.c b/src/dns/nm-dns-plugin.c
index 6930b7a6cd..c8876f1e6e 100644
--- a/src/dns/nm-dns-plugin.c
+++ b/src/dns/nm-dns-plugin.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2010 - 2012 Red Hat, Inc.
- *
+/*
+ * Copyright (C) 2010 - 2012 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/dns/nm-dns-plugin.h b/src/dns/nm-dns-plugin.h
index e96d67f097..788237391f 100644
--- a/src/dns/nm-dns-plugin.h
+++ b/src/dns/nm-dns-plugin.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2010 Red Hat, Inc.
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
*/
#ifndef __NM_DNS_PLUGIN_H__
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c
index 04b8012997..4ab13a91ff 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/dns/nm-dns-systemd-resolved.c
@@ -2,7 +2,6 @@
/*
* Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
* Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
- *
*/
#include "nm-default.h"
diff --git a/src/dns/nm-dns-systemd-resolved.h b/src/dns/nm-dns-systemd-resolved.h
index d584b9aeff..31698519ca 100644
--- a/src/dns/nm-dns-systemd-resolved.h
+++ b/src/dns/nm-dns-systemd-resolved.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2010 Red Hat, Inc.
+/*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
*/
diff --git a/src/dns/nm-dns-unbound.c b/src/dns/nm-dns-unbound.c
index 3884ce9a51..ca681f3705 100644
--- a/src/dns/nm-dns-unbound.c
+++ b/src/dns/nm-dns-unbound.c
@@ -3,6 +3,7 @@
* Copyright (C) 2014 Red Hat, Inc.
* Author: Pavel Šimerda <psimerda@redhat.com>
*/
+
#include "nm-default.h"
#include "nm-dns-unbound.h"
diff --git a/src/dns/nm-dns-unbound.h b/src/dns/nm-dns-unbound.h
index 065784af15..51737b1610 100644
--- a/src/dns/nm-dns-unbound.h
+++ b/src/dns/nm-dns-unbound.h
@@ -1,6 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 Red Hat, Inc.
*/
+
#ifndef __NETWORKMANAGER_DNS_UNBOUND_H__
#define __NETWORKMANAGER_DNS_UNBOUND_H__
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
index 0a24beb7fb..735605eec0 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/dnsmasq/nm-dnsmasq-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
diff --git a/src/dnsmasq/nm-dnsmasq-manager.h b/src/dnsmasq/nm-dnsmasq-manager.h
index c8892cceb9..0a616b2a18 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.h
+++ b/src/dnsmasq/nm-dnsmasq-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c
index 9daf1f7346..01d59eccc7 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/dnsmasq/nm-dnsmasq-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/dnsmasq/nm-dnsmasq-utils.h
index bef893de35..a6a0342fa5 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.h
+++ b/src/dnsmasq/nm-dnsmasq-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/dnsmasq/tests/test-dnsmasq-utils.c
index e5e2edabdc..432a572724 100644
--- a/src/dnsmasq/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq/tests/test-dnsmasq-utils.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2013 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c
index fe2d8d0dc8..f3f53acfe0 100644
--- a/src/initrd/nm-initrd-generator.c
+++ b/src/initrd/nm-initrd-generator.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/nm-initrd-generator.h b/src/initrd/nm-initrd-generator.h
index d8d8962298..cba383d1e0 100644
--- a/src/initrd/nm-initrd-generator.h
+++ b/src/initrd/nm-initrd-generator.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright (C) 2014, 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 205f8d0d45..b607c6da62 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c
index 1a2e6589df..3af5faec6a 100644
--- a/src/initrd/nmi-dt-reader.c
+++ b/src/initrd/nmi-dt-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright 2019 Red Hat, Inc.
*/
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c
index a95107858a..a4d582b661 100644
--- a/src/initrd/nmi-ibft-reader.c
+++ b/src/initrd/nmi-ibft-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright 2014 - 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 5352f2cffe..4e2e07f4dd 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/tests/test-dt-reader.c b/src/initrd/tests/test-dt-reader.c
index 73ff79138d..5597ac4fbe 100644
--- a/src/initrd/tests/test-dt-reader.c
+++ b/src/initrd/tests/test-dt-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright 2014 - 2018 Red Hat, Inc.
*/
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/initrd/tests/test-ibft-reader.c
index 08ad018eb7..39bdc3264a 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/initrd/tests/test-ibft-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* NetworkManager initrd configuration generator
- *
+/*
* Copyright 2014 - 2018 Red Hat, Inc.
*/
diff --git a/src/main-utils.c b/src/main-utils.c
index 696f452ed1..8022249533 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2012 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
diff --git a/src/main-utils.h b/src/main-utils.h
index 2ffdd5572f..5824068600 100644
--- a/src/main-utils.h
+++ b/src/main-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/main.c b/src/main.c
index 41c1753b7e..24157b18c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2017 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
diff --git a/src/ndisc/nm-fake-ndisc.c b/src/ndisc/nm-fake-ndisc.c
index b2983c2e24..020764d3d9 100644
--- a/src/ndisc/nm-fake-ndisc.c
+++ b/src/ndisc/nm-fake-ndisc.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-fake-ndisc.c - Fake implementation of neighbor discovery
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-fake-ndisc.h b/src/ndisc/nm-fake-ndisc.h
index 2b123ad325..39b88184d7 100644
--- a/src/ndisc/nm-fake-ndisc.h
+++ b/src/ndisc/nm-fake-ndisc.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-fake-ndisc.h - Fake implementation of neighbor discovery
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index 082c2e1e35..8077099f6f 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-lndp-ndisc.c - Router discovery implementation using libndp
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-lndp-ndisc.h b/src/ndisc/nm-lndp-ndisc.h
index 9d13238522..22f21e41a4 100644
--- a/src/ndisc/nm-lndp-ndisc.h
+++ b/src/ndisc/nm-lndp-ndisc.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-lndp-ndisc.h - Implementation of neighbor discovery using libndp
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-ndisc-private.h b/src/ndisc/nm-ndisc-private.h
index 7c1569e8dc..f29cc0c9fa 100644
--- a/src/ndisc/nm-ndisc-private.h
+++ b/src/ndisc/nm-ndisc-private.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-ndisc.h - Perform IPv6 neighbor discovery
- *
+/*
* Copyright 2015 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 33312c4317..41201e24aa 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-ndisc.c - Perform IPv6 neighbor discovery
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/nm-ndisc.h b/src/ndisc/nm-ndisc.h
index ea73ebf0e5..92295ac638 100644
--- a/src/ndisc/nm-ndisc.h
+++ b/src/ndisc/nm-ndisc.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-ndisc.h - Perform IPv6 neighbor discovery
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index 8a91511eaa..8bdc053ded 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* ndisc.c - test program
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/ndisc/tests/test-ndisc-linux.c
index 92820a53df..e9ceaa2b21 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/ndisc/tests/test-ndisc-linux.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* ndisc.c - test program
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/nm-act-request.c b/src/nm-act-request.c
index 407ec4092b..ef36a40d45 100644
--- a/src/nm-act-request.c
+++ b/src/nm-act-request.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2012 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/nm-act-request.h b/src/nm-act-request.h
index d39d8e8891..ccd47a591b 100644
--- a/src/nm-act-request.h
+++ b/src/nm-act-request.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* (C) Copyright 2005 - 2012 Red Hat, Inc.
*/
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index 4d650901b7..2c1fceaf7a 100644
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2014 Red Hat, Inc.
*/
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index f7de661c05..bf38a1b0b3 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c
index 3db31bc4a3..7b5fa0124d 100644
--- a/src/nm-audit-manager.c
+++ b/src/nm-audit-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager audit support
- *
+/*
* Copyright 2015 Red Hat, Inc.
*/
diff --git a/src/nm-audit-manager.h b/src/nm-audit-manager.h
index c49807d29a..e6d0eb5351 100644
--- a/src/nm-audit-manager.h
+++ b/src/nm-audit-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager audit support
- *
+/*
* Copyright 2015 Red Hat, Inc.
*/
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index d9ff1d0c2b..244342c035 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h
index 207df935c1..083f98aaaa 100644
--- a/src/nm-auth-manager.h
+++ b/src/nm-auth-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 5dfb30bee6..ecf6b0138f 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 - 2014 Red Hat, Inc.
*/
diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h
index b039febf9b..7a75aca922 100644
--- a/src/nm-auth-subject.h
+++ b/src/nm-auth-subject.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 566d9126bc..a5b951ab78 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 Red Hat, Inc.
*/
diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h
index b9358e1856..808d20fdb6 100644
--- a/src/nm-auth-utils.h
+++ b/src/nm-auth-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 Red Hat, Inc.
*/
diff --git a/src/nm-checkpoint-manager.c b/src/nm-checkpoint-manager.c
index 474a54f239..ded623b3aa 100644
--- a/src/nm-checkpoint-manager.c
+++ b/src/nm-checkpoint-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/nm-checkpoint-manager.h b/src/nm-checkpoint-manager.h
index bafa03a039..c0549317fe 100644
--- a/src/nm-checkpoint-manager.h
+++ b/src/nm-checkpoint-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index a27110c9ff..734a40e1e2 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/nm-checkpoint.h b/src/nm-checkpoint.h
index 68897c49d5..6d27a43f44 100644
--- a/src/nm-checkpoint.h
+++ b/src/nm-checkpoint.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index b932d96145..0366a66c63 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
*/
diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index db294a21b3..a6f03902d5 100644
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/nm-config.c b/src/nm-config.c
index 0c82f2474e..9da2fe0a48 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
*/
diff --git a/src/nm-config.h b/src/nm-config.h
index 7cab4fc981..e3e658c702 100644
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Red Hat, Inc.
* Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
*/
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 475a4c893f..8cf9f0bc56 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de>
* Copyright (C) 2011 Dan Williams <dcbw@redhat.com>
* Copyright (C) 2016 - 2018 Red Hat, Inc.
diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index b86245bdf2..db113f743f 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de>
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 0d5f8f1c87..16b94074d6 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2004 - 2018 Red Hat, Inc.
* Copyright 2005 - 2008 Novell, Inc.
*/
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index 494cc5d0b3..1479354b1a 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2004 - 2016 Red Hat, Inc.
* Copyright 2005 - 2008 Novell, Inc.
*/
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index f5cbe066fe..3f6f8115e2 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2013 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-dbus-manager.h b/src/nm-dbus-manager.h
index fbe445ad7f..a609493891 100644
--- a/src/nm-dbus-manager.h
+++ b/src/nm-dbus-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2008 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-dbus-object.c b/src/nm-dbus-object.c
index cf704d837d..ed700c3abd 100644
--- a/src/nm-dbus-object.c
+++ b/src/nm-dbus-object.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-dbus-object.h b/src/nm-dbus-object.h
index ea66149df3..0738562937 100644
--- a/src/nm-dbus-object.h
+++ b/src/nm-dbus-object.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-dbus-utils.c b/src/nm-dbus-utils.c
index 53338a76f8..23d4efb37a 100644
--- a/src/nm-dbus-utils.c
+++ b/src/nm-dbus-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-dbus-utils.h b/src/nm-dbus-utils.h
index 468d00c090..126666dfeb 100644
--- a/src/nm-dbus-utils.h
+++ b/src/nm-dbus-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index 9c2dc56f31..d9ab2f57cb 100644
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/nm-dcb.h b/src/nm-dcb.h
index cfc21378a1..8c19d0ddca 100644
--- a/src/nm-dcb.h
+++ b/src/nm-dcb.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index 5aabe867e1..cdbe207111 100644
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h
index 1cb851ea3a..3cad1e82f5 100644
--- a/src/nm-dhcp4-config.h
+++ b/src/nm-dhcp4-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index da303b3476..676caa6dfc 100644
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/nm-dhcp6-config.h b/src/nm-dhcp6-config.h
index 5a95a9d59f..e5697e0469 100644
--- a/src/nm-dhcp6-config.h
+++ b/src/nm-dhcp6-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 063863db41..54b0567bc3 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2018 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
index 9805328b06..93272dc4c2 100644
--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2012 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index fce7b1871a..cf6494bdb5 100644
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 - 2015 Red Hat, Inc.
*/
diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index 0332dd8057..689e6b0695 100644
--- a/src/nm-firewall-manager.h
+++ b/src/nm-firewall-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Red Hat, Inc.
*/
diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c
index fbf06fc623..352047e9c0 100644
--- a/src/nm-hostname-manager.c
+++ b/src/nm-hostname-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* (C) Copyright 2017 Red Hat, Inc.
*/
diff --git a/src/nm-hostname-manager.h b/src/nm-hostname-manager.h
index a49ac0c9d9..dc4f4b248c 100644
--- a/src/nm-hostname-manager.h
+++ b/src/nm-hostname-manager.h
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Søren Sandmann <sandmann@daimi.au.dk>
* Dan Williams <dcbw@redhat.com>
* Tambet Ingo <tambet@gmail.com>
- *
* (C) Copyright 2007 - 2011, 2017 Red Hat, Inc.
* (C) Copyright 2008 Novell, Inc.
*/
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 1fa474b440..86c97c6593 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2014 Red Hat, Inc.
*/
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index f41c174f3c..6c79c97d1b 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2005 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index ca2bd73cca..93e04acccc 100644
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2008–2013 Red Hat, Inc.
*/
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 7b556c2dd2..e109e42acf 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index db8704b7f1..d3f8ad7e63 100644
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2008–2013 Red Hat, Inc.
*/
diff --git a/src/nm-keep-alive.c b/src/nm-keep-alive.c
index 090faf399b..45f7534d8d 100644
--- a/src/nm-keep-alive.c
+++ b/src/nm-keep-alive.c
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
- * NetworkManager -- Inhibition management
- *
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-keep-alive.h b/src/nm-keep-alive.h
index 27fd86b379..b52dfafb1a 100644
--- a/src/nm-keep-alive.h
+++ b/src/nm-keep-alive.h
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: LGPL-2.1+
/*
- * NetworkManager -- Inhibition management
- *
* Copyright 2018 Red Hat, Inc.
*/
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 041e855090..add57e4726 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-logging.h b/src/nm-logging.h
index 9d1d1836f5..743ed19b6a 100644
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/nm-manager.c b/src/nm-manager.c
index b21d39a015..e9fd134e2c 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2009 Novell, Inc.
* Copyright (C) 2007 - 2017 Red Hat, Inc.
*/
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 187ce72863..1c71736bcd 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2010 Red Hat, Inc.
*/
diff --git a/src/nm-netns.c b/src/nm-netns.c
index 9c103a29e1..3652384ad9 100644
--- a/src/nm-netns.c
+++ b/src/nm-netns.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/nm-netns.h b/src/nm-netns.h
index f93e12ae93..c65dd9076c 100644
--- a/src/nm-netns.h
+++ b/src/nm-netns.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/nm-pacrunner-manager.c b/src/nm-pacrunner-manager.c
index adc1fd37b1..8f71696639 100644
--- a/src/nm-pacrunner-manager.c
+++ b/src/nm-pacrunner-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* (C) Copyright 2016 Atul Anand <atulhjp@gmail.com>.
*/
diff --git a/src/nm-pacrunner-manager.h b/src/nm-pacrunner-manager.h
index 5de85c5972..e0ec63a44f 100644
--- a/src/nm-pacrunner-manager.h
+++ b/src/nm-pacrunner-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright 2016 Atul Anand <atulhjp@gmail.com>.
* Copyright 2016 - 2017 Red Hat, Inc.
*/
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 03c1a4bc55..d322b2efea 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2013 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/nm-policy.h b/src/nm-policy.h
index a00c5c3559..23c50cff36 100644
--- a/src/nm-policy.h
+++ b/src/nm-policy.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2004 - 2010 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/nm-proxy-config.c b/src/nm-proxy-config.c
index 3bbcd1210f..775104d579 100644
--- a/src/nm-proxy-config.c
+++ b/src/nm-proxy-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* (C) Copyright 2016 Atul Anand <atulhjp@gmail.com>.
*/
diff --git a/src/nm-proxy-config.h b/src/nm-proxy-config.h
index 56208c0853..b001ae06e5 100644
--- a/src/nm-proxy-config.h
+++ b/src/nm-proxy-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* (C) Copyright 2016 Atul Anand <atulhjp@gmail.com>.
*/
diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index 2d450dd960..28666fa030 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2009 - 2013 Red Hat, Inc.
*/
diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h
index 45dbce0b3d..4a3242e460 100644
--- a/src/nm-rfkill-manager.h
+++ b/src/nm-rfkill-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index e36f5bba6c..5bd63f0708 100644
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2008 - 2015 Red Hat, Inc.
+/*
+ * (C) Copyright 2008 - 2015 Red Hat, Inc.
* Author: David Zeuthen <davidz@redhat.com>
* Author: Dan Williams <dcbw@redhat.com>
* Author: Matthias Clasen
diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h
index f5d30bc568..f4e5731310 100644
--- a/src/nm-session-monitor.h
+++ b/src/nm-session-monitor.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2008 - 2010 Red Hat, Inc.
+/*
+ * (C) Copyright 2008 - 2010 Red Hat, Inc.
* Author: David Zeuthen <davidz@redhat.com>
* Author: Dan Williams <dcbw@redhat.com>
*/
diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
index 38455b3b21..f8562ff2b2 100644
--- a/src/nm-sleep-monitor.c
+++ b/src/nm-sleep-monitor.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2012-2016 Red Hat, Inc.
+/*
+ * (C) Copyright 2012-2016 Red Hat, Inc.
* Author: Matthias Clasen <mclasen@redhat.com>
*/
diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
index a3c40efe8c..705f0ca2b4 100644
--- a/src/nm-sleep-monitor.h
+++ b/src/nm-sleep-monitor.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* (C) Copyright 2012-2016 Red Hat, Inc.
+/*
+ * (C) Copyright 2012-2016 Red Hat, Inc.
* Author: Matthias Clasen <mclasen@redhat.com>
*/
diff --git a/src/nm-types.h b/src/nm-types.h
index d8d1b4bef0..28e2cc9dcf 100644
--- a/src/nm-types.h
+++ b/src/nm-types.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2012 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index f0de508874..c003d75020 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform-fake.c - Fake platform interaction code for testing NetworkManager
- *
+/*
* Copyright (C) 2012–2017 Red Hat, Inc.
*/
diff --git a/src/platform/nm-fake-platform.h b/src/platform/nm-fake-platform.h
index 7afee02d80..72245e674f 100644
--- a/src/platform/nm-fake-platform.h
+++ b/src/platform/nm-fake-platform.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-fake-platform.h - Fake platform interaction code for testing NetworkManager
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*/
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index d567aa4163..305ae52e3a 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-linux-platform.c - Linux kernel & udev network configuration layer
- *
+/*
* Copyright (C) 2012 - 2018 Red Hat, Inc.
*/
+
#include "nm-default.h"
#include "nm-linux-platform.h"
diff --git a/src/platform/nm-linux-platform.h b/src/platform/nm-linux-platform.h
index 367786dae1..90b9a17a31 100644
--- a/src/platform/nm-linux-platform.h
+++ b/src/platform/nm-linux-platform.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-linux-platform.h - Linux kernel & udev network configuration layer
- *
+/*
* Copyright (C) 2012 Red Hat, Inc.
*/
diff --git a/src/platform/nm-netlink.c b/src/platform/nm-netlink.c
index a2d85dac45..d133d35166 100644
--- a/src/platform/nm-netlink.c
+++ b/src/platform/nm-netlink.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nm-netlink.h b/src/platform/nm-netlink.h
index 859c127e59..0ac5b3b7c0 100644
--- a/src/platform/nm-netlink.h
+++ b/src/platform/nm-netlink.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nm-platform-private.h b/src/platform/nm-platform-private.h
index db5726e6a0..a072af0564 100644
--- a/src/platform/nm-platform-private.h
+++ b/src/platform/nm-platform-private.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2017 Red Hat, Inc.
*/
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index a9cda3e11a..4f0da581d0 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/platform/nm-platform-utils.h b/src/platform/nm-platform-utils.h
index c9e82e3b68..a62d828c89 100644
--- a/src/platform/nm-platform-utils.h
+++ b/src/platform/nm-platform-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 597e3e1d85..4ec161adc3 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2012 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 50e82ed9bb..bdbb256d9f 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2009 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
index 730580aa01..78f76cc7bd 100644
--- a/src/platform/nmp-netns.c
+++ b/src/platform/nmp-netns.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/platform/nmp-netns.h b/src/platform/nmp-netns.h
index 028e649daa..a74e231916 100644
--- a/src/platform/nmp-netns.h
+++ b/src/platform/nmp-netns.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index fbb76cb3e7..97aa4f28f5 100644
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nmp-object.h b/src/platform/nmp-object.h
index 92f7076d18..d52cc132d2 100644
--- a/src/platform/nmp-object.h
+++ b/src/platform/nmp-object.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/nmp-rules-manager.c b/src/platform/nmp-rules-manager.c
index 43b0288168..a1d724c593 100644
--- a/src/platform/nmp-rules-manager.c
+++ b/src/platform/nmp-rules-manager.c
@@ -1,6 +1,4 @@
// SPDX-License-Identifier: LGPL-2.1+
-/*
- */
#include "nm-default.h"
diff --git a/src/platform/nmp-rules-manager.h b/src/platform/nmp-rules-manager.h
index 92228a5a15..cf29ff450a 100644
--- a/src/platform/nmp-rules-manager.h
+++ b/src/platform/nmp-rules-manager.h
@@ -1,6 +1,4 @@
// SPDX-License-Identifier: LGPL-2.1+
-/*
- */
#ifndef __NMP_RULES_MANAGER_H__
#define __NMP_RULES_MANAGER_H__
diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
index 0fab826761..8ecfac8ab6 100644
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/platform/tests/test-nmp-object.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 - 2017 Red Hat, Inc.
*/
diff --git a/src/platform/tests/test-platform-general.c b/src/platform/tests/test-platform-general.c
index f74fd2641f..255210f220 100644
--- a/src/platform/tests/test-platform-general.c
+++ b/src/platform/tests/test-platform-general.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* nm-platform.c - Handle runtime kernel networking configuration
- *
+/*
* Copyright (C) 2015 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
index 07a13cf818..afeb3b02cd 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
* Copyright (C) 2011 Intel Corporation. All rights reserved.
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.h b/src/platform/wifi/nm-wifi-utils-nl80211.h
index 737efacdd2..45876534bd 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.h
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 Intel Corporation. All rights reserved.
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils-private.h b/src/platform/wifi/nm-wifi-utils-private.h
index c3613483f5..538167446a 100644
--- a/src/platform/wifi/nm-wifi-utils-private.h
+++ b/src/platform/wifi/nm-wifi-utils-private.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/platform/wifi/nm-wifi-utils-wext.c
index d55a9c7b18..68924a35ee 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/platform/wifi/nm-wifi-utils-wext.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils-wext.h b/src/platform/wifi/nm-wifi-utils-wext.h
index 7f5a95df11..ce76f68d35 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.h
+++ b/src/platform/wifi/nm-wifi-utils-wext.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2011 - 2018 Red Hat, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c
index bedf29a69a..39ce9b0970 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/platform/wifi/nm-wifi-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h
index 3ef5a3b9ef..bc0d88c844 100644
--- a/src/platform/wifi/nm-wifi-utils.h
+++ b/src/platform/wifi/nm-wifi-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2018 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c
index d526921fc3..231e6e2c07 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/platform/wpan/nm-wpan-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h
index 7b130819af..deafeb9748 100644
--- a/src/platform/wpan/nm-wpan-utils.h
+++ b/src/platform/wpan/nm-wpan-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-manager-call.c b/src/ppp/nm-ppp-manager-call.c
index 85833c0a1e..11520ec9c9 100644
--- a/src/ppp/nm-ppp-manager-call.c
+++ b/src/ppp/nm-ppp-manager-call.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-manager-call.h b/src/ppp/nm-ppp-manager-call.h
index 5b8c814d47..96fb6483f7 100644
--- a/src/ppp/nm-ppp-manager-call.h
+++ b/src/ppp/nm-ppp-manager-call.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index c294942286..f649e0cbb2 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-manager.h b/src/ppp/nm-ppp-manager.h
index 6cb397c2e3..8657367fa5 100644
--- a/src/ppp/nm-ppp-manager.h
+++ b/src/ppp/nm-ppp-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2016 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-plugin-api.h b/src/ppp/nm-ppp-plugin-api.h
index 00a98e2c0c..f2d4f7bebb 100644
--- a/src/ppp/nm-ppp-plugin-api.h
+++ b/src/ppp/nm-ppp-plugin-api.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-ppp-status.h b/src/ppp/nm-ppp-status.h
index 26db9e62e9..0483449c02 100644
--- a/src/ppp/nm-ppp-status.h
+++ b/src/ppp/nm-ppp-status.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008-2016 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c
index 1f5f3f586a..db9a2b67ac 100644
--- a/src/ppp/nm-pppd-plugin.c
+++ b/src/ppp/nm-pppd-plugin.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/ppp/nm-pppd-plugin.h b/src/ppp/nm-pppd-plugin.h
index a85c2181e6..e69bc2aeec 100644
--- a/src/ppp/nm-pppd-plugin.h
+++ b/src/ppp/nm-pppd-plugin.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2014 Red Hat, Inc.
*/
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index ea5c586ae1..ecca0eb3ac 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 - 2013 Red Hat, Inc.
*/
diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h
index 1113e3cef9..5200d241ca 100644
--- a/src/settings/nm-agent-manager.h
+++ b/src/settings/nm-agent-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 88e6a77b6e..74bd9b2f59 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h
index b96e89f585..ea86e432ad 100644
--- a/src/settings/nm-secret-agent.h
+++ b/src/settings/nm-secret-agent.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2010 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index 839c5a6ec7..8b2c856772 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Copyright 2008 Novell, Inc.
* Copyright 2008 - 2014 Red Hat, Inc.
*/
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index ac9d8320b9..1f955f00db 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2008 Novell, Inc.
* (C) Copyright 2008 - 2013 Red Hat, Inc.
*/
diff --git a/src/settings/nm-settings-plugin.c b/src/settings/nm-settings-plugin.c
index e6af7d849d..630532efe4 100644
--- a/src/settings/nm-settings-plugin.c
+++ b/src/settings/nm-settings-plugin.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Copyright (C) 2007 - 2018 Red Hat, Inc.
* Copyright (C) 2008 Novell, Inc.
*/
diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h
index df07e5d67b..d27429db20 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/settings/nm-settings-plugin.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Copyright (C) 2007 - 2018 Red Hat, Inc.
* Copyright (C) 2008 Novell, Inc.
*/
diff --git a/src/settings/nm-settings-utils.c b/src/settings/nm-settings-utils.c
index d1e6830da0..c5ec6c3162 100644
--- a/src/settings/nm-settings-utils.c
+++ b/src/settings/nm-settings-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2019 Red Hat, Inc.
*/
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 453d3116b9..8cf710d4a0 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Søren Sandmann <sandmann@daimi.au.dk>
* Dan Williams <dcbw@redhat.com>
* Tambet Ingo <tambet@gmail.com>
- *
* (C) Copyright 2007 - 2011 Red Hat, Inc.
* (C) Copyright 2008 Novell, Inc.
*/
diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
index 3378f0d630..e8b3642513 100644
--- a/src/settings/nm-settings.h
+++ b/src/settings/nm-settings.h
@@ -1,10 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Søren Sandmann <sandmann@daimi.au.dk>
* Dan Williams <dcbw@redhat.com>
* Tambet Ingo <tambet@gmail.com>
- *
* (C) Copyright 2007 - 2011 Red Hat, Inc.
* (C) Copyright 2008 Novell, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
index 2949c0b9f7..1b2290af1b 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2008 - 2013 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index f438755d98..f57ca1a7b2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Dan Williams <dcbw@redhat.com>
* Søren Sandmann <sandmann@daimi.au.dk>
- *
* Copyright (C) 2007 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
index a226b32304..14cadac6be 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
@@ -1,9 +1,7 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Dan Williams <dcbw@redhat.com>
* Søren Sandmann <sandmann@daimi.au.dk>
- *
* Copyright (C) 2007 - 2008 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index f348ca473a..7d82a96489 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Copyright 2008 - 2017 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
index 72e6b5144d..9319a0647f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
index 7fa8132469..79101296b1 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
index 160293b774..1b2b58e63d 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2019 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index f5dfdc7507..af875e6173 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2008 - 2017 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
index e0308178cf..fcc338c86f 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2008 - 2017 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index dea5efec3a..1ee89dba31 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright 2009 - 2015 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
index fec844748b..c4903a46e4 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2009 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index a838365df3..039772b9b7 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -1,12 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * shvar.c
- *
- * Implementation of non-destructively reading/writing files containing
- * only shell variable declarations and full-line comments.
- *
* Copyright 1999,2000 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
index 3a23c5308a..9a84617ddb 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.h
+++ b/src/settings/plugins/ifcfg-rh/shvar.h
@@ -1,19 +1,8 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * shvar.h
- *
- * Interface for non-destructively reading/writing files containing
- * only shell variable declarations and full-line comments.
- *
- * Includes explicit inheritance mechanism intended for use with
- * Red Hat Linux ifcfg-* files. There is no protection against
- * inheritance loops; they will generally cause stack overflows.
- * Furthermore, they are only intended for one level of inheritance;
- * the value setting algorithm assumes this.
- *
* Copyright 1999 Red Hat, Inc.
- *
*/
+
#ifndef _SHVAR_H
#define _SHVAR_H
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 3cd571dfcf..a52fa1cad0 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index d61bb3862b..640bb439f1 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Tom Parker <palfrey@tevp.net>
- *
* (C) Copyright 2004 Tom Parker
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
index 53b2cea130..b69918e48a 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Tom Parker <palfrey@tevp.net>
- *
* (C) Copyright 2004 Tom Parker
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 118574dd8b..14298faeba 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service (ifupdown)
- *
+/*
* Alexander Sack <asac@ubuntu.com>
- *
* (C) Copyright 2008 Canonical Ltd.
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
index e632811001..1424b01e92 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service (ifupdown)
- *
+/*
* Alexander Sack <asac@ubuntu.com>
- *
* (C) Copyright 2008 Canonical Ltd.
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index 1690d01643..f8e532cca8 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service (ifupdown)
- *
+/*
* Alexander Sack <asac@ubuntu.com>
- *
* (C) Copyright 2007,2008 Canonical Ltd.
* (C) Copyright 2009 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
index 1ba4f98257..dd2c7e22f4 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
@@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service (ifupdown)
- *
+/*
* Alexander Sack <asac@ubuntu.com>
- *
* (C) Copyright 2008 Canonical Ltd.
*/
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 6eafb81777..6a7b5ecc76 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2010 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index 39da274e1b..7129d6f316 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.h b/src/settings/plugins/keyfile/nms-keyfile-plugin.h
index 6697e14fa6..e885f16c9a 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/settings/plugins/keyfile/nms-keyfile-reader.c
index f5a1a18323..af9e67265b 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2015 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.h b/src/settings/plugins/keyfile/nms-keyfile-reader.h
index 1af3add8c0..307d6ffe77 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.c b/src/settings/plugins/keyfile/nms-keyfile-storage.c
index ee7298cfef..bcc06795a1 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-storage.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-storage.h b/src/settings/plugins/keyfile/nms-keyfile-storage.h
index a57aaac577..00a034d462 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-storage.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-storage.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
index 31980c165d..3ba8c3d392 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
index d3c11fd1a2..a430cfdbdd 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service
- *
+/*
* (C) Copyright 2010 - 2018 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
index 51dfb15eeb..fa95198c00 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2015 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.h b/src/settings/plugins/keyfile/nms-keyfile-writer.h
index 9a3b828c06..98ec8a6b4c 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
index cc82e25105..d2da09da71 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager system settings service - keyfile plugin
- *
+/*
* Copyright (C) 2008 - 2017 Red Hat, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c
index c1436be642..3faeec5ac5 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/supplicant/nm-supplicant-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-config.h b/src/supplicant/nm-supplicant-config.h
index 6985d9c27f..361f9ac62e 100644
--- a/src/supplicant/nm-supplicant-config.h
+++ b/src/supplicant/nm-supplicant-config.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index fc4b87b6d0..e473fb047b 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2017 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-interface.h b/src/supplicant/nm-supplicant-interface.h
index 479c57cbd0..a723fadb9f 100644
--- a/src/supplicant/nm-supplicant-interface.h
+++ b/src/supplicant/nm-supplicant-interface.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2017 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c
index b33ca6f8ee..49581f6e7e 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/supplicant/nm-supplicant-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2010 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-manager.h b/src/supplicant/nm-supplicant-manager.h
index 13bd22ca13..18ca53b6f1 100644
--- a/src/supplicant/nm-supplicant-manager.h
+++ b/src/supplicant/nm-supplicant-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2008 Red Hat, Inc.
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c
index 6987dd0306..bea17ede24 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/supplicant/nm-supplicant-settings-verify.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2012 Red Hat, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-settings-verify.h b/src/supplicant/nm-supplicant-settings-verify.h
index 767b8a53d8..fe1480ccde 100644
--- a/src/supplicant/nm-supplicant-settings-verify.h
+++ b/src/supplicant/nm-supplicant-settings-verify.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2008 Red Hat, Inc.
*/
diff --git a/src/supplicant/nm-supplicant-types.h b/src/supplicant/nm-supplicant-types.h
index bebb8832e2..2b3563548b 100644
--- a/src/supplicant/nm-supplicant-types.h
+++ b/src/supplicant/nm-supplicant-types.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2006 - 2008 Red Hat, Inc.
*/
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c
index c74f3f9b2b..32398e1bb4 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/supplicant/tests/test-supplicant-config.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager
- *
+/*
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
diff --git a/src/systemd/nm-sd-utils-core.c b/src/systemd/nm-sd-utils-core.c
index 3e5bf58c78..4057c70a90 100644
--- a/src/systemd/nm-sd-utils-core.c
+++ b/src/systemd/nm-sd-utils-core.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* Copyright (C) 2018 Red Hat, Inc.
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/systemd/nm-sd-utils-core.h b/src/systemd/nm-sd-utils-core.h
index a25e2ddc81..3b0bc23bc7 100644
--- a/src/systemd/nm-sd-utils-core.h
+++ b/src/systemd/nm-sd-utils-core.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* Copyright (C) 2018 Red Hat, Inc.
+/*
+ * Copyright (C) 2018 Red Hat, Inc.
*/
#ifndef __NM_SD_UTILS_CORE_H__
diff --git a/src/systemd/nm-sd.c b/src/systemd/nm-sd.c
index 4e9ab5e845..4cbee99fa7 100644
--- a/src/systemd/nm-sd.c
+++ b/src/systemd/nm-sd.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 - 2016 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 - 2016 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/systemd/nm-sd.h b/src/systemd/nm-sd.h
index 630d0ddedd..99904243f8 100644
--- a/src/systemd/nm-sd.h
+++ b/src/systemd/nm-sd.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 - 2016 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 - 2016 Red Hat, Inc.
*/
#ifndef __NM_SD_H__
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/systemd/sd-adapt-core/nm-sd-adapt-core.c
index 1b57c73cde..a9f8bd1c81 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.c
+++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (C) 2014 - 2016 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 - 2016 Red Hat, Inc.
*/
#include "nm-default.h"
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
index 06eee1233e..81bc73202d 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: LGPL-2.1+
-/* Copyright (C) 2014 - 2018 Red Hat, Inc.
+/*
+ * Copyright (C) 2014 - 2018 Red Hat, Inc.
*/
#ifndef __NM_SD_ADAPT_CORE_H__
diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c
index 3f5f1acc03..a0e11894c1 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/tests/config/nm-test-device.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h
index 8989df0a60..b921a2c607 100644
--- a/src/tests/config/nm-test-device.h
+++ b/src/tests/config/nm-test-device.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright 2013 Red Hat, Inc.
*/
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index 348397ccdf..40c4084ca3 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2013 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-core-with-expect.c b/src/tests/test-core-with-expect.c
index 0e10eb4b1a..41f1c13c40 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/tests/test-core-with-expect.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-core.c b/src/tests/test-core.c
index 630c7e6e6f..5b699afb44 100644
--- a/src/tests/test-core.c
+++ b/src/tests/test-core.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2014 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index 7c36648481..82d19cee7e 100644
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2013 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 7095152534..cd7dc8d8f4 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2013 - 2014 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index 676de300c0..401d1eee06 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2013 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c
index b98d2014b7..0c94e2d071 100644
--- a/src/tests/test-utils.c
+++ b/src/tests/test-utils.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c
index ae10c91020..4b557d0c67 100644
--- a/src/tests/test-wired-defname.c
+++ b/src/tests/test-wired-defname.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2010 Red Hat, Inc.
- *
*/
#include "nm-default.h"
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index 10bc6fdd6e..6a25dddaf0 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2013 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/vpn/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h
index e8a9675873..43242a8e86 100644
--- a/src/vpn/nm-vpn-connection.h
+++ b/src/vpn/nm-vpn-connection.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2011 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c
index a3bf04c1c9..4c94a26057 100644
--- a/src/vpn/nm-vpn-manager.c
+++ b/src/vpn/nm-vpn-manager.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/src/vpn/nm-vpn-manager.h b/src/vpn/nm-vpn-manager.h
index 612026267e..6a78acd2a0 100644
--- a/src/vpn/nm-vpn-manager.h
+++ b/src/vpn/nm-vpn-manager.h
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
-/* NetworkManager -- Network link manager
- *
+/*
* Copyright (C) 2005 - 2011 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
diff --git a/tools/enums-to-docbook.pl b/tools/enums-to-docbook.pl
index f22d230a34..247de4771b 100755
--- a/tools/enums-to-docbook.pl
+++ b/tools/enums-to-docbook.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -n
# SPDX-License-Identifier: GPL-2.0+
-
+#
# Copyright 2016 Red Hat, Inc.
#