X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=b86137f9a9e0c32139b50a7fd05b8d7048381f86;hb=e5de57de1b8bf1df96c152fc92f5a49f75d6d96c;hp=6529073fd4cec30e446ff70d6bc5eb593cf3ec0a;hpb=e0df7b89fb8a7e7b7164d036e437c9862d23989a;p=paraslash.git

diff --git a/server.c b/server.c
index 6529073f..b86137f9 100644
--- a/server.c
+++ b/server.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file server.c Paraslash's main server. */
 
@@ -211,7 +207,7 @@ void parse_config_or_die(bool reload)
 	if (reload) /* config file overrides command line */
 		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
-	else /* command line options overrride config file options */
+	else /* command line options override config file options */
 		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
 			&errctx));
 	lls_free_parse_result(cf_lpr, CMD_PTR);