David Prévot wrote:
> Justin B Rye a écrit :
>> Christian PERRIER wrote:
>>> + Once configured, HotelDruid can be accessed locally at
>>> + http://localhost/hoteldruid.
>
> Maybe the URL should be enclosed in angle brackets, as advised in
> uri(7), so the last dot won't hurt.
Angles are one option, but the first way of "Writing a URI" that
uri(7) recommends is "URIs should be placed inside double quotes" (and
punctuated "logically" with full stops outside the quotes). It's not
clear what authority it claims for advising people to use double
quotes even if they're following a single-quoting stylesheet, but
fortunately the d-l-e house style is double-quoting.
>> _Description: Restrict HotelDruid access to this computer?
>
> Looks like the intent is actually s/to/from/.
The kind of access that's restricted is access *to* this system *from*
other machines. I notice I've ended up eliminating the word
"localhost" - would it fit here?
_Description: Restrict HotelDruid access to localhost?
Notice that it's possible to interpret the "to" here in the sense of
"restricting it as far as just localhost access".
>> The Apache web server can be configured to forbid HotelDruid
>> connections from other computers.
>
> Maybe s/computer/machine/ (seems like there are many browser embedded in
> toys we can hardly call “computers” nowadays). Changed in three places
> in the included patch.
Okay.
>>> + HotelDruid administrator password from the "users management"
> ^
> Spurious space.
I've got a specialised whitespace checker, but I keep forgetting to
use it.
[...]
>> HotelDruid stores its data in /var/lib/hoteldruid.
>
> As advised in uri(7), maybe <file:///var/lib/hoteldruid> (yes, three
> slashes), but it's not very important.
I think this is a job for quotation marks.
>>> + You should deny this option if you have operational information which
>>> + you wish to keep after HotelDruid is removed.
>>
>> I would also suggest s/deny/refuse/, since "deny" makes it sound
>> vaguely as if you're lying about which option you accepted...
>
> Try to remove the useless “you have”:
>
> You should refuse this option if you wish to keep operational
> information after HotelDruid is removed.
The question shouldn't be about my wishes; it's about whether any
such valuable data is in that directory. So maybe we could say:
Refuse this option if there is operational information which should be
kept after HotelDruid is removed.
But by the way:
> diff --git a/hoteldruid.templates b/hoteldruid.templates
what does "diff --git" do, and why don't I see it anywhere in the
documentation for diff? Google isn't helping...
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
Template: hoteldruid/configure-apache
Type: boolean
Default: true
_Description: Automatically configure the Apache web server for HotelDruid?
HotelDruid runs on any web server supporting PHP, but automatic
configuration can only be performed for Apache.
.
Once configured, HotelDruid can be accessed locally at
"http://localhost/hoteldruid";.
.
Please choose whether automatic configuration should be performed now.
Template: hoteldruid/restrict-localhost
Type: boolean
Default: true
_Description: Restrict HotelDruid access to localhost?
The Apache web server can be configured to forbid HotelDruid
connections from other machines.
.
It is recommended to activate this setting if HotelDruid is
going to be used from this machine.
.
Additional access control can be enabled by setting the
HotelDruid administrator password from the "users management"
page. User logins will then become mandatory.
Template: hoteldruid/restart-webserver
Type: boolean
Default: true
_Description: Restart the web server after HotelDruid configuration?
In order to activate the new configuration for HotelDruid,
the web server has to be restarted.
Template: hoteldruid/purgedata
Type: boolean
Default: false
_Description: Purge HotelDuid data when purging the package?
HotelDruid stores its data in "/var/lib/hoteldruid".
.
If you choose this option, these data files will be removed when
the package is purged.
.
Refuse this option if there is operational information which should be
kept after HotelDruid is removed.
diff -ru old/control new/control
--- old/control 2012-07-29 15:28:36.215713293 +0100
+++ new/control 2012-07-31 20:30:59.727392394 +0100
@@ -11,15 +11,16 @@
Depends: ${misc:Depends}, ucf, apache2 | httpd, libapache2-mod-php5 | php5-cgi
| php5,
php5-sqlite (>= 5.3.3)
Suggests: iceweasel | www-browser, php5-mysql | php5-pgsql
-Description: Web-based property management system for your hotel or B&B
- HotelDruid is designed to manage hotel rooms, bed and breakfast apartments
- or any other kind of daily rental, from your browser.
+Description: web-based property management system for hotels or B&Bs
+ HotelDruid is designed to make hotel rooms, bed and breakfast apartments,
+ or any other kind of daily rental easy to manage from a web browser.
.
- Reservations can be assigned to rooms automatically with user defined
- rules. You can create website pages to display and check availability.
- Includes point of sale and statistics reports. Multi-user with groups and
- privileges system. Supports printing, saving and emailing of documents and
- invoices.
+ Main features:
+ * automatic assignment of reservations to rooms by user-defined rules;
+ * creation of public web pages displaying room availability, etc.;
+ * generation of statistical reports;
+ * management of groups and privileges for multi-user operation;
+ * saving, printing, and emailing of documents and invoices.
.
- Written in PHP, by default uses SQLite as its database, with possibility
- to migrate to MySQL or PostgreSQL.
+ It uses an SQLite database by default but can be configured for use
+ with MySQL or PostgreSQL.
diff -ru old/templates new/templates
--- old/templates 2012-07-29 15:28:35.355393427 +0100
+++ new/templates 2012-08-01 04:30:33.560411743 +0100
@@ -1,48 +1,44 @@
Template: hoteldruid/configure-apache
Type: boolean
Default: true
-_Description: Configure automatically the Apache web server?
- HotelDruid runs on any web server supporting PHP, but only the
- Apache web server can be configured automatically.
- .
- With automatic configuration you should be able to access
- HotelDruid with any web browser at http://localhost/hoteldruid
- from this computer.
+_Description: Automatically configure the Apache web server for HotelDruid?
+ HotelDruid runs on any web server supporting PHP, but automatic
+ configuration can only be performed for Apache.
.
- Please select if Apache should now be configured automatically
- for HotelDruid.
+ Once configured, HotelDruid can be accessed locally at
+ "http://localhost/hoteldruid";.
+ .
+ Please choose whether automatic configuration should be performed now.
Template: hoteldruid/restrict-localhost
Type: boolean
Default: true
-_Description: Deny access from other computers?
- Apache web server can be configured to allow connections only
- from this computer (localhost).
- .
- This is always a good idea if you are not going to use HotelDruid
- over the network. Otherwise, once HotelDruid is installed, to
- protect your data it is strongly recommended to enable the
- HotelDruid administrator password from the "users management"
- page, this will make a login required.
+_Description: Restrict HotelDruid access to localhost?
+ The Apache web server can be configured to forbid HotelDruid
+ connections from other machines.
+ .
+ It is recommended to activate this setting if HotelDruid is
+ going to be used from this machine.
.
- Please select if access should be restricted only to connections
- originating from this computer.
+ Additional access control can be enabled by setting the
+ HotelDruid administrator password from the "users management"
+ page. User logins will then become mandatory.
Template: hoteldruid/restart-webserver
Type: boolean
Default: true
-_Description: Should the web server be restarted now?
- In order to activate the new configuration, the reconfigured web
- server has to be restarted.
+_Description: Restart the web server after HotelDruid configuration?
+ In order to activate the new configuration for HotelDruid,
+ the web server has to be restarted.
Template: hoteldruid/purgedata
Type: boolean
Default: false
-_Description: Purge also application data now?
- By default, HotelDruid stores all its data in some files in
- /var/lib/hoteldruid.
- .
- Accepting this option will remove all this data and leave you with a
- tidier system once the HotelDruid package has been removed, but
- may cause information loss if you have operational data in those
- files.
+_Description: Purge HotelDuid data when purging the package?
+ HotelDruid stores its data in "/var/lib/hoteldruid".
+ .
+ If you choose this option, these data files will be removed when
+ the package is purged.
+ .
+ Refuse this option if there is operational information which should be
+ kept after HotelDruid is removed.
