Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / git-howto.texi

diff --git a/doc/git-howto.texi b/doc/git-howto.texi
index b01981e05e61b5f91841af9574bb3056b692528a..f15c1cefbab321ae17747f0a9ad2e2cc87088d9c 100644 (file)
--- a/doc/git-howto.texi
+++ b/doc/git-howto.texi
@@ -1,9 +1,9 @@
 \input texinfo @c -*- texinfo -*-
 
-@settitle Using git to develop Libav
+@settitle Using git to develop FFmpeg
 
 @titlepage
-@center @titlefont{Using git to develop Libav}
+@center @titlefont{Using git to develop FFmpeg}
 @end titlepage
 
 @top
@@ -39,7 +39,7 @@ For more information about the Git project, visit the
 
 Consult these resources whenever you have problems, they are quite exhaustive.
 
-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 to ease the contribution to the project
 
 @chapter Basics Usage
@@ -53,16 +53,16 @@ Most distribution and operating system provide a package for it.
 @section Cloning the source tree
 
 @example
-git clone git://git.libav.org/libav.git <target>
+git clone git://source.ffmpeg.org/ffmpeg <target>
 @end example
 
-This will put the Libav sources into the directory @var{<target>}.
+This will put the FFmpeg sources into the directory @var{<target>}.
 
 @example
-git clone git@@git.libav.org:libav.git <target>
+git clone git@@source.ffmpeg.org:ffmpeg <target>
 @end example
 
-This will put the Libav sources into the directory @var{<target>} and let
+This will put the FFmpeg sources into the directory @var{<target>} and let
 you push back your changes to the remote repository.
 
 
@@ -77,7 +77,7 @@ can be remote. By default the master branch tracks the branch master in
 the remote origin.
 
 @float IMPORTANT
-Since merge commits are forbidden @command{--rebase} (see below) is recommended.
+@command{--rebase} (see below) is recommended.
 @end float
 
 @section Rebasing your local branches
@@ -88,7 +88,7 @@ git pull --rebase
 
 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.
 
 
 @section Adding/removing files/directories
@@ -119,7 +119,7 @@ git log <filename(s)>
 @end example
 
 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/
 
 @section Checking source tree status
 
@@ -250,7 +250,7 @@ git commit
 @end example
 
 
-@chapter Libav specific
+@chapter FFmpeg specific
 
 @section Reverting broken commits
 
@@ -340,5 +340,5 @@ where @var{$SHA1} is the commit hash from the @command{git log} output.
 
 @chapter Server Issues
 
-Contact the project admins @email{git@@libav.org} if you have technical
+Contact the project admins @email{root@@ffmpeg.org} if you have technical
 problems with the GIT server.