17 files changed, 24 insertions, 31 deletions
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"