/*
* $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
* 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
* $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>.
*
*/
close(fd);
#ifndef SILENT
- eputs("marging contest of `");
+ eputs("merging content of `");
eputs(old_name);
eputs("' with `");
eputs(new_name);