- ChangeLog update by changelog.sh

[projects/setup.git] / joinpasswd.c

diff --git a/joinpasswd.c b/joinpasswd.c
index f84ab975649de4c6b88284734121e4670c414aa7..75fb9ebcd7bede96398b32378beefb61a1c5e5c1 100644 (file)
--- a/joinpasswd.c
+++ b/joinpasswd.c
@@ -1,7 +1,7 @@
 /*
  * $Id$
  * 
- * Copyright (c) 2001 Michal Moskal <malekith@pld.org.pl>.
+ * Copyright (c) 2001 Michal Moskal <malekith@pld-linux.org>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
  * 20000 users in system database on Pentium class machine. After static link
  * against uClibc it is under 2k on x86. Stdio hasn't been used intentionally.
  * 
- * Written for PLD Linux (http://www.pld.org.pl) setup package.
+ * Written for PLD Linux (http://www.pld-linux.org/) setup package.
  *
  * Compilation against uClibc:
  * UCROOT=/usr/lib/bootdisk/usr
@@ -53,7 +53,7 @@
  *             $UCROOT/lib/libc.a -lgcc -o joinpasswd
  * strip -R .comment -R .note joinpasswd
  *
- * The idea of this program comes from Lukasz Dobrek <dobrek@pld.org.pl>.
+ * The idea of this program comes from Lukasz Dobrek <dobrek@pld-linux.org>.
  * 
  */
 
@@ -274,7 +274,7 @@ int join(const char *old_name, const char *new_name, const char *backup_name)
        close(fd);
        
 #ifndef SILENT
-       eputs("marging contest of `");
+       eputs("merging content of `");
        eputs(old_name);
        eputs("' with `");
        eputs(new_name);