From b753bbb2b821cf851e8e134fcf44534453f78329 Mon Sep 17 00:00:00 2001
From: Mark Komarinski <mark.komarinski@ceibasolutions.com>
Date: Thu, 28 Jan 2016 21:12:06 -0500
Subject: [PATCH] Other file changes for using git

---
 .../docbook/LDP-Author-Guide/LDP-Author-Guide.xml     |  9 ++++-----
 LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml  | 10 +++-------
 LDP/guide/docbook/LDP-Author-Guide/ag-writing.xml     | 11 +++++------
 LDP/guide/docbook/LDP-Author-Guide/glossary.xml       |  7 +++++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml b/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
index 922d0693..ae69958c 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
@@ -69,9 +69,8 @@
 <!-- Appendix D. Transformations: Making HTML out of XML -->
 <!ENTITY transformations SYSTEM "transformations.xml">
 
-<!-- Appendix E. CVS -->
-<!ENTITY cvs SYSTEM "cvs.xml">
-<!ENTITY cvs-why SYSTEM "cvs-why.xml">
+<!-- Appendix E. git -->
+<!ENTITY git SYSTEM "git.xml">
 
 <!-- Appendix F. Converting Documents to DocBook XML -->
 <!ENTITY x2docbook SYSTEM "x2docbook.xml">
@@ -495,8 +494,8 @@
 <!-- Appendix: Editors, Validation and System Setup -->
 &tools;
 
-<!-- Appendix: CVS -->
-&cvs;
+<!-- Appendix: git -->
+&git;
 
 <!-- Appendix: Converting to DocBook XML 4.x 
 -->
diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
index acbfb9f6..900415cf 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
@@ -222,7 +222,8 @@
 	not require any additional work. Be prepared to make at least one round
 	of changes for both the technical and language reviews. Ideally this
 	exchange will happen in the LDP's <ulink
-	url="http://cvs.tldp.org">CVS</ulink> to better track each of the
+	url="https://github.com/tLDP/LDP">git</ulink> repository to better
+        track each of the
 	changes that are made, and keep track of the most current version of
 	your document.
 </para>
@@ -257,16 +258,11 @@
 
 		<para>
 			As part of the review process a Review Coordinator will add your
-			document to the CVS (including any associated image files) and
+			document to github (including any associated image files) and
 			notify the submit mailing list that your document is ready for
 			publication.
 		</para>
 
-		<para>
-			If you do not already have a CVS account, please apply for one
-			when your document is submitted for publication. You can apply
-			for an account contacting LDP CVS master Sergiusz <ulink url="mailto:ser@gnu.org" />
-		</para>
 <!--
 		
       <para> Once your LDP document has been carefully reviewed, you
diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-writing.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-writing.xml
index ab4fc60b..a7ae71a3 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/ag-writing.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/ag-writing.xml
@@ -227,15 +227,14 @@ your final document.
   </para>
   </section>
 
-  <section id="cvs-brief">
-  <title>Concurrent Versions System (CVS)</title>
-	&cvs-why;
+  <section id="git-brief">
+  <title>git</title>
 
 	 <para>
-	 	For more information on how to use CVS to maintain your LDP
-		documents, please read <xref linkend="cvs" />.
+	 	For more information on how to use git to maintain your LDP
+		documents, please read <xref linkend="git" />.
 	 </para>
-  </section> <!-- cvs -->
+  </section> <!-- git -->
   
   <section id="ag-spellcheck">
       <title>Spell Check</title>
diff --git a/LDP/guide/docbook/LDP-Author-Guide/glossary.xml b/LDP/guide/docbook/LDP-Author-Guide/glossary.xml
index efdec5a4..38e590fd 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/glossary.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/glossary.xml
@@ -186,6 +186,13 @@
     </glossdef>
   </glossentry>
 
+  <glossentry>
+    <glossterm>git</glossterm>
+    <glossdef>
+      <para>Git is a widely-used source code management system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. (Source: <ulink url="https://en.wikipedia.org/wiki/Git_(software)">Wikipedia</ulink>)</para>
+    </glossdef>
+  </glossentry>
+
   <glossentry>
     <glossterm>GNU Free Documentation License
     (<acronym>GFDL</acronym>)</glossterm>