Revert "Improve license owner phrasing and in-file copyright notices"

This reverts commit 6c38831c4813391b2ff380df925e60bc41a2b286.

diff --git a/basis/tools/scaffold/scaffold.factor b/basis/tools/scaffold/scaffold.factor
index 6f7cb25ab9aef8078561466f06aac79e02d5c630..f35da242663caa4e1b48557614c0dc6ab680b9c3 100755 (executable)
--- a/basis/tools/scaffold/scaffold.factor
+++ b/basis/tools/scaffold/scaffold.factor
@@ -1,5 +1,5 @@
-! Copyright (c) 2008 Doug Coleman. All rights reserved.
-! This software is licensed under the Simplified BSD License.
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for 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,10 +79,9 @@ 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
-    ". All rights reserved." print
-    "! This software is licensed under the Simplified BSD License." print ;
+    "! 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 ;
 
 : main-file-string ( vocab -- string )
     [

diff --git a/license.txt b/license.txt
index 3310ddc18f32eb26ae3a113b0889e5ca361f253e..e9cd58a5e422b2f067d378d447865db638dbfbdb 100644 (file)
--- a/license.txt
+++ b/license.txt
@@ -1,6 +1,3 @@
-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: