Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / git-howto.txt

diff --git a/doc/git-howto.txt b/doc/git-howto.txt
index 036b567084d3644775cbf51b6ecbd15be866747f..5ba72eeeb9ebf3606ed0f99595bf23f63ca154f3 100644 (file)
--- a/doc/git-howto.txt
+++ b/doc/git-howto.txt
@@ -28,9 +28,9 @@ Consult these resources whenever you have problems, they are quite exhaustive.
 You do not need a special username or password.
 All you need is to provide a ssh public key to the Git server admin.
 
-What follows now is a basic introduction to Git and some Libav-specific
+What follows now is a basic introduction to Git and some FFmpeg-specific
 guidelines. Read it at least once, if you are granted commit privileges to the
-Libav project you are expected to be familiar with these rules.
+FFmpeg project you are expected to be familiar with these rules.
 
 
 
@@ -39,18 +39,19 @@ I. BASICS:
 
 0. Get GIT:
 
+  Most distributions have a git package, if not
   You can get git from http://git-scm.com/
 
 
 1. Cloning the source tree:
 
-    git clone git://git.libav.org/libav.git <target>
+    git clone git://source.ffmpeg.org/ffmpeg <target>
 
-  This will put the Libav sources into the directory <target>.
+  This will put the FFmpeg sources into the directory <target>.
 
-    git clone git@git.libav.org:libav.git <target>
+    git clone git@source.ffmpeg.org:ffmpeg <target>
 
-  This will put the Libav sources into the directory <target> and let
+  This will put the FFmpeg sources into the directory <target> and let
   you push back your changes to the remote repository.
 
 
@@ -72,7 +73,7 @@ I. BASICS:
 
   fetches the changes from the main repository and replays your local commits
   over it. This is required to keep all your local changes at the top of
-  Libav's master tree. The master tree will reject pushes with merge commits.
+  FFmpeg's master tree. The master tree will reject pushes with merge commits.
 
 
 3. Adding/removing files/directories:
@@ -97,7 +98,7 @@ I. BASICS:
     git log <filename(s)>
 
   You may also use the graphical tools like gitview or gitk or the web
-  interface available at http://git.libav.org/
+  interface available at http://source.ffmpeg.org
 
 6. Checking source tree status:
 
@@ -268,5 +269,5 @@ I. BASICS:
   where $SHA1 is the commit SHA1 from the 'git log' output.
 
 
-Contact the project admins <git at libav dot org> if you have technical
+Contact the project admins <root at ffmpeg dot org> if you have technical
 problems with the GIT server.