X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/5c1ae3bc9c3a3cbed192fed2d68fc9b7bbe5c96f..ff56519f303d58db08eadf5e36356afcc27234fc:/doc/disorder_options.5.in

diff --git a/doc/disorder_options.5.in b/doc/disorder_options.5.in
index 62dd9c2..242c0b0 100644
--- a/doc/disorder_options.5.in
+++ b/doc/disorder_options.5.in
@@ -1,20 +1,18 @@
 .\"
-.\" Copyright (C) 2008 Richard Kettlewell
+.\" Copyright (C) 2008, 2011 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
-.\" 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.
-.\"
-.\" 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
-.\" 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/>.
 .\"
 .TH disorder_options 5
 .SH NAME
@@ -27,15 +25,6 @@ The general syntax is the same as the main configuration file (see
 .SH DIRECTIVES
 Valid directives are:
 .TP
-.B columns \fINAME\fR \fIHEADING\fR...
-Defines the columns used in \fB@playing@\fR and \fB@recent@\fB.
-\fINAME\fR must be either \fBplaying\fR, \fBrecent\fR or \fBsearch\fR.
-\fIHEADING\fR...  is a list of heading names.
-If a column is defined more than once then the last definitions is used.
-.IP
-The heading names \fBbutton\fR, \fBlength\fR, \fBwhen\fR and \fBwho\fR
-are built in.
-.TP
 .B include \fIPATH\fR
 Includes another file.
 If \fIPATH\fR starts with a \fB/\fR then it is taken as is, otherwise
@@ -56,7 +45,7 @@ Otherwise the whole name is used as the value.
 Labels are not individually documented here, see the shipped
 \fIoptions.labels\fR file instead.
 .SH "OPTION FILES"
-The shipped \fIoptions\fR file includes four standard options files.
+The shipped \fIoptions\fR file includes two standard options files.
 In order, they are:
 .TP
 .I options.labels