diff --git a/general.ent b/general.ent
index 53b9963e2f..c1b081de05 100644
--- a/general.ent
+++ b/general.ent
@@ -354,6 +354,7 @@ $Date$
+
diff --git a/general/prog/git.xml b/general/prog/git.xml
new file mode 100644
index 0000000000..8f0a5ca1fb
--- /dev/null
+++ b/general/prog/git.xml
@@ -0,0 +1,257 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+ $LastChangedBy$
+ $Date$
+
+
+ Git-&git-version;
+
+
+ Git
+
+
+
+ Introduction to Git
+
+ Git is a free and open source, distributed
+ version control system designed to handle everything from small to very
+ large projects with speed and efficiency. Every
+ Git clone is a full-fledged repository with
+ complete history and full revision tracking capabilities, not dependent on
+ network access or a central server. Branching and merging are fast and easy
+ to do. Git is used for version control of files,
+ much like tools such as Mercurial,
+ Bazaar, ,
+ , Perforce, and
+ Team Foundation Server.
+
+ &lfs70_checked;
+
+ Package Information
+
+
+ Download (HTTP):
+
+
+ Download (FTP):
+
+
+ Download MD5 sum: &git-md5sum;
+
+
+ Download size: &git-size;
+
+
+ Estimated disk space required: &git-buildsize;
+
+
+ Estimated build time: &git-time;
+
+
+
+ Git Dependencies
+
+ Required
+
+
+ Recommended
+ (without libcurl you won't
+ be able to use Git over http, https, ftp or
+ ftps)
+
+ Optional
+ (gitk, a simple git repository
+ viewer, uses tk at runtime)
+ AsciiDoc and
+ are required to create the man pages.
+
+ User Notes:
+
+
+
+
+ Installation of Git
+
+ Install Git by running the following
+ commands:
+
+./configure --prefix=/usr --with-gitconfig=/etc/gitconfig &&
+make
+
+ If you have installed AsciiDoc and
+ and you wish to create the man pages:
+
+make man
+
+ To check the results, issue: make test.
+
+ Now, as the root
+ user:
+
+make install
+
+ If you created the man pages, install them:
+
+make install-man
+
+
+
+ Command Explanations
+
+ : This sets
+ /etc/gitconfig as the file that stores the default,
+ system wide, Git settings.
+
+
+
+ Configuring Git
+
+
+ Config Files
+ ~/.gitconfig and
+ /etc/gitconfig
+
+
+ ~/.gitconfig
+
+
+
+ /etc/gitconfig
+
+
+
+ Configuration Information
+
+ If you want to use git svn you will to install
+ and its perl bindings.
+
+ To be able to use git to pull from a https source you need to tell
+ it where the ssl certificates are. To install the SSL certificate bundle,
+ see . To set the location of the SSL certificate
+ bundle for all users, as the
+ root user:
+
+git config --system http.sslcainfo /etc/ssl/certs/ca-bundle.crt
+
+ Alternatively, to define http.sslcainfo only for yourself:
+
+git config --global http.sslcainfo /etc/ssl/certs/ca-bundle.crt
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Directories
+
+
+ git, git-cvsserver, gitk, git-receive-pack, git-shell,
+ git-upload-archive and git-upload-pack.
+ /usr/libexec/git-core, /usr/share/git-core, /usr/share/git-gui,
+ /usr/share/gitk and /usr/share/gitweb
+
+
+
+
+ Short Descriptions
+
+
+
+
+ git
+
+ is the stupid content tracker.
+
+ git
+
+
+
+
+
+ git-cvsserver
+
+ is a CVS server emulator for git.
+
+ git-cvsserver
+
+
+
+
+
+ gitk
+
+ is a git repository browser (needs ).
+
+ gitk
+
+
+
+
+
+ git-receive-pack
+
+ is invoked by git send-pack and updates the
+ repository with the information fed from the remote end.
+
+ git-receive-pack
+
+
+
+
+
+ git-shell
+
+ is a login shell for SSH accounts to provide restricted Git
+ access.
+
+ git-shell
+
+
+
+
+
+ git-upload-archive
+
+ is invoked by git archive --remote and sends
+ a generated archive to the other end over the git protocol.
+
+ git-upload-archive
+
+
+
+
+
+ git-upload-pack
+
+ is invoked by git fetch-pack, it discovers
+ what objects the other side is missing, and sends them after
+ packing.
+
+ git-upload-pack
+
+
+
+
+
+
diff --git a/general/prog/prog.xml b/general/prog/prog.xml
index 9bf0e0c6f8..eb9182db55 100644
--- a/general/prog/prog.xml
+++ b/general/prog/prog.xml
@@ -33,6 +33,7 @@ $Date$
+
@@ -40,7 +41,6 @@ $Date$
-
@@ -56,6 +56,7 @@ $Date$
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e7cda73e86..deac34396e 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -59,6 +59,9 @@
[ken] - merge gnome-system-monitor-3.2.1 from Wayne.
+
+ [abenton] - add Git 1.7.9.
+