* commands/gptsync.c (grub_cmd_gptsync): Fix typos.

(GRUB_MOD_INIT): Fix capitalisation.
* docs/grub.texi (Command-line and menu entry commands): Document
gettext and gptsync commands.

diff --git a/ChangeLog b/ChangeLog
index d88c510eb8e48c63acf3acc2069d0245a9f4ad45..9c11b2fa98757b4c83b4fc93924755f8d748e18a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+       * commands/gptsync.c (grub_cmd_gptsync): Fix typos.
+       (GRUB_MOD_INIT): Fix capitalisation.
+       * docs/grub.texi (Command-line and menu entry commands): Document
+       gettext and gptsync commands.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
        * conf/any-emu.rmk (kernel_img_SOURCES) [!x86]: Include

diff --git a/commands/gptsync.c b/commands/gptsync.c
index d217b5d5c4be2f67ec7da280f91a732f7a23200e..6364c13f77c4f3a48ab5f1198d647993bbd38ff6 100644 (file)
--- a/commands/gptsync.c
+++ b/commands/gptsync.c
@@ -138,8 +138,8 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
        {
          grub_device_close (dev);
          return grub_error (GRUB_ERR_OUT_OF_RANGE,
-                            "only partitions resding in the first 2TB "
-                            "can be presen in hybrid MBR");
+                            "only partitions residing in the first 2TB "
+                            "can be present in hybrid MBR");
        }
 
 
@@ -243,8 +243,8 @@ GRUB_MOD_INIT(gptsync)
   cmd = grub_register_command ("gptsync", grub_cmd_gptsync,
                               N_("DEVICE [PARTITION[+/-[TYPE]]] ..."),
                               N_("Fill hybrid MBR of GPT drive DEVICE. "
-                              "specified partitions will be a part "
-                              "of hybrid mbr. Up to 3 partitions are "
+                              "Specified partitions will be a part "
+                              "of hybrid MBR. Up to 3 partitions are "
                               "allowed. TYPE is an MBR type. "
                               "+ means that partition is active. "
                               "Only one partition can be active."));

diff --git a/docs/grub.texi b/docs/grub.texi
index bcc05c1f8428cfda29a201a95e3e301195635252..52aca3fbd1f5ab8cfa3a3eb502b3d408566b1055 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1139,6 +1139,8 @@ you forget a command, you can run the command @command{help}
 * date::                        Display or set current date and time
 * echo::                        Display a line of text
 * export::                      Export an environment variable
+* gettext::                     Translate a string
+* gptsync::                     Fill an MBR based on GPT entries
 * halt::                        Shut down your computer
 * help::                        Show help messages
 * insmod::                      Insert a module
@@ -1320,6 +1322,38 @@ to subsidiary configuration files loaded using @command{configfile}.
 @end deffn
 
 
+@node gettext
+@subsection gettext
+
+@deffn Command gettext string
+Translate @var{string} into the current language.
+
+The current language code is stored in the @samp{lang} variable in GRUB's
+environment.  Translation files in MO format are read from
+@samp{locale_dir}, usually @file{/boot/grub/locale}.
+@end deffn
+
+
+@node gptsync
+@subsection gptsync
+
+@deffn Command gptsync device [partition[+/-[type]]] @dots{}
+Disks using the GUID Partition Table (GPT) also have a legacy Master Boot
+Record (MBR) partition table for compatibility with the BIOS and with older
+operating systems.  The legacy MBR can only represent a limited subset of
+GPT partition entries.
+
+This command populates the legacy MBR with the specified @var{partition}
+entries on @var{device}.  Up to three partitions may be used.
+
+@var{type} is an MBR partition type code; prefix with @samp{0x} if you want
+to enter this in hexadecimal.  The separator between @var{partition} and
+@var{type} may be @samp{+} to make the partition active, or @samp{-} to make
+it inactive; only one partition may be active.  If both the separator and
+type are omitted, then the partition will be inactive.
+@end deffn
+
+
 @node halt
 @subsection halt