Re: [RFR] templates://smb2www/{templates}
Christian Perrier wrote:
> Your review should be sent as an answer to this mail.
> + If enabled, smb2www will, by default, allow anyone to browse the network.
[...]
> s/your/the: it is not "my" network. Maybe use "the *local SMB* network"
> which is indeed what will happen when enabling smb2www.
Agreed (and in my patch).
Here and elsewhere it would be good if we could come up with a
single standard way of referring to this that suits both MS-refugee
newbies and protocol-pedants, but nothing occurs to me. I'd say we
should copy appropriate verbiage from the Samba suite, but that
seems to have package descriptions stuck in the early nineties
("LanManager"?)...
> - /usr/share/doc/smb2www/index.html for more information (Especially FAQ 4)
[...]
> + /usr/share/doc/smb2www/index.html for more information (more particularly FAQ 4)
[...]
> I replaced "Especially" but I'm not entirely sure about this. Justin
> will probably comment and propose something better..:)
I'm happy with your version.
> Template: smb2www/need_reconfigure
[...]
> + The current smb2www configuration file `/etc/smb2www/smb2www.conf' contains
> + some variables (such as 'bindir'), which sometimes needs to be changed on
> + package upgrade, and some others (such as 'masterbrowser'), which
> shouldn't.
Some preserved grammar/punctuation glitches; I'd prefer:
some variables (such as 'bindir') which sometimes need to be changed on
package upgrade, and others (such as 'masterbrowser') which
> + For better management of this configuration file, it
> + has been split in two parts:
> + /usr/share/smb2www/smb2www.default and /etc/smb2www/smb2www.conf. The
> + former will be overwritten on each upgrade whilethe latter remains unchanged.
Typo: ^
Oh, and I notice the templates quote things inconsistently like
`this' or 'this' - standardising on 'this'.
> Package: smb2www
[...]
> -Description: A Windows Network client that is accessible through a web browser
> - With this package you will be able to browse a Windows Network using a
> - standard web browser. It is based upon the samba package.
> +Description: SMB/CIFS network client with a web interface
>
> technically speaking, this is about browsing a SMB network. This often
> reduces to a Windows network, but of course not only.
>
> Avoid a sentence by using "with a web interface"
Well, "a foo that is bar" is technically still just a noun phrase
("a Windows Network client that is accessible through a web
browser... would be nice"; that's a sentence). But yours is a
better noun phrase.
> + This package allows browsing a SMB/CIFS-based network (such as
> + a Windows-based network by using a
> + standard web browser. It uses Samba libraries.
Unclosed parentheses. How about:
This package allows browsing a SMB/CIFS-based network (such as
a Windows Workgroup or Domain) via a standard web browser. It
uses Samba libraries.
--
JBR
Ankh kak! (Ancient Egyptian blessing)
--- ../smb2www.old/debian/templates 2007-10-29 10:47:47.000000000 +0000
+++ debian/templates 2007-11-06 17:11:13.000000000 +0000
@@ -1,28 +1,25 @@
Template: smb2www/security
Type: note
-_Description: smb2www is DISABLED by default
- If enabled, by default smb2www will allow anyone to browse your network.
- .
- Probably this is not what you want to happen. Please modify your web
- server configuration to suit. Please read
- /usr/share/doc/smb2www/index.html for more information (Especially FAQ 4)
- on how to do this for Apache.
+_Description: smb2www disabled by default
+ If enabled, smb2www will, by default, allow anyone to browse the local
+ SMB network.
+ .
+ As this may have security consequences, it is disabled by default and you
+ should modify the web
+ server configuration to enable smb2www securely. Please read
+ /usr/share/doc/smb2www/index.html for more information (more particularly FAQ 4)
+ about such configuration for Apache.
Template: smb2www/set_link
Type: boolean
Default: false
_Description: Do you want to enable smb2www?
- Turn this option on if you want to enable smb2www.
- .
- Note that you can enable smb2www at any time by running
- dpkg-reconfigure smb2www
- command.
Template: smb2www/master_browser
Type: string
Default: localhost
_Description: Master browser server:
- Please enter name of the server which will be used by smb2www as a master
+ Please enter the name of the server which will be used by smb2www as a master
browser.
Template: smb2www/language
@@ -34,10 +31,10 @@
# them, and have to simply choose a msgstr among the English values
# listed in the Choices field above, e.g. msgstr "Dutch"
_Default: English[ default language ]
-_Description: Language in which smb2www will generate its pages:
+_Description: Language for smb2www pages:
Smb2www can generate its HTML pages in several languages.
.
- Please choose one of them.
+ Please choose the language you want to use on generated pages.
Template: smb2www/need_reconfigure
Type: boolean
@@ -49,23 +46,22 @@
Template: smb2www/replace_config
Type: boolean
Default: true
-_Description: Do you want to install new version of config file?
- Current smb2www configuration file `/etc/smb2www/smb2www.conf' contains
- some variables (e.g. `bindir'), which sometimes needs to be changed on
- package upgrade, and some variables (like `masterbrowser'), which
+_Description: Install a new version of the configuration file?
+ The current smb2www configuration file '/etc/smb2www/smb2www.conf' contains
+ some variables (such as 'bindir') which sometimes need to be changed on
+ package upgrade, and others (such as 'masterbrowser') which
shouldn't.
.
- It's very hard to maintain such file, so for better management of smb2www
- upgrades,
- the file has been split into two files:
- `/usr/share/smb2www/smb2www.default' and `/etc/smb2www/smb2www.conf'. The
- former will be overwritten on each upgrade, the latter - will not.
+ For better management of this configuration file, it
+ has been split in two parts:
+ /usr/share/smb2www/smb2www.default and /etc/smb2www/smb2www.conf. The
+ former will be overwritten on each upgrade while the latter remains unchanged.
Variables defined in the latter file will override variables defined in
the former.
.
- Your current smb2www config file will be saved as
- `/etc/smb2www/smb2www.conf.saved_by_postinst'
+ The current smb2www config file will be saved as
+ '/etc/smb2www/smb2www.conf.saved_by_postinst'
.
- If you don't choose this option, smb2www probably will not work. In that case please
- compare your config file with `/usr/share/smb2www/smb2www.default', and
+ If you don't choose this option, smb2www will probably not work. You should
+ compare the configuration file with '/usr/share/smb2www/smb2www.default', and
adjust it as needed.
--- ../smb2www.old/debian/control 2007-10-29 10:47:47.000000000 +0000
+++ debian/control 2007-11-06 09:56:54.000000000 +0000
@@ -8,6 +8,7 @@
Package: smb2www
Architecture: all
Depends: smbclient, ${perl:Depends}, ${misc:Depends}, apache2|httpd-cgi
-Description: A Windows Network client that is accessible through a web browser
- With this package you will be able to browse a Windows Network using a
- standard web browser. It is based upon the samba package.
+Description: SMB/CIFS network client with a web interface
+ This package allows browsing a SMB/CIFS-based network (such as
+ a Windows Workgroup or Domain) via a standard web browser. It
+ uses Samba libraries.
Template: smb2www/security
Type: note
_Description: smb2www disabled by default
If enabled, smb2www will, by default, allow anyone to browse the local
SMB network.
.
As this may have security consequences, it is disabled by default and you
should modify the web
server configuration to enable smb2www securely. Please read
/usr/share/doc/smb2www/index.html for more information (more particularly FAQ 4)
about such configuration for Apache.
Template: smb2www/set_link
Type: boolean
Default: false
_Description: Do you want to enable smb2www?
Template: smb2www/master_browser
Type: string
Default: localhost
_Description: Master browser server:
Please enter the name of the server which will be used by smb2www as a master
browser.
Template: smb2www/language
Type: select
__Choices: English, Czech, Dutch, Finnish, French, Polish, Spanish, Swedish, Vietnamese
# You must NOT translate this string, but you can change its value.
# The comment between brackets is used to distinguish this msgid
# from the one in the Choices list; you do not have to worry about
# them, and have to simply choose a msgstr among the English values
# listed in the Choices field above, e.g. msgstr "Dutch"
_Default: English[ default language ]
_Description: Language for smb2www pages:
Smb2www can generate its HTML pages in several languages.
.
Please choose the language you want to use on generated pages.
Template: smb2www/need_reconfigure
Type: boolean
Default: false
Description: for internal use
This is an INTERNAL option. If you see it while configuring the package,
please file a bug report against smb2www.
Template: smb2www/replace_config
Type: boolean
Default: true
_Description: Install a new version of the configuration file?
The current smb2www configuration file '/etc/smb2www/smb2www.conf' contains
some variables (such as 'bindir') which sometimes need to be changed on
package upgrade, and others (such as 'masterbrowser') which
shouldn't.
.
For better management of this configuration file, it
has been split in two parts:
/usr/share/smb2www/smb2www.default and /etc/smb2www/smb2www.conf. The
former will be overwritten on each upgrade while the latter remains unchanged.
Variables defined in the latter file will override variables defined in
the former.
.
The current smb2www config file will be saved as
'/etc/smb2www/smb2www.conf.saved_by_postinst'
.
If you don't choose this option, smb2www will probably not work. You should
compare the configuration file with '/usr/share/smb2www/smb2www.default', and
adjust it as needed.
Source: smb2www
Section: net
Priority: optional
Maintainer: Robert Luberda <robert@debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5.0.57), po4a (>= 0.22)
Package: smb2www
Architecture: all
Depends: smbclient, ${perl:Depends}, ${misc:Depends}, apache2|httpd-cgi
Description: SMB/CIFS network client with a web interface
This package allows browsing a SMB/CIFS-based network (such as
a Windows Workgroup or Domain) via a standard web browser. It
uses Samba libraries.
Reply to: