[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [RFR] templates://console-common/{templates.in}



Christian Perrier wrote:
> Your review should be sent as an answer to this mail.


> + The keymap configuration tool has been setup not to touch an existing
> + keymap.

The noun is "a setup", the verb is "to set   up".

> - However, you have file(s) that were recognized as boot-time keymaps by
> - older versions of the console utilities, either in /etc/kbd/ or in
> - /etc/console-tools/, named default.kmap(.gz) and these are now ignored.
> + However, some 'default.kmap(.gz)' file(s), that were recognized as
> + boot-time keymaps by older versions of the console utilities, exist
> + either in /etc/kbd/ or in /etc/console-tools/.
> 
> "you have files" seems to personal for me. Let's be more neutral.

It needed some work; but it's intended to call attention to the
files, and saying "some files [...passive relative clause...] exist"
is *too* neutral.  How about:

    However, there are some 'default.kmap(.gz)' file(s) either in
    /etc/kbd/ or in /etc/console-tools/. These were recognized as
    boot-time keymaps by older versions of the console utilities but
    are now ignored.

>   If you wish that one of them takes effect on next reboot, you will have to
>   move it to /etc/console/boottime.kmap.gz manually.

While I'm at it I'll change that to "wish one of these to take
effect".

>  Template: console-data/keymap/template/layout
...
> + In order to refine the keymap choice, please mention the
> + physical layout of the keyboard.

s/mention/select/

>  Template: console-data/keymap/template/variant
...
> + The selected layout has several variants. Please select the one
> + matching the keyboard.

This avoidance of "your keyboard" gets a bit awkward, but I can't
find anything better.
 
>  Template: console-data/keymap/template/keymap
...
>  _Description: Keymap:
> - The keyboard you selected allows you to choose among several keymaps.
> + The selected keyboard allows to choose among several keymaps.

Sorry, that object-elision is the one that allow doesn't allow!

    The selected keyboard allows a choice from a range of keymaps.

>   Usually these were designed either for specific tastes (eg. dead keys or
>   not), or for specific needs (eg. programmer's keymaps).

Rephrase without the oddly-punctuated Latin and dodgy possessive:

    Usually these were designed either for specific tastes (for instance
    with dead keys) or for specific needs (such as programming).

> - If you use a keyboard from a different computer architecture, you can
> + If the keyboard is designd for a different computer architecture, you should
                       designed
>   choose a specific keymap in the full map.

And just one control file tweak, the usual:
>  Package: dh-consoledata
...
>  This package allows to build consistent packages of data-files for the
>  Linux text console.

Say it "assists in building" them.
-- 
JBR
Ankh kak! (Ancient Egyptian blessing)
--- ../console-common.old/debian/templates.in	2006-09-19 19:34:24.000000000 +0100
+++ debian/templates.in	2007-06-24 19:51:59.000000000 +0100
@@ -27,15 +27,15 @@
 Template: console-data/keymap/ignored
 Type: note
 _Description: Ignored boot-time keymap in an old location
- You have asked the keymap configuration tool not to touch an existing
- keymap you installed, or you asked for higher-priority questions only to
- be asked and the tool decided not to mess with your existing setup.
+ The keymap configuration tool has been set up not to touch an existing
+ keymap.
  .
- However, you have file(s) that were recognized as boot-time keymaps by
- older versions of the console utilities, either in /etc/kbd/ or in
- /etc/console-tools/, named default.kmap(.gz) and these are now ignored.
+ However, there are some 'default.kmap(.gz)' file(s) either in
+ /etc/kbd/ or in /etc/console-tools/. These were recognized as
+ boot-time keymaps by older versions of the console utilities but
+ are now ignored.
  .
- If you wish that one of them takes effect on next reboot, you will have to
+ If you wish one of them to take effect on next reboot, you will have to
  move it to /etc/console/boottime.kmap.gz manually.
 
 Template: console-data/keymap/family
@@ -43,54 +43,53 @@
 Choices: ${choices}
 Default: qwerty
 _Description: Keyboard layout family:
- Please specify the generic family name for your keyboard
+ Please specify the generic family name for the keyboard
  layout. Usually, the layout family name is taken from the first keys on the
- left of the top letters row of the keymap (this is at least true for
- qwerty and azerty layouts).
+ left of the top letters row of the keymap.
 
 Template: console-data/keymap/template/layout
 Type: select
 Choices: ${choices}
 _Description: Keyboard layout:
- In order to refine your choice for a keymap, please mention the
- physical layout of your keyboard.
+ In order to refine the keymap choice, please select the
+ physical layout of the keyboard.
 
 Template: console-data/keymap/template/variant
 Type: select
 Choices: ${choices}
 _Description: Keyboard variant:
- The layout you selected has several variants.  Please select the one
- matching your keyboard.
+ The selected layout has several variants. Please select the one
+ matching the keyboard.
 
 Template: console-data/keymap/template/keymap
 Type: select
 Choices: ${choices}
 _Description: Keymap:
- The keyboard you selected allows you to choose among several keymaps.
- Usually these were designed either for specific tastes (eg. dead keys or
- not), or for specific needs (eg. programmer's keymaps).
+ The selected keyboard allows a choice from a range of keymaps.
+ Usually these were designed either for specific tastes (for instance
+ with dead keys) or for specific needs (such as programming).
 
 Template: console-data/keymap/full
 Type: select
 Choices: ${choices}
 _Description: Keymap:
- If you use a keyboard from a different computer architecture, you can
+ If the keyboard is designed for a different computer architecture, you should
  choose a specific keymap in the full map.
 
 Template: console-data/keymap/powerpcadb
 Type: boolean
 _Description: Are you ready for the ADB keycodes transition?
  The kernel is configured to have the keyboard send ADB keycodes. This
- behaviour is now deprecated and no longer supported by Debian.
+ behaviour is now deprecated and no longer supported.
  .
- For best results you should reconfigure your kernel with
- CONFIG_MAC_ADBKEYCODES=n. If you can't or don't want to do this for some
- reason, pass keyboard_sends_linux_keycodes=1 as an argument to the kernel.
+ For best results, you should reconfigure the kernel with
+ CONFIG_MAC_ADBKEYCODES=n. Alternatively, you can pass
+ 'keyboard_sends_linux_keycodes=1' as an argument to the kernel.
  .
- Beware that the transition will most probably break your X configuration
- so it is strongly recommended that you exit all X sessions now and adapt
- your configuration afterwards (start "dpkg-reconfigure console-data" as
- root).
+ Please be aware that the transition will most probably break the X
+ configuration, so it is strongly recommended to close all X sessions
+ now and adapt the configuration afterwards by running
+ 'dpkg-reconfigure console-data'.
 
 Template: console-data/bootmap-md5sum
 Type: string
--- ../console-common.old/debian/control	2006-09-19 18:46:04.000000000 +0100
+++ debian/control	2007-06-24 19:46:33.000000000 +0100
@@ -13,9 +13,9 @@
 Depends: debianutils (>= 1.13), console-data, kbd | console-tools (>=1:0.2.3dbs-54), lsb-base (>= 3.0)
 Conflicts: console-data (<< 1999.08.29-20)
 Replaces: console-tools (<< 1:0.2.3-18), kbd (<< 0.99-12), console-data (<< 1999.08.29-18)
-Description: Basic infrastructure for text console configuration
+Description: basic infrastructure for text console configuration
  This package contains the install-keymap(8) utility, which is the
- official way to specify a boot-time keymap to the system, as well
+ recommended tool to specify a boot-time keymap to the system, as well
  as tools for internal use of keymap-providing packages.
 
 Package: dh-consoledata
@@ -24,6 +24,6 @@
 Architecture: all
 Depends: debhelper (>> 2)
 Enhances: debhelper
-Description: Debhelper-based script to help packaging console data file
- This package allows to build consistent packages of data-files for the
- Linux text console (keymaps for now, later fonts and others).
+Description: debhelper-based script to help packaging console data files
+ This package assists in building consistent packages of data-files for the
+ Linux text console.
Template: console-data/keymap/policy
Type: select
__Choices: Select keymap from arch list, Don't touch keymap, Keep kernel keymap, Select keymap from full list
Default: Don't touch keymap
_Description: Policy for handling keymaps:
 The keymap describes how keys are laid out on your keyboard, and what
 symbols (letters, digits, etc.) are drawn on them.
 .
 "Select keymap from arch list" will allow you to select one of the
 predefined keymaps specific for your architecture - you will most likely
 want this unless you have a USB keyboard.
 .
 "Don't touch keymap" will prevent the configuration system from
 overwriting the keymap you have in /etc/console.  Select this if you want
 to keep a keymap you obtained through other means.  Please remember to
 install new keymaps with install-keymap(8) if you select this choice.
 .
 "Keep kernel keymap" will prevent any keymap from being loaded next time
 your system boots.  It will remove from /etc/console any keymap you may
 have already selected (it will be lost), but if you have already loaded a
 keymap, it cannot be changed back until you reboot.
 .
 "Select keymap from full list" offers a full listing of all predefined
 keymaps.  You want this, if you use an USB keyboard from a different
 computer architecture or if you use an adapter to use such a keyboard.

Template: console-data/keymap/ignored
Type: note
_Description: Ignored boot-time keymap in an old location
 The keymap configuration tool has been set up not to touch an existing
 keymap.
 .
 However, there are some 'default.kmap(.gz)' file(s) either in
 /etc/kbd/ or in /etc/console-tools/. These were recognized as
 boot-time keymaps by older versions of the console utilities but
 are now ignored.
 .
 If you wish one of them to take effect on next reboot, you will have to
 move it to /etc/console/boottime.kmap.gz manually.

Template: console-data/keymap/family
Type: select
Choices: ${choices}
Default: qwerty
_Description: Keyboard layout family:
 Please specify the generic family name for the keyboard
 layout. Usually, the layout family name is taken from the first keys on the
 left of the top letters row of the keymap.

Template: console-data/keymap/template/layout
Type: select
Choices: ${choices}
_Description: Keyboard layout:
 In order to refine the keymap choice, please select the
 physical layout of the keyboard.

Template: console-data/keymap/template/variant
Type: select
Choices: ${choices}
_Description: Keyboard variant:
 The selected layout has several variants. Please select the one
 matching the keyboard.

Template: console-data/keymap/template/keymap
Type: select
Choices: ${choices}
_Description: Keymap:
 The selected keyboard allows a choice from a range of keymaps.
 Usually these were designed either for specific tastes (for instance
 with dead keys) or for specific needs (such as programming).

Template: console-data/keymap/full
Type: select
Choices: ${choices}
_Description: Keymap:
 If the keyboard is designed for a different computer architecture, you should
 choose a specific keymap in the full map.

Template: console-data/keymap/powerpcadb
Type: boolean
_Description: Are you ready for the ADB keycodes transition?
 The kernel is configured to have the keyboard send ADB keycodes. This
 behaviour is now deprecated and no longer supported.
 .
 For best results, you should reconfigure the kernel with
 CONFIG_MAC_ADBKEYCODES=n. Alternatively, you can pass
 'keyboard_sends_linux_keycodes=1' as an argument to the kernel.
 .
 Please be aware that the transition will most probably break the X
 configuration, so it is strongly recommended to close all X sessions
 now and adapt the configuration afterwards by running
 'dpkg-reconfigure console-data'.

Template: console-data/bootmap-md5sum
Type: string
Default: none
Description: for internal use

Source: console-common
Section: utils
Priority: optional
Maintainer: Alastair McKinstry <mckinstry@debian.org>
Uploaders: Wartan Hachaturow <wart@softhome.net>, Christian Perrier <bubulle@debian.org>
Build-Depends-Indep: docbook-to-man, po-debconf
Build-Depends: debhelper (>= 5.0.0)
Standards-Version: 3.7.2

Package: console-common
Architecture: all
Pre-Depends: debconf | debconf-2.0
Depends: debianutils (>= 1.13), console-data, kbd | console-tools (>=1:0.2.3dbs-54), lsb-base (>= 3.0)
Conflicts: console-data (<< 1999.08.29-20)
Replaces: console-tools (<< 1:0.2.3-18), kbd (<< 0.99-12), console-data (<< 1999.08.29-18)
Description: basic infrastructure for text console configuration
 This package contains the install-keymap(8) utility, which is the
 recommended tool to specify a boot-time keymap to the system, as well
 as tools for internal use of keymap-providing packages.

Package: dh-consoledata
Section: devel
Priority: extra
Architecture: all
Depends: debhelper (>> 2)
Enhances: debhelper
Description: debhelper-based script to help packaging console data files
 This package assists in building consistent packages of data-files for the
 Linux text console.

Reply to: