From 938988bd3487202047cdd37d8624e219ac5192df Mon Sep 17 00:00:00 2001
From: Vasiliy Petrov <saugardas@yandex.ru>
Date: Wed, 27 Sep 2017 22:13:18 +0300
Subject: [haml/en] Add more information

---
 haml.html.markdown | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

(limited to 'haml.html.markdown')

diff --git a/haml.html.markdown b/haml.html.markdown
index 5dd4cb6d..0ec5e244 100644
--- a/haml.html.markdown
+++ b/haml.html.markdown
@@ -3,6 +3,7 @@ language: haml
 filename: learnhaml.haml
 contributors:
   - ["Simon Neveu", "https://github.com/sneveu"]
+  - ["Vasiliy Petrov", "https://github.com/Saugardas"]
 ---
 
 Haml is a markup language predominantly used with Ruby that cleanly and simply describes the HTML of any web document without the use of inline code. It is a popular alternative to using Rails templating language (.erb) and allows you to embed Ruby code into your markup.
@@ -11,7 +12,9 @@ It aims to reduce repetition in your markup by closing tags for you based on the
 
 You can also use Haml on a project independent of Ruby, by installing the Haml gem on your machine and using the command line to convert it to html.
 
+```shell
 $ haml input_file.haml output_file.html
+```
 
 
 ```haml
@@ -55,8 +58,18 @@ $ haml input_file.haml output_file.html
     </header>
   </body>
 
-/ The div tag is the default element, so they can be written simply like this
-.foo
+/
+  The div tag is the default element, so it can be omitted.
+  You can define only class/id using . or #
+  For example:
+
+%div.my_class
+  %div#my_id
+
+/ Can be written:
+
+.my_class
+  #my_id
 
 / To add content to a tag, add the text directly after the declaration
 %h1 Headline copy
@@ -97,6 +110,15 @@ $ haml input_file.haml output_file.html
 / To write data-attributes, use the :data key with its value as another hash
 %div{:data => {:attribute => 'foo'}}
 
+/ For Ruby version 1.9 or higher you can use Ruby's new hash syntax
+%div{ data: { attribute: 'foo' } }
+
+/ Also you can use HTML-style attribute syntax.
+%a(href='#' title='bar')
+
+/ And both syntaxes together
+%a(href='#'){ title: @my_class.title }
+
 
 / -------------------------------------------
 / Inserting Ruby
@@ -120,7 +142,7 @@ $ haml input_file.haml output_file.html
 - books.shuffle.each_with_index do |book, index|
   %h1= book
 
-  if book do
+  - if book do
     %p This is a book
     
 / Adding ordered / unordered list
@@ -166,12 +188,33 @@ $ haml input_file.haml output_file.html
 / -------------------------------------------
 
 /
-  Use the colon to define Haml filters, one example of a filter you can
-  use is :javascript, which can be used for writing inline js
+  Filters pass the block to another filtering program and return the result in Haml
+  To use filter type colon and the name of the filter
 
+/ Markdown filter
+:markdown
+  # Header
+
+  Text **inside** *block*
+
+/ The code above is compiled into
+<h1>Header</h1>
+
+<p>Text <strong>inside</strong> <em>block</em></p>
+
+/ Javascript filter
 :javascript
   console.log('This is inline <script>');
 
+/ is compiled into
+<script>
+  console.log('This is inline <script>');
+</script>
+
+/
+  There are many types of filters (:markdown, :javascript, :coffee, :css, :ruby and so on)
+  Also you can define own filter using Haml::Filters
+
 ```
 
 ## Additional resources
-- 
cgit v1.2.3


From f0664e67c1d98afb0f7105768cf55af830f818e8 Mon Sep 17 00:00:00 2001
From: Vasiliy Petrov <saugardas@yandex.ru>
Date: Wed, 27 Sep 2017 22:18:48 +0300
Subject: fix formatting

---
 haml.html.markdown | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'haml.html.markdown')

diff --git a/haml.html.markdown b/haml.html.markdown
index 0ec5e244..fdfd0e07 100644
--- a/haml.html.markdown
+++ b/haml.html.markdown
@@ -61,13 +61,12 @@ $ haml input_file.haml output_file.html
 /
   The div tag is the default element, so it can be omitted.
   You can define only class/id using . or #
-  For example:
+  For example
 
 %div.my_class
   %div#my_id
 
-/ Can be written:
-
+/ Can be written
 .my_class
   #my_id
 
-- 
cgit v1.2.3


From da85cc8225531632e913676f124237b987684b81 Mon Sep 17 00:00:00 2001
From: Vasiliy Petrov <saugardas@yandex.ru>
Date: Thu, 28 Sep 2017 09:00:33 +0300
Subject: [haml/en] Fix mistakes in English text

---
 haml.html.markdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'haml.html.markdown')

diff --git a/haml.html.markdown b/haml.html.markdown
index fdfd0e07..bb8bdc54 100644
--- a/haml.html.markdown
+++ b/haml.html.markdown
@@ -188,18 +188,18 @@ $ haml input_file.haml output_file.html
 
 /
   Filters pass the block to another filtering program and return the result in Haml
-  To use filter type colon and the name of the filter
+  To use a filter, type a colon and the name of the filter
 
 / Markdown filter
 :markdown
   # Header
 
-  Text **inside** *block*
+  Text **inside** the *block*
 
 / The code above is compiled into
 <h1>Header</h1>
 
-<p>Text <strong>inside</strong> <em>block</em></p>
+<p>Text <strong>inside</strong> the <em>block</em></p>
 
 / Javascript filter
 :javascript
@@ -212,7 +212,7 @@ $ haml input_file.haml output_file.html
 
 /
   There are many types of filters (:markdown, :javascript, :coffee, :css, :ruby and so on)
-  Also you can define own filter using Haml::Filters
+  Also you can define your own filters using Haml::Filters
 
 ```
 
-- 
cgit v1.2.3