merge trunk

10 files changed, 15 insertions, 14 deletions

diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el
index a7fe955acf4..efe4db039c4 100644
--- a/admin/grammars/bovine-grammar.el
+++ b/admin/grammars/bovine-grammar.el
@@ -1,6 +1,6 @@
 ;;; bovine-grammar.el --- Bovine's input grammar mode
 ;;
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index b49f8ce76c7..1bdaf8f447b 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -1,6 +1,6 @@
 ;;; c.by -- LL grammar for C/C++ language specification
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
@@ -261,7 +261,7 @@ define
   ;
 
 ;; In C++, structures can have the same things as classes.
-;; So delete this somday in the figure.
+;; So delete this some day in the figure.
 ;;
 ;;structparts : semantic-list
 ;;            (EXPANDFULL $1 structsubparts)
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index 18e8b814303..1189d6b0886 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -1,6 +1,6 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index f4b2f1f1f49..b58b96c6bfb 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -1,6 +1,6 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index ffa324806cf..c6b3a58aac3 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index dab4472b737..ee933805cf6 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -1,6 +1,6 @@
 ;;; make.by -- BY notation for Makefiles.
 
-;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index b30305ee78a..f7808fd20b8 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -1,7 +1,8 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
-;; Copyright (C) 2001-2010 Python Software Foundation
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
+;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
 ;; Author: Richard Kim <ryk@dspwiz.com>
 ;; Maintainer: Richard Kim <ryk@dspwiz.com>
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by
index bc6612d4c70..3925f03c28b 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -1,6 +1,6 @@
 ;;; scheme.by -- Scheme BNF language specification
 
-;; Copyright (C) 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index 4ff2d7e4e41..f38d7eaa2a1 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -1,6 +1,6 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
diff --git a/admin/grammars/wisent-grammar.el b/admin/grammars/wisent-grammar.el
index 66045c2294d..714b5211127 100644
--- a/admin/grammars/wisent-grammar.el
+++ b/admin/grammars/wisent-grammar.el
@@ -1,6 +1,6 @@
 ;;; wisent-grammar.el --- Wisent's input grammar mode
 
-;; Copyright (C) 2002-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -470,13 +470,13 @@ Menu items are appended to the common grammar menu.")
      "srecode/srt-wy")
     ("wisent-javascript-jv-wy.el"
      "semantic/wisent/js-wy"
-     "Copyright (C) 1998-2011 Ecma International"
+     "Copyright (C) 1998-2011 Ecma International."
      ,wisent-make-parsers--ecmascript-license)
     ("wisent-java-tags-wy.el"
      "semantic/wisent/javat-wy")
     ("wisent-python-wy.el"
      "semantic/wisent/python-wy"
-     "Copyright (C) 2001-2010 Python Software Foundation"
+     "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software Foundation; All Rights Reserved."
      ,wisent-make-parsers--python-license)))
 
 (defun wisent-make-parsers ()