Change perlgpl.pod to GPL 1 to match README

[perl5.git] / pod / perlrepository.pod

diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod
index dcbb981..feccf1a 100644 (file)
--- a/pod/perlrepository.pod
+++ b/pod/perlrepository.pod
@@ -64,7 +64,7 @@ directory.
 
 If you cloned using the git protocol, which is faster than ssh, then
 you will need to modify the URL for the origin remote to enable
-pushing. To do that edit F<.git/config> with L<git-config(1)> like
+pushing. To do that edit F<.git/config> with git-config(1) like
 this:
 
   % git config remote.origin.url ssh://perl5.git.perl.org/perl.git
@@ -352,7 +352,7 @@ itself you can fix it up by editing the files once more and then issue:
 
 Now you should create a patch file for all your local changes:
 
-  % git format-patch origin
+  % git format-patch -M origin..
   0001-Rename-Leon-Brocard-to-Orange-Brocard.patch
 
 You should now send an email to either perlbug@perl.org or
@@ -660,7 +660,7 @@ testcase:
   # If you get './makedepend: 1: Syntax error: Unterminated quoted
   # string' when bisecting versions of perl older than 5.9.5 this hack
   # will work around the bug in makedepend.SH which was fixed in
-  # version 96a8704c. Make sure to comment out `git co makedepend.SH'
+  # version 96a8704c. Make sure to comment out `git checkout makedepend.SH'
   # below too.
   git show blead:makedepend.SH > makedepend.SH
 
@@ -677,7 +677,7 @@ testcase:
   ./perl -Ilib ~/testcase.pl
   ret=$?
   [ $ret -gt 127 ] && ret=127
-  # git co makedepend.SH
+  # git checkout makedepend.SH
   git clean -dxf
   exit $ret
 
@@ -753,35 +753,35 @@ The same patch as above, using github might look like this:
   % git push origin orange
 
 The orange branch has been pushed to GitHub, so you should now send an
-email (see L</SUBMITTING A PATCH>) with a description of your changes
+email (see L</Submitting a patch>) with a description of your changes
 and the following information:
 
   http://github.com/USERNAME/perl/tree/orange
-  git@github.com:USERNAME/perl.git branch orange
+  git://github.com/USERNAME/perl.git branch orange
 
 =head1 Merging from a branch via GitHub
 
 If someone has provided a branch via GitHub and you are a committer,
 you should use the following in your perl-ssh directory:
 
-  % git remote add dandv git://github.com/dandv/perl.git
-  % git fetch dandv
+  % git remote add avar git://github.com/avar/perl.git
+  % git fetch avar
 
 Now you can see the differences between the branch and blead:
 
-  % git diff dandv/blead
+  % git diff avar/orange
 
 And you can see the commits:
 
-  % git log dandv/blead
+  % git log avar/orange
 
 If you approve of a specific commit, you can cherry pick it:
 
-  % git cherry-pick 3adac458cb1c1d41af47fc66e67b49c8dec2323f
+  % git cherry-pick 0c24b290ae02b2ab3304f51d5e11e85eb3659eae
 
 Or you could just merge the whole branch if you like it all:
 
-  % git merge dandv/blead
+  % git merge avar/orange
 
 And then push back to the repository:
 
@@ -867,7 +867,8 @@ not allowed.)
 
 =head1 Committing to maintenance versions
 
-Maintenance versions should only be altered to add critical bug fixes.
+Maintenance versions should only be altered to add critical bug
+fixes, see L<perlpolicy>.
 
 To commit to a maintenance version of perl, you need to create a local
 tracking branch:
@@ -897,9 +898,18 @@ C<.git/info/grafts> file:
 It is particularly important to have this graft line if any bisecting
 is done in the area of the "merge" in question.
 
+=head1 SEE ALSO
 
+=over
 
-=head1 SEE ALSO
+=item *
+
+The git documentation, accessible via the C<git help> command
 
-The git documentation, accessible via C<git help command>.
+=item *
+
+L<perlpolicy> - Perl core development policy
+
+=back
 
+=cut