[xorg-doc - Cygwin XOrg documentation] branch master, updated. 8567da8c408a63ca3f77a1c1a5d550428c13d3ec

[jturney at sourceware dot org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=8567da8c408a63ca3f77a1c1a5d550428c13d3ec

commit 8567da8c408a63ca3f77a1c1a5d550428c13d3ec
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Mar 20 01:26:20 2016 +0000

    Update text which talks about this repository for CVS to git move
    
    Also remove some unused entities
    Also polish text

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=7d8ddaae9bdd71beabe6c6326829f5cb4681dcb8

commit 7d8ddaae9bdd71beabe6c6326829f5cb4681dcb8
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Mar 19 15:48:49 2016 +0000

    Rename .cvsignore to .gitignore and update

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=bdff7ab49b374cae39305d3dbfc455078bcbd74e

commit bdff7ab49b374cae39305d3dbfc455078bcbd74e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Mar 20 00:14:47 2016 +0000

    Remove stray execute permissions


Diff:
---
 .cvsignore                             |   10 ----------
 .gitignore                             |    9 +++++++++
 cg/cygwin-x-cg.xml                     |    1 -
 cg/documentation-distribution.xml      |   20 ++++++++++----------
 cg/documentation-obtaining-source.xml  |   20 +++++++++-----------
 cg/glossary.xml                        |    4 ++--
 cg/website.xml                         |   20 +++++++++++---------
 common/entities.xml                    |    4 ----
 ug/figures/cyi01welcome.png            |  Bin 27331 -> 27331 bytes
 ug/figures/cyi02installoption.png      |  Bin 19940 -> 19940 bytes
 ug/figures/cyi03installto.png          |  Bin 36524 -> 36524 bytes
 ug/figures/cyi04directory.png          |  Bin 20054 -> 20054 bytes
 ug/figures/cyi05proxy.png              |  Bin 19693 -> 19693 bytes
 ug/figures/cyi06mirror.png             |  Bin 26692 -> 26692 bytes
 ug/figures/cyi07packages.png           |  Bin 30073 -> 30073 bytes
 ug/figures/cyi08downloading.png        |  Bin 17498 -> 17498 bytes
 ug/figures/cyi09installing.png         |  Bin 15218 -> 15218 bytes
 ug/figures/cyi10createicons.png        |  Bin 19474 -> 19474 bytes
 18 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b5383fc..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-Makefile.in
-configure
-aclocal.m4
-config.h.in
-configure
-INSTALL
-install-sh
-missing
-mkinstalldirs
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..093cf2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
diff --git a/AUTHORS b/AUTHORS
old mode 100755
new mode 100644
diff --git a/Makefile.am b/Makefile.am
old mode 100755
new mode 100644
diff --git a/TODO b/TODO
old mode 100755
new mode 100644
diff --git a/cg/Makefile.am b/cg/Makefile.am
old mode 100755
new mode 100644
diff --git a/cg/biblio.xml b/cg/biblio.xml
old mode 100755
new mode 100644
diff --git a/cg/cygwin-x-cg.xml b/cg/cygwin-x-cg.xml
old mode 100755
new mode 100644
index 0fbddb0..e971f04
--- a/cg/cygwin-x-cg.xml
+++ b/cg/cygwin-x-cg.xml
@@ -129,7 +129,6 @@ Distribution">
 <!ENTITY cross-bash-prompt-close "]$">
 
 <!-- Project file names -->
-<!ENTITY file-cvs-update-log "cvs-update.log">
 <!ENTITY file-documentation-source-version "1.0.0">
 <!ENTITY file-documentation-source "cygwin-x-doc-&file-documentation-source-version;">
 <!ENTITY file-documentation-source-arc "&file-documentation-source;&ext-zipped;">
diff --git a/cg/documentation-build.xml b/cg/documentation-build.xml
old mode 100755
new mode 100644
diff --git a/cg/documentation-distribution.xml b/cg/documentation-distribution.xml
old mode 100755
new mode 100644
index 16ae088..9156dc7
--- a/cg/documentation-distribution.xml
+++ b/cg/documentation-distribution.xml
@@ -7,10 +7,9 @@ source code distribution:</para>
 <orderedlist numeration="arabic">
 
 <listitem>
-<para>Edit the version tag in the third line of the file
-<filename>configure.ac</filename> to indicated a new version, or to
-add a branch name to the distribution.  The line containing the
-version tag should look like:</para>
+<para>Edit the version tag in the file <filename>configure.ac</filename> to
+indicate a new version.  The line containing the version tag should look
+like:</para>
 
 <programlisting>
 AC_INIT(cygwin-x-doc, &file-documentation-source-version;)
@@ -19,15 +18,16 @@ AC_INIT(cygwin-x-doc, &file-documentation-source-version;)
 
 <listitem>
 <para>
-Commit this change to CVS and apply an appropriate tag:
+Commit this change to <command>git</command> and apply an appropriate tag:
 
 <screen>
 &cygwin-bash-prompt; ~/&file-documentation-source;
-$ cvs ci configure.ac
-[...]
+$ git add configure.ac
 &cygwin-bash-prompt; ~/&file-documentation-source;
-$ cvs tag -c VERSION_1_0_0
+$ git commit -m "Bump version to 1.0.0"
 [...]
+&cygwin-bash-prompt; ~/&file-documentation-source;
+$ git tag VERSION_1_0_0
 </screen>
 
 </para>
@@ -42,7 +42,7 @@ build directory:</para>
 $ cd &file-documentation-source;/build
 
 &cygwin-bash-prompt; ~/&file-documentation-source;/build
-$ 
+$
 </screen>
 </listitem>
 
@@ -62,7 +62,7 @@ contained in the current directory in a file called
 </listitem>
 
 <listitem>
-<para>Building the documentation is now complete.</para>
+<para>Packaging the documentation is now complete.</para>
 </listitem>
 
 </orderedlist>
diff --git a/cg/documentation-docbook.xml b/cg/documentation-docbook.xml
old mode 100755
new mode 100644
diff --git a/cg/documentation-obtaining-source.xml b/cg/documentation-obtaining-source.xml
old mode 100755
new mode 100644
index 17f0e45..4676049
--- a/cg/documentation-obtaining-source.xml
+++ b/cg/documentation-obtaining-source.xml
@@ -4,35 +4,33 @@
 <sect2 id="docs-obtaining-source-release">
 <title>Source of latest cygwin-x-doc release</title>
 <para>To obtain the source of the latest release of the cygwin-x-doc package
-start the cygwin setup, select directories and mirror and select the package 
+start the cygwin setup program, and select the package
 cygwin-x-doc from the category X11. Mark the checkbox labelled src and install.
 This will install the documentation source in /usr/src/cygwin-x-doc.
 </para>
 </sect2>
 
 
-<sect2 id="docs-obtaining-source-cvs">
-<title>Source from CVS</title>
+<sect2 id="docs-obtaining-source-git">
+<title>Source from git</title>
 <para>
-The documentation source code is available from sourceware.org CVS.
-To obtain them please use the follow commands:
+The documentation source code is available from sourceware.org <command>git</command>.
+To obtain it, please use the following commands:
 
 <screen>
-$ cvs -d :pserver:anoncvs@sourceware.org:/cvs/cygwin-xfree login
-CVS password: &lt;hit return&gt;
-$ cvs -d :pserver:anoncvs@sourceware.org:/cvs/cygwin-xfree co doc
+$ git clone git://sourceware.org/git/cygwin-apps/xorg-doc.git
 [output as files are checked out]
-$ (cd doc && autoreconf)
+$ (cd xorg-doc && autoreconf)
 [output as autoconfiguration scripts are regenerated]
 </screen>
 </para>
 <para>
-You should now have the sources in an directory called doc.
+You should now have the sources in a directory called xorg-doc.
 </para>
 
 <para>
 If you just want to look at the Cygwin/X documentation source, use the
-<ulink url="http://sourceware.org/viewvc/cygwin-xfree/doc/";>
+<ulink url="http://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git";>
 web interface to the Cygwin/X documentation tree</ulink>.
 </para>
 </sect2>
diff --git a/cg/documentation.xml b/cg/documentation.xml
old mode 100755
new mode 100644
diff --git a/cg/glossary.xml b/cg/glossary.xml
old mode 100755
new mode 100644
index 4260a8b..58cda1c
--- a/cg/glossary.xml
+++ b/cg/glossary.xml
@@ -161,9 +161,9 @@ colors, fill style, stipple, and tile.</para>
 <acronym>git</acronym>
 
 <glossdef>
-<para>git is an open source distributed version control system. 
+<para>git is an open source distributed version control system.
 More information can be found at
-the <ulink url="&git-home;">git project homepage</ulink>.</para>
+the <ulink url="http://git-scm.com/";>git project homepage</ulink>.</para>
 </glossdef>
 </glossentry>
 
diff --git a/cg/overview.xml b/cg/overview.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-cross.xml b/cg/programming-cross.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-distribution.xml b/cg/programming-distribution.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-native.xml b/cg/programming-native.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-obtaining-source.xml b/cg/programming-obtaining-source.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-patches.xml b/cg/programming-patches.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-server-architecture.xml b/cg/programming-server-architecture.xml
old mode 100755
new mode 100644
diff --git a/cg/programming-tree-layout.xml b/cg/programming-tree-layout.xml
old mode 100755
new mode 100644
diff --git a/cg/programming.xml b/cg/programming.xml
old mode 100755
new mode 100644
diff --git a/cg/website.xml b/cg/website.xml
old mode 100755
new mode 100644
index 96d64e8..666f194
--- a/cg/website.xml
+++ b/cg/website.xml
@@ -2,32 +2,34 @@
 <title>&title-web;</title>
 
 <para>
-The Cygwin/X web site is stored in sourceware.org CVS.
-The CVSROOT is :ext:sourceware.org:/cvs/cygwin/, and the path is htdocs/xfree/
+The Cygwin/X web site is stored in sourceware.org <command>git</command>.
+The repository is <literal>git://sourceware.org/git/cygwin-htdocs.git</literal>
+and the path is <filename>htdocs/xfree/</filename>
 </para>
 
 <sect1 id="updating-documentation-on-website">
 <title>Updating the documentation on the web site</title>
 
 <para>
-A simple way of updating the documentation shown on the web site from the cywin-x-doc package
-is to build the documentation, then install it into a CVS checkout of web-site and then check it in.
+A relatively simple way of updating the documentation shown on the web site from
+the cygwin-x-doc sources is to build the documentation, then install it into a
+<command>git</command> checkout of the web site, and then check that in, e.g.:
 </para>
 
 <screen>
 $ cd path-to-website-checkout
-$ export CVS_RSH=ssh
-$ cvs -z9 -d :ext:user@sourceware.org:/cvs/cygwin/ co htdocs/xfree
-[...]
+$ git clone ssh://user@sourceware.org/git/cygwin-htdocs.git
 $ cd path-to-cygwin-x-doc-checkout
 $ ./configure --enable-hardcopy --with-docdir=path-to-website-checkout/htdocs/xfree/docs
 $ make
+[...]
 $ make install
+[...]
 $ cd path-to-website-checkout/htdocs/xfree/docs
-$ cvs ci
+$ git add --all
+$ git commit -m "Rebuild X documentation"
 </screen>
 
 </sect1>
 
 </chapter>
-
diff --git a/common/Makefile.am b/common/Makefile.am
old mode 100755
new mode 100644
diff --git a/common/entities.xml b/common/entities.xml
old mode 100755
new mode 100644
index 2ba31ca..5127736
--- a/common/entities.xml
+++ b/common/entities.xml
@@ -69,16 +69,12 @@
 <!ENTITY linuxdoc-title-xdmcp "Linux XDMCP HOWTO">
 
 <!-- XOrg entities -->
-<!ENTITY xorg-url-cvs "http://xorg.freedesktop.org/wiki/";>
 <!ENTITY xorg-url-man-xserver "http://x.cygwin.com/docs/man1/Xserver.1.html";>
 <!ENTITY xorg-url-fonts "http://www.x.org/archive/X11R7.5/doc/fonts/fonts.html";>
 <!ENTITY xorg-title-fonts "Fonts in X11R6.7">
 
 <!ENTITY xfree "XFree86">
 
-<!-- CVS entities -->
-<!ENTITY git-home "http://git.or.cz/";>
-
 <!-- File system extensions -->
 <!ENTITY ext-zipped ".tar.bz2">
 <!ENTITY ext-tar ".tar">
diff --git a/common/fdl.xml b/common/fdl.xml
old mode 100755
new mode 100644
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
diff --git a/faq/Makefile.am b/faq/Makefile.am
old mode 100755
new mode 100644
diff --git a/faq/biblio.xml b/faq/biblio.xml
old mode 100755
new mode 100644
diff --git a/faq/config.xml b/faq/config.xml
old mode 100755
new mode 100644
diff --git a/faq/contrib.xml b/faq/contrib.xml
old mode 100755
new mode 100644
diff --git a/faq/cygwin-x-faq.xml b/faq/cygwin-x-faq.xml
old mode 100755
new mode 100644
diff --git a/faq/errors.xml b/faq/errors.xml
old mode 100755
new mode 100644
diff --git a/faq/general.xml b/faq/general.xml
old mode 100755
new mode 100644
diff --git a/faq/glossary.xml b/faq/glossary.xml
old mode 100755
new mode 100644
diff --git a/faq/i18n.xml b/faq/i18n.xml
old mode 100755
new mode 100644
diff --git a/faq/install.xml b/faq/install.xml
old mode 100755
new mode 100644
diff --git a/faq/licptc.xml b/faq/licptc.xml
old mode 100755
new mode 100644
diff --git a/faq/porting.xml b/faq/porting.xml
old mode 100755
new mode 100644
diff --git a/faq/remote.xml b/faq/remote.xml
old mode 100755
new mode 100644
diff --git a/faq/trouble.xml b/faq/trouble.xml
old mode 100755
new mode 100644
diff --git a/faq/usage.xml b/faq/usage.xml
old mode 100755
new mode 100644
diff --git a/stylesheets/print.dsl b/stylesheets/print.dsl
old mode 100755
new mode 100644
diff --git a/stylesheets/website.dsl b/stylesheets/website.dsl
old mode 100755
new mode 100644
diff --git a/ug/Makefile.am b/ug/Makefile.am
old mode 100755
new mode 100644
diff --git a/ug/configure.xml b/ug/configure.xml
old mode 100755
new mode 100644
diff --git a/ug/cygwin-x-ug.xml b/ug/cygwin-x-ug.xml
old mode 100755
new mode 100644
diff --git a/ug/figures/Makefile.am b/ug/figures/Makefile.am
old mode 100755
new mode 100644
diff --git a/ug/overview.xml b/ug/overview.xml
old mode 100755
new mode 100644
diff --git a/ug/setup.xml b/ug/setup.xml
old mode 100755
new mode 100644
diff --git a/ug/using.xml b/ug/using.xml
old mode 100755
new mode 100644