From 68f016d886c755acff58782514a79f5203201fa1 Mon Sep 17 00:00:00 2001
From: Aleksei Trifonov <avrong@avrong.me>
Date: Sun, 22 Aug 2021 21:11:16 +0300
Subject: [toml/en] Fix JSON code blocks in TOML (#4204)

It will correctly show structured, formatted JSON to give a better understanding
---
 toml.html.markdown | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'toml.html.markdown')

diff --git a/toml.html.markdown b/toml.html.markdown
index 2b234965..804fefaa 100755
--- a/toml.html.markdown
+++ b/toml.html.markdown
@@ -225,6 +225,7 @@ sku = 284758393
 color = "gray"
 ```
 The equivalent in JSON would be:
+
 ```json
 { 
   "products": [
@@ -270,9 +271,10 @@ The equivalent in JSON would be:
     note = "I am an array item in banana fruit's table/map"
 
 ```
+
 The equivalent in JSON would be:
-```json
 
+```json
 {
   "fruit": [
     {
-- 
cgit v1.2.3


From 5e53b2aca948fc584b121064de6deea112615ee6 Mon Sep 17 00:00:00 2001
From: Jeff Hale <discdiver@users.noreply.github.com>
Date: Mon, 23 Aug 2021 04:54:29 -0400
Subject: [toml/en] fix code not rendering (#4221)

The json code block renders fine in Github Flavored Markdown on Github, but not on the learnxinyminutes.com/docs/toml page. Because there isn't any syntax highlighting for this section anyway, I switched it to vanilla code block.
---
 toml.html.markdown | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'toml.html.markdown')

diff --git a/toml.html.markdown b/toml.html.markdown
index 804fefaa..79aa544c 100755
--- a/toml.html.markdown
+++ b/toml.html.markdown
@@ -274,7 +274,8 @@ The equivalent in JSON would be:
 
 The equivalent in JSON would be:
 
-```json
+```
+
 {
   "fruit": [
     {
-- 
cgit v1.2.3


From 0d637dade21f65d9b396c6be1335c0aaacf92e4b Mon Sep 17 00:00:00 2001
From: romsom <concrete_ages-ghb@yahoo.de>
Date: Thu, 14 Dec 2023 15:49:26 +0100
Subject: toml: hex, octal and binary are valid integer formats (#4057)

Update the integer section to reflect the fact that hex, octal and binary representations are allowed in toml.

They were added to toml in version 0.5 and more work has to be done to update this document to that version, as mentioned here:
https://github.com/adambard/learnxinyminutes-docs/issues/3158
---
 toml.html.markdown | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'toml.html.markdown')

diff --git a/toml.html.markdown b/toml.html.markdown
index 79aa544c..69dfd754 100755
--- a/toml.html.markdown
+++ b/toml.html.markdown
@@ -69,11 +69,15 @@ The first newline is trimmed in raw strings.
 ###########
 
 ## Integers can start with a +, a - or nothing.
-## Leading zeros are not allowed. Hex, octal, and binary forms are not allowed.
+## Leading zeros are not allowed.
+## Hex, octal, and binary forms are allowed.
 ## Values that cannot be expressed as a series of digits are not allowed.
 int1 = +42
 int2 = 0
 int3 = -21
+int4 = 0xdeadbeef
+int5 = 0o755
+int6 = 0b11011100
 integerRange = 64
 
 ## You can use underscores to enhance readability. Each
-- 
cgit v1.2.3


From 327001f58739489b41f6b1f7bbc8be900847b381 Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Thu, 4 Apr 2024 04:20:22 -0700
Subject: Normalize file permissions

these files do not need to be executable
---
 toml.html.markdown | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 toml.html.markdown

(limited to 'toml.html.markdown')

diff --git a/toml.html.markdown b/toml.html.markdown
old mode 100755
new mode 100644
-- 
cgit v1.2.3