[DRE-commits] [diaspora-installer] 03/05: update debconf templates and description

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 64efd67a7d3d39934fe1a0cb60c8f543cf1f29be
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Mar 24 09:41:56 2015 +0530

    update debconf templates and description
---
 debian/changelog |  4 +++-
 debian/control   | 13 +++++++------
 debian/templates | 19 +++++++++++--------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f60d87a..316b601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 diaspora-installer (0.3) UNRELEASED; urgency=medium
 
   * Move to contrib (Closes: #779812)
-  * Add wget to depends (Closes: #779868) 
+  * Add wget to depends (Closes: #779868)
+  * Update templates and descriptions (Closes: #779898)
+    - Thanks to Christian Perrier and Justin B Rye for the review
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 24 Mar 2015 09:16:44 +0530
 
diff --git a/debian/control b/debian/control
index daa48a9..7bb0cb0 100644
--- a/debian/control
+++ b/debian/control
@@ -45,16 +45,16 @@ Description: distributed social networking service - installer
  distributed Diaspora social network.
  .
  Diaspora is intended to address privacy concerns related to centralized
- social networks by allowing users set up their own server (or "pod") to
+ social networks by allowing users to set up their own server (or "pod") to
  host content; pods can then interact to share status updates, photographs,
  and other social data. It allows its users to host their data with a
  traditional web host, a cloud-based host, an ISP, or a friend. The framework,
  which is being built on Ruby on Rails, is free software and can be
  experimented with by external developers.
  .
- Learn more about diaspora at http://diasporafoundation.org
+ Learn more about Diaspora at http://diasporafoundation.org
  .
- This package helps install diaspora using rubygems.
+ This package helps to install Diaspora using rubygems.
 
 Package: diaspora-common
 Architecture: all
@@ -87,13 +87,14 @@ Description: distributed social networking service - common files
  distributed Diaspora social network.
  .
  Diaspora is intended to address privacy concerns related to centralized
- social networks by allowing users set up their own server (or "pod") to
+ social networks by allowing users to set up their own server (or "pod") to
  host content; pods can then interact to share status updates, photographs,
  and other social data. It allows its users to host their data with a
  traditional web host, a cloud-based host, an ISP, or a friend. The framework,
  which is being built on Ruby on Rails, is free software and can be
  experimented with by external developers.
  .
- Learn more about diaspora at http://diasporafoundation.org
+ Learn more about Diaspora at http://diasporafoundation.org
  .
- This package provides files common between diaspora and diaspora-installer.
+ This package provides files common for the diaspora and diaspora-installer
+ packages.
diff --git a/debian/templates b/debian/templates
index 69d20b8..0a2faa1 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,12 +1,15 @@
 Template: diaspora-installer/url
 Type: string
 Default: localhost
-_Description: hostname for your diaspora instance:
- Set the hostname of the machine you're running Diaspora on, as seen
- from the internet. This should be the domain name you want to use to
- access the pod. So if you plan to use a reverse proxy, it should be
- the hostname the proxy listens on. DO NOT CHANGE THIS AFTER INITIAL SETUP!
- If you do change the hostname, you will have to start again as the hostname
- will be hardcoded into the database.
+_Description: Host name for this instance of Diaspora:
+ Please choose the host name which should be used to access this
+ instance of Diaspora.
  .
- Examples: example.com, pod.example.com etc
+ This should be the fully qualified name as seen from the Internet, with
+ the domain name that will be used to access the pod.
+ .
+ If a reverse proxy is used, give the hostname that the proxy server
+ responds to.
+ .
+ This host name should not be modified after the initial setup because
+ it is hard-coded in the database.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git