[Pkg-samba-maint] r1070 - in trunk: . po

Wed Jun 14 08:57:46 UTC 2006

On Mon, May 29, 2006 at 06:02:36AM +0000, Christian Perrier wrote:
> Modified: trunk/samba-common.templates
> ===================================================================
> --- trunk/samba-common.templates	2006-05-28 16:50:34 UTC (rev 1069)
> +++ trunk/samba-common.templates	2006-05-29 06:02:33 UTC (rev 1070)
> @@ -1,22 +1,23 @@
>  Template: samba-common/character_set
>  Type: string
>  _Description: Character Set for Unix filesystem
> - You currently have a "character set" configured in your smb.conf.  In
> + The "character set" option is currently configured in smb.conf.  In
>   Samba 3.0, this option is replaced by a new option, "unix charset".
>   Please specify the character set you wish to use for this new option,
>   which controls how Samba interprets filenames on the file system.
>   .
> - If you leave this option blank, your smb.conf will not be changed.
> + If you leave this option blank, the smb.conf file will not be changed.
>  
>  Template: samba-common/codepage
>  Type: string
>  _Description: Character Set for DOS clients
> - You currently have a "client code page" set in your smb.conf.  In Samba
> + The "client code page" option is currently configured in smb.conf.  In Samba
>   3.0, this option is replaced by the option "dos charset".  Please specify
>   the character set you wish to use for this new option.  In most cases, the
>   default chosen for you will be sufficient.  Note that this option is not
> - needed to support Windows clients, it is only for DOS clients.  If you
> - leave this option blank, your smb.conf will not be changed.
> + needed to support Windows clients, it is only for DOS clients.
> + .
> + If you leave this option blank, the smb.conf file will not be changed.

Rather than arguing you with about the appropriateness of these rewordings,
I'm going to drop these templates from the package completely because
they're only used for upgrades from pre-3.0 systems.

[snip]

>  Template: samba-common/workgroup
>  Type: string
> -_Description: Workgroup/Domain Name?
> - This controls what workgroup your server will appear to be in when queried
> +_Description: Workgroup/Domain Name:
> + Please specify the workgroup this server will appear to be in when queried
>   by clients. Note that this parameter also controls the Domain name used
>   with the security=domain setting.

This doesn't read well in English.  I'm planning to replace it with the
following:

  Please specify the workgroup you want this server will appear to be in
  when queried by clients. Note that this parameter also controls the
  domain name used with the security=domain setting.

> @@ -58,9 +58,10 @@
>  Type: boolean
>  Default: true
>  _Description: Use password encryption?
> - Recent Windows clients communicate with SMB servers using encrypted
> + Most Windows clients communicate with SMB servers using encrypted

Why this change from "recent" to "most"?  This seems like a loss of
information to me.  Perhaps "All recent" would be better?  Or spelling out
what the minimum Windows version is that defaults to encrypted passwords
(but that may be too technical)?

>   passwords. If you want to use clear text passwords you will need to change
> - a parameter in your Windows registry. It is recommended that you use
> - encrypted passwords. If you do, make sure you have a valid
> - /etc/samba/smbpasswd file and that you set passwords in there for each
> - user using the smbpasswd command.
> + a parameter in your Windows registry. 
> + .
> + Choosing this option is highly recommended. If you do, make sure you
> + have a valid /etc/samba/smbpasswd file and that you set passwords in
> + there for each user using the smbpasswd command.

Is it really recommended to say "choosing", btw?  I would be inclined to say
"enabling" rather than "choosing" in English.  Then again, I'm also
sleep-deprived right now...

> Modified: trunk/samba.templates
> ===================================================================
> --- trunk/samba.templates	2006-05-28 16:50:34 UTC (rev 1069)
> +++ trunk/samba.templates	2006-05-29 06:02:33 UTC (rev 1070)
> @@ -4,38 +4,39 @@
>  _Description: Create samba password database, /var/lib/samba/passdb.tdb?
>   To be compatible with the defaults in most versions of Windows, Samba must
>   be configured to use encrypted passwords.  This requires user passwords to
> - be stored in a file separate from /etc/passwd. This file can be created
> - automatically, but the passwords must be added manually (by you or the
> - user) by running smbpasswd, and you must arrange to keep it up-to-date in
> - the future.  If you do not create it, you will have to reconfigure samba
> - (and probably your client machines) to use plaintext passwords. See
> - /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc
> - package for more details.
> + be stored in a file separate from /etc/passwd.
> + .
> + This file can be created automatically, but the passwords must be
> + added manually (by running smbpasswd) and be kept up-to-date in the
> + future.  If you do not create it, you will have to reconfigure samba
> + (and probably your client machines) to use plaintext passwords.
> + .
> + See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the
> + samba-doc package for more details.

