Install Disobedience manual and make Disobedience use it in preference

[disorder] / templates / macros.tmpl

diff --git a/templates/macros.tmpl b/templates/macros.tmpl
index d0bfe152748f01d2aa48b737b8df46aad50db05a..c83fd35e9dbc26d2794747ad153e6f57f6cd679f 100644 (file)
--- a/templates/macros.tmpl
+++ b/templates/macros.tmpl
@@ -1,20 +1,18 @@
 This file is part of DisOrder.
 This file is part of DisOrder.

-Copyright (C) 2008 Richard Kettlewell
+Copyright (C) 2008, 2009 Richard Kettlewell

 
 

-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify

 it under the terms of the GNU General Public License as published by
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or

 (at your option) any later version.
 
 (at your option) any later version.
 

-This program 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.
+This program 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
 
 You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 
 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------


@@ -24,7 +22,7 @@ Standard macros
 This file is read before any other template.  Its output is discarded
 but side effects (definitions of macros) are retained.  To override it,
 create /etc/disorder/macros.tmpl that includes this file by absolute path
 This file is read before any other template.  Its output is discarded
 but side effects (definitions of macros) are retained.  To override it,
 create /etc/disorder/macros.tmpl that includes this file by absolute path

-and then redefines macros as desired.
+and then redefine macros as desired.

 ------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------
 
 


@@ -119,7 +117,7 @@ and then redefines macros as desired.
   <a href="http://www.greenend.org.uk/rjk/disorder/"
      title="DisOrder web site">DisOrder
      version @version</a>
   <a href="http://www.greenend.org.uk/rjk/disorder/"
      title="DisOrder web site">DisOrder
      version @version</a>

-  &copy; 2003-2008 Richard Kettlewell et al
+  &copy; 2003-2009 Richard Kettlewell et al

 </p>}
 
 @# Expand to the time that @id will be played
 </p>}
 
 @# Expand to the time that @id will be played


@@ -287,12 +285,11 @@ and then redefines macros as desired.
 @#  @long is the text to put in the caption
 @#  @action is the target action
 @define {actbutton} {text long action}
 @#  @long is the text to put in the caption
 @#  @action is the target action
 @define {actbutton} {text long action}

-        {<form method=GET class=button action="@url">
+        {<form method=POST class=button action="@url">

            <input type=hidden name=action value="@action">
            <input type=submit name=submit value="@text" title="@long">
 @formback@#
          </form>}
            <input type=hidden name=action value="@action">
            <input type=submit name=submit value="@text" title="@long">
 @formback@#
          </form>}

-@# TODO @back support

 
 @# Used for inserting back= elements
 @define {back} {} {}
 
 @# Used for inserting back= elements
 @define {back} {} {}