diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-31 14:39:32 +0000 |
| commit | fe6927d79e02d01cce20ecf56c8721fcadc2d278 (patch) | |
| tree | 7c8ae5a40c3e2cd7825097c06c87f01ab85a24f0 /xorg-server/xkbdata.src/docs | |
| parent | c035ec13d812ca609dd31590b86952f14394b5ec (diff) | |
| download | vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.gz vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.tar.bz2 vcxsrv-fe6927d79e02d01cce20ecf56c8721fcadc2d278.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/xkbdata.src/docs')
| -rw-r--r-- | xorg-server/xkbdata.src/docs/HOWTO.transition | 2 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/docs/Makefile.in | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/xkbdata.src/docs/HOWTO.transition b/xorg-server/xkbdata.src/docs/HOWTO.transition index f671af93d..24add85f5 100644 --- a/xorg-server/xkbdata.src/docs/HOWTO.transition +++ b/xorg-server/xkbdata.src/docs/HOWTO.transition @@ -1,6 +1,6 @@ PURPOSE -This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multimple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration. +This document describes the procedure for replacing the standard XKB configuration repository shipped with an X Window System implementation. The procedure should work for XFree86 4.3 and higher and X11R7 implementation from X.Org. Any other X server supporting so called "multiple layouts" can be powered with XKeyboardConfig in a similar way (at the moment NO known commercial X Window System implementations support "multiple layouts"). X servers which do not support "multiple layouts" can be used with XKeyboardConfig as well - but users should be aware that only one group will be accessible with each possible XKB configuration. PROCEDURE diff --git a/xorg-server/xkbdata.src/docs/Makefile.in b/xorg-server/xkbdata.src/docs/Makefile.in index 33b637891..2277560c9 100644 --- a/xorg-server/xkbdata.src/docs/Makefile.in +++ b/xorg-server/xkbdata.src/docs/Makefile.in @@ -95,6 +95,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -165,9 +166,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/Makefile + $(AUTOMAKE) --foreign docs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |