diff --git a/ChangeLog b/ChangeLog index 5a8921a7a..886236e16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-10 Vladimir Serbinenko + + * docs/grub-dev.texi: Replace bzr references with git ones. + 2013-11-10 Andrey Borzenkov * docs/grub.texi (Simple configuration): Remove reference to diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi index 6caec7896..401f455a3 100644 --- a/docs/grub-dev.texi +++ b/docs/grub-dev.texi @@ -79,7 +79,6 @@ This edition documents version @value{VERSION}. * Contributing Changes:: * Porting:: * Error Handling:: -* CIA:: * BIOS port memory map:: * Video Subsystem:: * PFF2 Font File Format:: @@ -92,24 +91,36 @@ This edition documents version @value{VERSION}. @node Getting the source code @chapter Getting the source code -GRUB is maintained using the @uref{http://bazaar-vcs.org/, Bazaar revision -control system}. To fetch the primary development branch: +GRUB is maintained using the @uref{GIT revision +control system}. To fetch: @example -bzr get http://bzr.savannah.gnu.org/r/grub/trunk/grub +git clone git://git.sv.gnu.org/grub.git @end example -The GRUB developers maintain several other branches with work in progress. -Of these, the most interesting is the experimental branch, which is a -staging area for new code which we expect to eventually merge into trunk but -which is not yet ready: - +Web access is available under @example -bzr get http://bzr.savannah.gnu.org/r/grub/branches/experimental +http://git.savannah.gnu.org/cgit/grub.git/ @end example -Once you have used @kbd{bzr get} to fetch an initial copy of a branch, you -can use @kbd{bzr pull} to keep it up to date. If you have modified your +The branches available are: + +@table @samp +@item master + Main developpement branch. +@item grub-legacy + GRUB 0.97 codebase. Kept for reference and legal reasons +@item multiboot + Multiboot specfication +@item multiboot2 + Multiboot2 specfication +@item developper branches + Prefixed with developper name. Every developper of a team manages his own branches. + Developper branches do not need changelog entries. +@end table + +Once you have used @kbd{git clone} to fetch an initial copy of a branch, you +can use @kbd{git pull} to keep it up to date. If you have modified your local version, you may need to resolve conflicts when pulling. @node Coding style @@ -334,10 +345,10 @@ anymore. @itemize @item Always use latest GRUB 2 source code. So get that first. -For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a Bazaar (bzr) repository. +For developers it is recommended always to use the newest development version of GRUB 2. If development takes a long period of time, please remember to keep in sync with newest developments regularly so it is much easier to integrate your change in the future. GRUB 2 is being developed in a GIT repository. -Please check Savannah's GRUB project page for details how to get newest bzr: -@uref{http://savannah.gnu.org/bzr/?group=grub, GRUB 2 bzr Repository} +Please check Savannah's GRUB project page for details how to get newest git: +@uref{https://savannah.gnu.org/git/?group=grub, GRUB 2 git Repository} @item Compile it and try it out. @@ -895,34 +906,6 @@ if (grub_errno != GRUB_ERR_NONE) grub_error_pop (); @end example -@node CIA -@chapter CIA -@c By Robert Millan and Carles Pina -If you have commit access, please setup CIA in your Bazaar -config so those in IRC receive notification of your commits. - -In @file{~/.bazaar/bazaar.conf}, add "cia_send_revno = true". -Optionally, you can also add "cia_user = myusername" if you'd -like CIA service to use a specific account (for statistical purpose). - -In the @file{.bzr/branch/branch.conf} of your checkout branch, -"set nickname = /path_to_this_branch" and "cia_project = GNU GRUB". - -Additionally, please set cia_send_revno in the [DEFAULT] section -of your @file{~/.bazaar/bazaar.conf}. E.g.: - -@example -[DEFAULT] -cia_send_revno = true -@end example - -Remember to install cia-clients (Debian/Ubuntu package) to be able to use CIA. - -Keep in mind Bazaar sends notifications for all commits to branches that have -this setting, regardless of whether they're bound branches (checkouts) or not. -So if you make local commits in a non-bound branch and it bothers you that -others can read them, do not use this setting. - @node BIOS port memory map @chapter BIOS port memory map @c By Yoshinori K Okuji