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 @@
-
-
-
+
+
@@ -495,8 +494,8 @@
&tools;
-
-&cvs;
+
+&git;
diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
index acbfb9f6..8d763eb1 100644
--- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
+++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml
@@ -100,14 +100,14 @@
url="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation
License (GFDL), one of the Creative Commons
- Licenses (Share-Alike, or Attribution-Share-Alike), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements.
+ Licenses (such as Attribution-Share-Alike), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements.
Debian-compatible licenses
- The Debian package maintainer for LDP documents has divided the LDP documents into those with a free license and those with a non-free license. For a summary of this list, please read Debian License Summaries. Currently the Artistic License, BSD License and the GNU General Public License are listed as free. These licenses will also be accepted by the LDP. The definition of non-free has not been made transparent. By choosing another license that has any kind of restriction on redistribution or whether or not the document may be modified, your document may be put into the non-free package instead of the free package. We are working with Debian to clarify how these decisions are made.
+ The Debian package maintainer for LDP documents has divided the LDP documents into those with a free license and those with a non-free license. For a summary of this list, please read Debian License Summaries. Currently the Artistic License, BSD License and the GNU General Public License are listed as free. These licenses will also be accepted by the LDP. The definition of non-free has not been made transparent. By choosing another license that has any kind of restriction on redistribution or whether or not the document may be modified, your document may be put into the non-free package instead of the free package. We are working with Debian to clarify how these decisions are made.
- You can get DocBook markups of both the GNU GPL and the GNU FDL from the GNOME Documentation Project. You can then merely include the license in its entirety in your document. A DocBook-formatted copy of the license is available in .
+ A DocBook-formatted copy of the license is available in .
@@ -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 CVS to better track each of the
+ url="https://github.com/tLDP/LDP">git repository to better
+ track each of the
changes that are made, and keep track of the most current version of
your document.
@@ -257,16 +258,11 @@
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.
-
- 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
-
+
Spell Check
diff --git a/LDP/guide/docbook/LDP-Author-Guide/git.xml b/LDP/guide/docbook/LDP-Author-Guide/git.xml
new file mode 100644
index 00000000..98869321
--- /dev/null
+++ b/LDP/guide/docbook/LDP-Author-Guide/git.xml
@@ -0,0 +1,91 @@
+
+
+git revision control
+
+
+ Introduction to git
+
+ You can browse the LDP github repository via the web at https://github.com/tLDP/.
+
+
+
+ Using git offers many advantages over other version control systems,
+ but between git and github there's a few features that make it well
+ suited for a distributed and diverse set of contributors:
+
+
+ Each user can have their own independent and up-to-date copy of the repository and modify it.
+ Submitters do not need to have write access to the main repository to submit updates
+ Using github relieves TLDP staff of managing account requests
+ Ability to import changelogs from other VCS, so you can track changes going back about 16 years or more
+
+ These advantages come a bit a bit of a price in terms of increased complexity. There's a lot to git, but we'll cover enough here to manage documents in LDP.
+ You can get an account on github by going to their website and signing up for a free
+ account. For ease of use, you may want to use SSH keys to
+ authenticate with github otherwise you will be asked to enter your
+ password with each update.
+
+
+
+
+ Setting up git on your local Linux system
+
+ Many different systems run git, but this document will focus on doing as many functions from the Linux command line as possible
+ You will need to make sure that git is installed on your system. It isn't always installed by default so you may need to add it using your package manager such as yum or apt-get
+
+
+
+
+ First time git setup
+ The first time you start using github you'll need to run some
+ commands
+
+ Clone the entire repository (about 400 MB) with: git clone https://github.com/tLDP/LDP
+
+
+ Go to the LDP repository on github and click on . This will create your own copy of TLDP in your space that you can write to.
+
+ Lastly, link your local repository with your repository on github with git remote add upstream git@github.com/MyGithubID/LDP.git
+
+
+
+
+
+ Submitting changes to TLDP
+ Each time you make changes to TLDP you'll need to go through this
+ process. It'll make sure that your changes are submitted for review and
+ if approved, automatically added into TLDP
+
+ Create a new branch using git checkout -b MyNewBranch
+ Start making your changes, either editing files, or creating new ones. You can use git diff to see changes between what you have locally and what the last checked in repository is.
+ If you added new files, you will need to use git add filename to indicate that there are new files for git to manage.
+ Now you commit the changes locally using git commit. This creates a new revision and drops you into an editor to add a comment for the changes you've made. You can include the -m option and a string to do this at the command line.
+ Now you need to push your changes into your forked repository on github with git push -u upstream MyNewBranch
+ From the github website, you will need to create a push request using your branch.
+
+ Once the push request is accepted, you can remove the branch using git branch -D MyNewBranch
+
+
+
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 @@
+
+ git
+
+ 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: Wikipedia)
+
+
+
GNU Free Documentation License
(GFDL)