From 960ee4a1856db8eadb96277bb2422edfa8f2a81c Mon Sep 17 00:00:00 2001
From: Gabriel Halley <gabhalley@gmail.com>
Date: Wed, 7 Oct 2015 23:11:24 -0400
Subject: removing whitespace all over

---
 xml.html.markdown | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index 059ea132..d407512d 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -38,10 +38,10 @@ Unlike HTML, XML does not specify how to display or to format data, just carry i
 
 <!-- Above is a typical XML file.
   It starts with a declaration, informing some metadata (optional).
-  
+
   XML uses a tree structure. Above, the root node is 'bookstore', which has
-  three child nodes, all 'books'. Those nodes has more child nodes, and so on... 
-  
+  three child nodes, all 'books'. Those nodes has more child nodes, and so on...
+
   Nodes are created using open/close tags, and childs are just nodes between
   the open and close tags.-->
 
@@ -54,8 +54,8 @@ Unlike HTML, XML does not specify how to display or to format data, just carry i
   2 - Elements -> That's pure data.
       That's what the parser will retrieve from the XML file.
       Elements appear between the open and close tags. -->
-      
-  
+
+
 <!-- Below, an element with two attributes -->
 <file type="gif" id="4293">computer.gif</file>
 
@@ -68,14 +68,14 @@ A XML document is well-formated if it is syntactically correct.
 However, it is possible to inject more constraints in the document,
 using document definitions, such as DTD and  XML Schema.
 
-A XML document which follows a document definition is called valid, 
-regarding that document. 
+A XML document which follows a document definition is called valid,
+regarding that document.
 
 With this tool, you can check the XML data outside the application logic.
 
 ```xml
 
-<!-- Below, you can see an simplified version of bookstore document, 
+<!-- Below, you can see an simplified version of bookstore document,
   with the addition of DTD definition.-->
 
 <?xml version="1.0" encoding="UTF-8"?>
-- 
cgit v1.2.3


From bb8eeb53ef01b6bfbdf64d6f1dc067f9cf4b8f8d Mon Sep 17 00:00:00 2001
From: Andy B <andyjtbrown@gmail.com>
Date: Fri, 9 Oct 2015 16:05:21 +0100
Subject: [xml/en] Grammar fixes

---
 xml.html.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index d407512d..4d33e614 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -40,13 +40,14 @@ Unlike HTML, XML does not specify how to display or to format data, just carry i
   It starts with a declaration, informing some metadata (optional).
 
   XML uses a tree structure. Above, the root node is 'bookstore', which has
-  three child nodes, all 'books'. Those nodes has more child nodes, and so on...
+  three child nodes, all 'books'. Those nodes have more child nodes (or
+  children), and so on...
 
-  Nodes are created using open/close tags, and childs are just nodes between
+  Nodes are created using open/close tags, and children are just nodes between
   the open and close tags.-->
 
 
-<!-- XML carries two kind of data:
+<!-- XML carries two kinds of data:
   1 - Attributes -> That's metadata about a node.
       Usually, the XML parser uses this information to store the data properly.
       It is characterized by appearing with the format name="value" within the opening
-- 
cgit v1.2.3


From 6cdd2a910292c8fa1323ed8fb4e241caa0b3a75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wo=C5=BAniczak?= <michal.wozniczak@gmail.com>
Date: Wed, 14 Oct 2015 21:31:04 +0200
Subject: Superfluous spaces removed in some tags in 'XML', where no attributes
 were present

---
 xml.html.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index 4d33e614..547deb08 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -83,7 +83,7 @@ With this tool, you can check the XML data outside the application logic.
 <!DOCTYPE note SYSTEM "Bookstore.dtd">
 <bookstore>
   <book category="COOKING">
-    <title >Everyday Italian</title>
+    <title>Everyday Italian</title>
     <price>30.00</price>
   </book>
 </bookstore>
@@ -121,7 +121,7 @@ With this tool, you can check the XML data outside the application logic.
 
 <bookstore>
   <book category="COOKING">
-    <title >Everyday Italian</title>
+    <title>Everyday Italian</title>
     <price>30.00</price>
   </book>
 </bookstore>
-- 
cgit v1.2.3


From 28751f213493d57ce06983f91077dd2d51e06821 Mon Sep 17 00:00:00 2001
From: Nimit Shah <nimit.svnit@gmail.com>
Date: Thu, 15 Oct 2015 19:37:44 +0530
Subject: A minor typo.

XML is singular so the word should be carries
---
 xml.html.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index 547deb08..efc2340f 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -7,7 +7,7 @@ contributors:
 
 XML is a markup language designed to store and transport data.
 
-Unlike HTML, XML does not specify how to display or to format data, just carry it.
+Unlike HTML, XML does not specify how to display or to format data, it just carries it.
 
 * XML Syntax
 
-- 
cgit v1.2.3


From 7a864ef86b2eba48e3e640e48016702a41247464 Mon Sep 17 00:00:00 2001
From: Rachel Stiyer <rachel.stiyer@enernoc.com>
Date: Thu, 15 Oct 2015 20:33:35 -0700
Subject: Typo fixes and refactor description of Java Map

---
 xml.html.markdown | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index efc2340f..b95d6088 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -3,6 +3,7 @@ language: xml
 filename: learnxml.xml
 contributors:
   - ["João Farias", "https://github.com/JoaoGFarias"]
+  - ["Rachel Stiyer", "https://github.com/rstiyer"]
 ---
 
 XML is a markup language designed to store and transport data.
@@ -65,12 +66,12 @@ Unlike HTML, XML does not specify how to display or to format data, it just carr
 
 * Well-Formated Document x Validation
 
-A XML document is well-formated if it is syntactically correct.
+An XML document is well-formatted if it is syntactically correct.
 However, it is possible to inject more constraints in the document,
 using document definitions, such as DTD and  XML Schema.
 
-A XML document which follows a document definition is called valid,
-regarding that document.
+An XML document which follows a document definition is called valid,
+in regards to that document.
 
 With this tool, you can check the XML data outside the application logic.
 
-- 
cgit v1.2.3