Improve license owner phrasing and in-file copyright notices

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index f35da242663caa4e1b48557614c0dc6ab680b9c3..6f7cb25ab9aef8078561466f06aac79e02d5c630 100755 (executable)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -1,5 +1,5 @@
-! Copyright (C) 2008 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
+! Copyright (c) 2008 Doug Coleman. All rights reserved.
+! This software is licensed under the Simplified BSD License.
 USING: assocs io.files io.pathnames io.directories
 io.encodings.utf8 hashtables kernel namespaces sequences
 vocabs.loader io combinators calendar accessors math.parser
@@ -79,9 +79,10 @@ ERROR: no-vocab vocab ;
     dup exists? [ not-scaffolding f ] [ scaffolding t ] if ;
 
 : scaffold-copyright ( -- )
-    "! Copyright (C) " write now year>> number>string write
-    developer-name get [ "Your name" ] unless* bl write "." print
-    "! See http://factorcode.org/license.txt for BSD license." print ;
+    "! Copyright (c) " write now year>> number>string write
+    developer-name get [ "Your name" ] unless* bl write
+    ". All rights reserved." print
+    "! This software is licensed under the Simplified BSD License." print ;
 
 : main-file-string ( vocab -- string )
     [

diff --git a/license.txt b/license.txt
index e9cd58a5e422b2f067d378d447865db638dbfbdb..3310ddc18f32eb26ae3a113b0889e5ca361f253e 100644 (file)
--- a/license.txt
+++ b/license.txt
@@ -1,3 +1,6 @@
+Copyright (c) 2003-2009, Slava Pestov and contributing authors
+All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: