Merge remote-tracking branch 'origin/master' into edge

jonasbardino · jonasbardino · commit 5e106441cae9 · 2024-07-16T09:09:20.000+02:00
diff --git a/mig/server/migrateusers.py b/mig/server/migrateusers.py
@@ -5,7 +5,7 @@
 #
 #
 # migrateusers - a simple helper to migrate old CN to new DN user IDs
-# Copyright (C) 2003-2022  The MiG Project lead by Brian Vinter
+# Copyright (C) 2003-2024  The MiG Project lead by Brian Vinter
 #
 # This file is part of MiG.
 #
@@ -43,7 +43,7 @@ def usage(name='migrateusers.py'):
     """Usage help"""
 
     print("""Update MiG user database and user dirs from old format with CN
-as user idetifier to new format with DN as user identifier.
+as user identifier to new format with DN as user identifier.
 
 Usage:
 %(name)s [OPTIONS]

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`#`
`7`	`7`	`# migrateusers - a simple helper to migrate old CN to new DN user IDs`
`8`		`-# Copyright (C) 2003-2022 The MiG Project lead by Brian Vinter`
	`8`	`+# Copyright (C) 2003-2024 The MiG Project lead by Brian Vinter`
`9`	`9`	`#`
`10`	`10`	`# This file is part of MiG.`
`11`	`11`	`#`
`@@ -43,7 +43,7 @@ def usage(name='migrateusers.py'):`
`43`	`43`	`"""Usage help"""`
`44`	`44`
`45`	`45`	`print("""Update MiG user database and user dirs from old format with CN`
`46`		`-as user idetifier to new format with DN as user identifier.`
	`46`	`+as user identifier to new format with DN as user identifier.`
`47`	`47`
`48`	`48`	`Usage:`
`49`	`49`	`%(name)s [OPTIONS]`