diff options
author | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-11-30 10:03:09 +0000 |
commit | 3e2f3f105cfe65384d2adeb2bd678850d9be47f9 (patch) | |
tree | 1c3e43a774683e6e47cbd2293679b7115fbaa3cb /xorg-server/hw/xfree86/doc | |
parent | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (diff) | |
parent | 57818d0fe4f7cf94279909f03ec11b326b284f1e (diff) | |
download | vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.gz vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.tar.bz2 vcxsrv-3e2f3f105cfe65384d2adeb2bd678850d9be47f9.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/doc')
-rw-r--r-- | xorg-server/hw/xfree86/doc/man/Xorg.man.pre | 4 | ||||
-rw-r--r-- | xorg-server/hw/xfree86/doc/sgml/Makefile.am | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre index 297eda1fb..c497a0e8c 100644 --- a/xorg-server/hw/xfree86/doc/man/Xorg.man.pre +++ b/xorg-server/hw/xfree86/doc/man/Xorg.man.pre @@ -32,8 +32,8 @@ SPARC and PowerPC. The most widely supported operating systems are the free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD,
OpenBSD, and Solaris. Commercial UNIX operating systems such as
UnixWare are also supported. Other supported operating systems include
-GNU Hurd. Darwin and Mac OS X are supported with the
-XDarwin(__appmansuffix__) X server. Win32/Cygwin is supported with the
+GNU Hurd. Mac OS X is supported with the
+Xquartz(__appmansuffix__) X server. Win32/Cygwin is supported with the
XWin(__appmansuffix__) X server.
.PP
.SH "NETWORK CONNECTIONS"
diff --git a/xorg-server/hw/xfree86/doc/sgml/Makefile.am b/xorg-server/hw/xfree86/doc/sgml/Makefile.am index 7756c47ac..e6661c544 100644 --- a/xorg-server/hw/xfree86/doc/sgml/Makefile.am +++ b/xorg-server/hw/xfree86/doc/sgml/Makefile.am @@ -19,13 +19,9 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-XML_FILES = DESIGN.xml
-
-include ../../../../doc/xml/xmlrules.in
+doc_sources = DESIGN.xml
+# Developer's documentation is not installed
if ENABLE_DEVEL_DOCS
-noinst_DATA = $(BUILT_DOC_FILES)
+include $(top_srcdir)/doc/xml/xmlrules-noinst.in
endif
-CLEANFILES = $(CLEAN_DOC_FILES)
-
-EXTRA_DIST = $(XML_FILES)
|