change COMBINED_DISPLAY_MODE help text

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index fe711d1a90f2adb86a5ecee3ff6c2ee6da2e2dae..ba97aac3cd4f983b9b12a2708a72c59db4b9d66a 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -220,7 +220,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HEADLINES_SMART_DATE', 1, 'true', 'Use more accessible date/time format for headlines',3);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display, no headline/article separation',2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
+       'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 create table ttrss_user_prefs (
    owner_uid integer not null,

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 758c6f664ef0fd4e84af0df361462d6fe4479c02..080f990e9b3553b3e49acbb75529caab57d9e89d 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -200,7 +200,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('HEADLINES_SMART_DATE', 1, 'true', 'Use more accessible date/time format for headlines',3);
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display, no headline/article separation',2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
+       'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 create table ttrss_user_prefs (
        owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,

diff --git a/schema/upgrade-1.1-1.1.1-mysql.sql b/schema/upgrade-1.1-1.1.1-mysql.sql
index c7f96fa1b7c13746826690efc73915762b31fdad..1c26bd8f34fba80218be731b1663646f3451ec6b 100644 (file)
--- a/schema/upgrade-1.1-1.1.1-mysql.sql
+++ b/schema/upgrade-1.1-1.1.1-mysql.sql
@@ -7,6 +7,7 @@ update ttrss_entries set num_comments = 0;
 alter table ttrss_entries change num_comments num_comments integer not null;
 alter table ttrss_entries alter column num_comments set default 0;
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display, no headline/article separation',2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
+       'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 commit;

diff --git a/schema/upgrade-1.1-1.1.1-pgsql.sql b/schema/upgrade-1.1-1.1.1-pgsql.sql
index 4ad609949d996d9b56569f587b879f496095c09c..4645809c67abf5250c45f7dc2f59f269aaeae7d5 100644 (file)
--- a/schema/upgrade-1.1-1.1.1-pgsql.sql
+++ b/schema/upgrade-1.1-1.1.1-pgsql.sql
@@ -7,6 +7,7 @@ update ttrss_entries set num_comments = 0;
 alter table ttrss_entries alter column num_comments set not null;
 alter table ttrss_entries alter column num_comments set default 0;
 
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display, no headline/article separation',2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('COMBINED_DISPLAY_MODE', 1, 'false', 'Combined feed display',2,
+       'Display expanded list of feed articles, instead of separate displays for headlines and article content');
 
 commit;