resolve merge

[lilypond.git] / scm / document-functions.scm

diff --git a/scm/document-functions.scm b/scm/document-functions.scm
index 34d406f89fca40763d05f36fd5bef0c704a5bfa3..81ec310373dd0efabcca3cd36cff9f12eaaf9a4a 100644 (file)
--- a/scm/document-functions.scm
+++ b/scm/document-functions.scm
@@ -1,9 +1,20 @@
-;;;; document-funcions.scm -- part of generated backend documentation
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
-;;;; 
-;;;; (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (use-modules
  (ice-9 regex))
@@ -34,7 +45,7 @@
   (let* ((fdocs (map (lambda (x)
                       (document-scheme-function (car x) (cadr x) (cddr x)))
                     all-scheme-functions))
-        (sfdocs (sort fdocs string<?))) 
+        (sfdocs (sort fdocs ly:string-ci<?)))
     (make <texi-node>
       #:name "Scheme functions"
       #:desc "Primitive functions exported by LilyPond."