Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	assets/help_text.rs
This commit is contained in:
AB
2021-01-11 11:22:47 +03:00
5 changed files with 36 additions and 18 deletions

View File

@ -1,4 +1,5 @@
static CODE: &str = "<b>Code highlighter</b>
#[allow(dead_code)]
static CODE_HELP: &str = "<b>Code highlighter</b>
<i>Usage</i>
<pre>/code
@ -32,4 +33,11 @@ gruvbox
gruvbox-light
gruvbox-white
zenburn
";
";
#[allow(dead_code)]
pub static SQL_HELP: &str = "<b>Perform an SQL command</b>
<i>* Only one sentence per message.
* Only SELECT command.
* Max result length is 100 lines. Use LIMIT 100.
* SQLITE syntax is available only.</i>";