summaryrefslogtreecommitdiff
path: root/parabola.7.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-21 15:06:40 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-21 15:06:40 -0300
commit2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (patch)
treef168040a0fc7e8e61c93197354938d95454e12a9 /parabola.7.txt
parentabbce1c6720dc3836c1df1337a49768158dff62b (diff)
parent7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.08.21
Conflicts: Makefile
Diffstat (limited to 'parabola.7.txt')
-rw-r--r--parabola.7.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/parabola.7.txt b/parabola.7.txt
index 25c8f9a..7415101 100644
--- a/parabola.7.txt
+++ b/parabola.7.txt
@@ -40,7 +40,7 @@ other things. Note that these settings only apply to the console, and not if you
TIME[[T]]
---------
-The local timezone is configured by symlinking /etc/localtime to the correct zoneinfo file under
+The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under
/usr/share/zoneinfo/. E.g.,
/etc/localtime -> /usr/share/zoneinfo/Europe/Paris
@@ -62,7 +62,7 @@ The package manager, pacman, is configured in /etc/pacman.conf.
BOOTLOADER[[B]]
---------------
-GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.conf
+GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg
MODULES[[M]]
------------