summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2005-12-13 06:58:22 +0100
committerAndrew Dolgov <[email protected]>2005-12-13 06:58:22 +0100
commit30ccc2f1cfee1d3c674c3685e504a34e27da17b0 (patch)
tree0c8445726c8efbb0e76c9ccbfca83ebdaadb1036 /schema
parent386cbf27aa42980ad46322ba59f0ae550a2b9ac7 (diff)
change COMBINED_DISPLAY_MODE help text
Diffstat (limited to 'schema')
-rw-r--r--schema/ttrss_schema_mysql.sql3
-rw-r--r--schema/ttrss_schema_pgsql.sql3
-rw-r--r--schema/upgrade-1.1-1.1.1-mysql.sql3
-rw-r--r--schema/upgrade-1.1-1.1.1-pgsql.sql3
4 files changed, 8 insertions, 4 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index fe711d1a9..ba97aac3c 100644
--- 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 758c6f664..080f990e9 100644
--- 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 c7f96fa1b..1c26bd8f3 100644
--- 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 4ad609949..4645809c6 100644
--- 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;