diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-10-14 14:00:53 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2010-10-18 15:33:27 -0400 |
| commit | a77458486a7b9d78dcd284e2bcc96c1fda0e862a (patch) | |
| tree | 89609e09071bf204b134c505f32a739bad9e816d /hw/xfree86/doc/man | |
| parent | f8ec71603c796f3b272a0592cbb934c2a6e8d633 (diff) | |
xfree86: Remove %M expansion from config parser
This was to distinguish XFree86 3.x files from XFree86 4.x files. It
never really made sense to be looking for xorg.conf-4.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/xfree86/doc/man')
| -rw-r--r-- | hw/xfree86/doc/man/xorg.conf.man.pre | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 6b3636fff..cbfea7d98 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -39,14 +39,11 @@ server is started as a normal user: .IR __projectroot__/etc/X11/ <cmdline> .IB /etc/X11/ $XORGCONFIG .IB __projectroot__/etc/X11/ $XORGCONFIG -.I /etc/X11/__xconfigfile__\-4 .I /etc/X11/__xconfigfile__ .I /etc/__xconfigfile__ .IR __projectroot__/etc/X11/__xconfigfile__. <hostname> -.I __projectroot__/etc/X11/__xconfigfile__\-4 .I __projectroot__/etc/X11/__xconfigfile__ .IR __projectroot__/lib/X11/__xconfigfile__. <hostname> -.I __projectroot__/lib/X11/__xconfigfile__\-4 .I __projectroot__/lib/X11/__xconfigfile__ .fi .RE @@ -74,14 +71,11 @@ search locations are as follows: .B $XORGCONFIG .IB /etc/X11/ $XORGCONFIG .IB __projectroot__/etc/X11/ $XORGCONFIG -.I /etc/X11/__xconfigfile__\-4 .I /etc/X11/__xconfigfile__ .I /etc/__xconfigfile__ .IR __projectroot__/etc/X11/__xconfigfile__. <hostname> -.I __projectroot__/etc/X11/__xconfigfile__\-4 .I __projectroot__/etc/X11/__xconfigfile__ .IR __projectroot__/lib/X11/__xconfigfile__. <hostname> -.I __projectroot__/lib/X11/__xconfigfile__\-4 .I __projectroot__/lib/X11/__xconfigfile__ .fi .RE |