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


From 60a1a43cd3d797d347d06ef4568f542ab473b2dc Mon Sep 17 00:00:00 2001
From: duci9y <duci9y@users.noreply.github.com>
Date: Tue, 20 Oct 2015 13:53:47 +0530
Subject: [xml/en] Grammar, formatting. Made more 'inlined'.

---
 xml.html.markdown | 155 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 96 insertions(+), 59 deletions(-)

(limited to 'xml.html.markdown')

diff --git a/xml.html.markdown b/xml.html.markdown
index b95d6088..b4b54330 100644
--- a/xml.html.markdown
+++ b/xml.html.markdown
@@ -4,18 +4,76 @@ filename: learnxml.xml
 contributors:
   - ["João Farias", "https://github.com/JoaoGFarias"]
   - ["Rachel Stiyer", "https://github.com/rstiyer"]
+  - ["Deepanshu Utkarsh", "https://github.com/duci9y"]
 ---
 
-XML is a markup language designed to store and transport data.
+XML is a markup language designed to store and transport data. It is supposed to be both human readable and machine readable.
 
 Unlike HTML, XML does not specify how to display or to format data, it just carries it.
 
-* XML Syntax
+Distinctions are made between the **content** and the **markup**. In short, content could be anything, markup is defined.
+
+## Some definitions and introductions
+
+XML Documents are basically made up of *elements* which can have *attributes* describing them and may contain some textual content or more elements as its children. All XML documents must have a root element, which is the ancestor of all the other elements in the document.
+
+XML Parsers are designed to be very strict, and will stop parsing malformed documents. Therefore it must be ensured that all XML documents follow the [XML Syntax Rules](http://www.w3schools.com/xml/xml_syntax.asp).
 
 ```xml
-<!-- Comments in XML are like this -->
+<!-- This is a comment. It must not contain two consecutive hyphens (-). -->
+<!-- Comments can span
+  multiple lines -->
+
+<!-- Elements -->
+<!-- An element is a basic XML component. There are two types, empty: -->
+<element1 attribute="value" /> <!-- Empty elements do not hold any content -->
+<!-- and non-empty: -->
+<element2 attribute="value">Content</element2>
+<!-- Element names may only contain alphabets and numbers. -->
+
+<empty /> <!-- An element either consists an empty element tag… -->
+<!-- …which does not hold any content and is pure markup. -->
+
+<notempty> <!-- Or, it consists of a start tag… -->
+  <!-- …some content… -->
+</notempty> <!-- and an end tag. -->
+
+<!-- Element names are case sensitive. -->
+<element />
+<!-- is not the same as -->
+<eLEMENT />
+
+<!-- Attributes -->
+<!-- An attribute is a key-value pair and exists within an element. -->
+<element attribute="value" another="anotherValue" many="space-separated list" />
+<!-- An attribute may appear only once in an element. It holds just one value.
+  Common workarounds to this involve the use of space-separated lists. -->
+
+<!-- Nesting elements -->
+<!-- An element's content may include other elements: -->
+<parent>
+  <child>Text</child>
+  <emptysibling />
+</parent>
+<!-- Standard tree nomenclature is followed. Each element being called a node.
+  An ancestor a level up is the parent, descendants a level down are children.
+  Elements within the same parent element are siblings. -->
+
+<!-- XML preserves whitespace. -->
+<child>
+  Text
+</child>
+<!-- is not the same as -->
+<child>Text</child>
+```
+
+## An XML document
 
+This is what makes XML versatile. It is human readable too. The following document tells us that it defines a bookstore which sells three books, one of which is Learning XML by Erik T. Ray. All this without having used an XML Parser yet.
+
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This is called an XML prolog. Optional, but recommended. -->
 <bookstore>
   <book category="COOKING">
     <title lang="en">Everyday Italian</title>
@@ -36,85 +94,49 @@ Unlike HTML, XML does not specify how to display or to format data, it just carr
     <price>39.95</price>
   </book>
 </bookstore>
-
-<!-- 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 have more child nodes (or
-  children), and so on...
-
-  Nodes are created using open/close tags, and children are just nodes between
-  the open and close tags.-->
-
-
-<!-- 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
-      tag.
-  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>
-
-
 ```
 
-* Well-Formated Document x Validation
-
-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.
+## Well-formedness and Validation
 
-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.
+A XML document is *well-formed* if it is syntactically correct. However, it is possible to add more constraints to the document, using Document Type Definitions (DTDs). A document whose elements are attributes are declared in a DTD and which follows the grammar specified in that DTD is called *valid* with respect to that DTD, in addition to being well-formed.
 
 ```xml
-
-<!-- Below, you can see an simplified version of bookstore document,
-  with the addition of DTD definition.-->
-
+<!-- Declaring a DTD externally: -->
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note SYSTEM "Bookstore.dtd">
+<!DOCTYPE bookstore SYSTEM "Bookstore.dtd">
+<!-- Declares that bookstore is our root element and 'Bookstore.dtd' is the path
+  to our DTD file. -->
 <bookstore>
   <book category="COOKING">
-    <title>Everyday Italian</title>
+    <title lang="en">Everyday Italian</title>
+    <author>Giada De Laurentiis</author>
+    <year>2005</year>
     <price>30.00</price>
   </book>
 </bookstore>
 
-<!-- This DTD could be something like:-->
-
-<!DOCTYPE note
-[
+<!-- The DTD file: -->
 <!ELEMENT bookstore (book+)>
-<!ELEMENT book (title,price)>
+<!-- The bookstore element may contain one or more child book elements. -->
+<!ELEMENT book (title, price)>
+<!-- Each book must have a title and a price as its children. -->
 <!ATTLIST book category CDATA "Literature">
+<!-- A book should have a category attribute. If it doesn't, its default value
+  will be 'Literature'. -->
 <!ELEMENT title (#PCDATA)>
+<!-- The element title must only contain parsed character data. That is, it may
+  only contain text which is read by the parser and must not contain children.
+  Compare with CDATA, or character data. -->
 <!ELEMENT price (#PCDATA)>
 ]>
 
-
-<!-- The DTD starts with a declaration.
-  Following, the root node is declared, requiring 1 or more child nodes 'book'.
-  Each 'book' should contain exactly one 'title' and 'price' and an attribute
-  called 'category', with "Literature" as its default value.
-  The 'title' and 'price' nodes contain a parsed character data.-->
-
 <!-- The DTD could be declared inside the XML file itself.-->
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE note
-[
+<!DOCTYPE bookstore [
 <!ELEMENT bookstore (book+)>
-<!ELEMENT book (title,price)>
+<!ELEMENT book (title, price)>
 <!ATTLIST book category CDATA "Literature">
 <!ELEMENT title (#PCDATA)>
 <!ELEMENT price (#PCDATA)>
@@ -127,3 +149,18 @@ With this tool, you can check the XML data outside the application logic.
   </book>
 </bookstore>
 ```
+
+## DTD Compatibility and XML Schema Definitions
+
+Support for DTDs is ubiquitous because they are so old. Unfortunately, modern XML features like namespaces are not supported by DTDs. XML Schema Definitions (XSDs) are meant to replace DTDs for defining XML document grammar. 
+
+## Resources
+
+* [Validate your XML](http://www.xmlvalidation.com)
+
+## Further Reading
+
+* [XML Schema Definitions Tutorial](http://www.w3schools.com/schema/)
+* [DTD Tutorial](http://www.w3schools.com/xml/xml_dtd_intro.asp)
+* [XML Tutorial](http://www.w3schools.com/xml/default.asp)
+* [Using XPath queries to parse XML](http://www.w3schools.com/xml/xml_xpath.asp)
-- 
cgit v1.2.3