From a9054e05f05ccf58416dc091002313db3c814d2a Mon Sep 17 00:00:00 2001
From: ogorbacheva <ole_gorbushk88@mail.ru>
Date: Tue, 22 Jan 2019 16:21:20 +0300
Subject: [PATCH] Doc fix: edit info about escaping (#4118)

* Doc fix: delete VerticalRaw format and remove escaping from Pretty and Vertical formats

* Doc fix: editing text about escaping

* Doc fix: fix example in pretty format

* Doc fix: fix example in pretty format

* Doc fix: last fixes

* Doc fix: last fixes

* Doc fix
---
 docs/en/interfaces/formats.md | 48 ++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index c47e75142d..eddefaa939 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -14,7 +14,6 @@ The table below lists supported formats and how they can be used in `INSERT` and
 | [CSVWithNames](#csvwithnames) | ✔ | ✔ |
 | [Values](#values) | ✔ | ✔ |
 | [Vertical](#vertical) | ✗ | ✔ |
-| [VerticalRaw](#verticalraw) | ✗ | ✔ |
 | [JSON](#json) | ✗ | ✔ |
 | [JSONCompact](#jsoncompact) | ✗ | ✔ |
 | [JSONEachRow](#jsoneachrow) | ✔ | ✔ |
@@ -345,6 +344,8 @@ Each result block is output as a separate table. This is necessary so that block
 
 [NULL](../query_language/syntax.md) is output as `ᴺᵁᴸᴸ`.
 
+Example (shown for the [PrettyCompact](#prettycompact) format):
+
 ``` sql
 SELECT * FROM t_null
 ```
@@ -355,10 +356,22 @@ SELECT * FROM t_null
 └───┴──────┘
 ```
 
+Rows are not escaped in Pretty* formats. Example is shown for the [PrettyCompact](#prettycompact) format:
+
+``` sql
+SELECT 'String with \'quotes\' and \t character' AS Escaping_test
+```
+
+``` 
+┌─Escaping_test────────────────────────┐
+│ String with 'quotes' and 	 character │
+└──────────────────────────────────────┘
+```
+
 To avoid dumping too much data to the terminal, only the first 10,000 rows are printed. If the number of rows is greater than or equal to 10,000, the message "Showed first 10 000" is printed.
 This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
 
-The Pretty format supports outputting total values (when using WITH TOTALS) and extremes (when 'extremes' is set to 1). In these cases, total values and extreme values are output after the main data, in separate tables. Example (shown for the PrettyCompact format):
+The Pretty format supports outputting total values (when using WITH TOTALS) and extremes (when 'extremes' is set to 1). In these cases, total values and extreme values are output after the main data, in separate tables. Example (shown for the [PrettyCompact](#prettycompact) format):
 
 ``` sql
 SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT PrettyCompact
@@ -389,7 +402,7 @@ Extremes:
 
 ## PrettyCompact {#prettycompact}
 
-Differs from `Pretty` in that the grid is drawn between rows and the result is more compact.
+Differs from [Pretty](#pretty) in that the grid is drawn between rows and the result is more compact.
 This format is used by default in the command-line client in interactive mode.
 
 ## PrettyCompactMonoBlock {#prettycompactmonoblock}
@@ -461,37 +474,20 @@ Row 1:
 x: 1
 y: ᴺᵁᴸᴸ
 ```
+Rows are not escaped in Vertical format: 
 
-This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
-
-## VerticalRaw {#verticalraw}
-
-Differs from `Vertical` format in that the rows are not escaped.
-This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
-
-Examples:
-
+``` sql
+SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical
 ```
-:) SHOW CREATE TABLE geonames FORMAT VerticalRaw;
-Row 1:
-──────
-statement: CREATE TABLE default.geonames ( geonameid UInt32, date Date DEFAULT CAST('2017-12-08' AS Date)) ENGINE = MergeTree(date, geonameid, 8192)
 
-:) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT VerticalRaw;
+```
 Row 1:
 ──────
-test: string with 'quotes' and   with some special
+test: string with 'quotes' and 	 with some special
  characters
 ```
 
-Compare with the Vertical format:
-
-```
-:) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical;
-Row 1:
-──────
-test: string with \'quotes\' and \t with some special \n characters
-```
+This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
 
 ## XML {#xml}
 
-- 
GitLab