summaryrefslogtreecommitdiff
path: root/pod
diff options
context:
space:
mode:
authorLeon Brocard <acme@astray.com>2009-07-29 14:34:23 +0100
committerLeon Brocard <acme@astray.com>2009-07-29 14:34:23 +0100
commit6a7cbfe84d801c67d9433db81b4574dd7859d010 (patch)
treeb0fda995511dcbeeb6fdbe6795de6525ee0399aa /pod
parentbc35a5dd94a524c65157dbded866914c8d8d2168 (diff)
downloadperl-6a7cbfe84d801c67d9433db81b4574dd7859d010.tar.gz
podtidy
Diffstat (limited to 'pod')
-rw-r--r--pod/perlrepository.pod27
1 files changed, 14 insertions, 13 deletions
diff --git a/pod/perlrepository.pod b/pod/perlrepository.pod
index 97080d471e..0ab8a71aef 100644
--- a/pod/perlrepository.pod
+++ b/pod/perlrepository.pod
@@ -16,9 +16,9 @@ different ways.
The full repository takes up about 80MB of disk space. A check out of
the blead branch (that is, the main development branch, which contains
-bleadperl, the development version of perl 5) takes up about 160MB of disk
-space (including the repository). A build of bleadperl takes up about 200MB
-(including the repository and the check out).
+bleadperl, the development version of perl 5) takes up about 160MB of
+disk space (including the repository). A build of bleadperl takes up
+about 200MB (including the repository and the check out).
=head1 GETTING ACCESS TO THE REPOSITORY
@@ -98,13 +98,14 @@ to push your changes back with the C<camel> remote:
The C<fetch> command just updates the C<camel> refs, as the objects
themselves should have been fetched when pulling from C<origin>.
-The committers have access to 2 servers that serve perl5.git.perl.org. One is
-camel.booking.com, which is the 'master' repository. The perl5.git.perl.org IP
-address also lives on this machine. The second one is dromedary.booking.com,
-which can be used for general testing and development. Dromedary syncs the git
-tree from camel every few minutes, you should not push there. Both machines
-also have a full CPAN mirror. To share files with the general public, dromedary
-serves your ~/public_html/ as http://users.perl5.git.perl.org/~yourlogin/
+The committers have access to 2 servers that serve perl5.git.perl.org.
+One is camel.booking.com, which is the 'master' repository. The
+perl5.git.perl.org IP address also lives on this machine. The second
+one is dromedary.booking.com, which can be used for general testing and
+development. Dromedary syncs the git tree from camel every few minutes,
+you should not push there. Both machines also have a full CPAN mirror.
+To share files with the general public, dromedary serves your
+~/public_html/ as http://users.perl5.git.perl.org/~yourlogin/
=head1 OVERVIEW OF THE REPOSITORY
@@ -256,9 +257,9 @@ that you're on the I<blead> branch, and your repository is up to date:
% git checkout blead
% git pull
-It's preferable to patch against the latest blead version, since
-this is where new development occurs for all changes other than critical
-bug fixes. Critical bug fix patches should be made against the relevant
+It's preferable to patch against the latest blead version, since this
+is where new development occurs for all changes other than critical bug
+fixes. Critical bug fix patches should be made against the relevant
maint branches, or should be submitted with a note indicating all the
branches where the fix should be applied.