Ohwell, I don't see the point in making paragraphs this short (the breaks
are not between separate ideas), but otherwise ok.

Hmm, perhaps this would be a better paragraph break:

 To be compatible with the defaults in most versions of Windows, Samba must
 be configured to use encrypted passwords.  This requires user passwords to
 be stored in a file separate from /etc/passwd.  This file can be created
 automatically, but the passwords must be added manually by running
 smbpasswd and be kept up-to-date in the future.
 .
 If you do not create it, you will have to reconfigure samba (and probably
 your client machines) to use plaintext passwords.
 .
 See /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html from the
 samba-doc package for more details.

This also removes the parentheses around "by running smbpasswd", which I
don't think belongs as a parenthetical here.

>  Template: samba/log_files_moved
>  Type: note
> -_Description: Samba's log files have moved.
> - Starting with the first packages of Samba 2.2 for Debian the log files for
> - both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The
> - names of the files are log.nmbd and log.smbd, for nmbd and smbd
> - respectively.
> +_Description: Samba's log files moved
> + The log files for both Samba daemons (nmbd and smbd) are now stored
> + in /var/log/samba/. The names of the files are log.nmbd and log.smbd,
> + for nmbd and smbd respectively.
>   .
> - The old log files that were in /var/log/ will be moved to the new location
> - for you.
> + The old log files from /var/log/ will automatically be moved to
> + the new location.

>  Template: samba/nmbd_from_inetd
>  Type: note
> -_Description: Running nmbd from inetd is no longer supported
> - Your system was previously configured to start nmbd and smbd from inetd. 
> - As of version 2.999+3.0.alpha20-4, nmbd will no longer be started from
> - inetd.  If you have modified your /etc/init.d/samba startup script, you
> - may need to adjust it by hand now so that nmbd will start.
> +_Description: Running nmbd from inetd no longer supported
> + This system was previously configured to start nmbd and smbd from
> + inetd. In recent Samba versions, nmbd cannot be started from inetd.
> + If you have modified your /etc/init.d/samba startup script, you may
> + need to adjust it now so that nmbd will start.

Both obsolete, let's just drop them.

>  Template: samba/run_mode
>  Type: select
>  _Choices: daemons, inetd
>  Default: daemons
> -_Description: How do you want to run Samba?
> +_Description: Samba run method:
>   The Samba daemon smbd can run as a normal daemon or from inetd. Running as
>   a daemon is the recommended approach.

I disagree with this change.  "run method" is not going to be clear to
anyone who doesn't already know what the question is about; I suspect you
made this change only because of your unhealthy bias against the use of
second-person in templates ;)

So I propose to revert this.

> @@ -43,8 +44,10 @@
>  Type: boolean
>  Default: false
>  _Description: Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?
> - Samba 3.0 introduces a newer, more complete SAM database interface which
> - supersedes the /etc/samba/smbpasswd file.  Would you like your existing
> - smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you
> - plan to use another pdb backend (e.g., LDAP) instead, you should answer
> - 'no' here.
> + Samba 3.0 introduced a more complete SAM database interface which
> + supersedes the /etc/samba/smbpasswd file.
> + .
> + Please confirm whether you would like the existing smbpasswd file to
> + be automatically migrated to /var/lib/samba/passdb.tdb.  Do not
> + choose this option if you plan to use another pdb backend (e.g.,
> + LDAP) instead.

Maybe obsolete, need to look into that.

> Modified: trunk/swat.templates
> ===================================================================
> --- trunk/swat.templates	2006-05-28 16:50:34 UTC (rev 1069)
> +++ trunk/swat.templates	2006-05-29 06:02:33 UTC (rev 1070)
> @@ -1,6 +1,6 @@
>  Template: swat/smb_conf_warn
>  Type: note
> -_Description: Your smb.conf will be re-written!
> - SWAT will rewrite your smb.conf file. It will rearrange the entries and
> - delete all comments, include= and copy= options. If you have a carefully
> - crafted smb.conf then back it up or don't use SWAT!
> +_Description: Configuration file rewritten by SWAT
> + SWAT will rewrite the smb.conf file. It will rearrange the entries and
> + delete all comments, include= and copy= options. If you use a carefully
> + crafted smb.conf, you should probably avoid using SWAT.

Well, I would like it if we could just drop this note altogether; I don't
like giving users warning pop-ups when they install a package just because
the package does what it was intended to do...

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
vorlon at debian.org                                   http://www.debian.org/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20060614/37a27904/attachment.pgp