Properly use xml names

feed.go

@@ -10,20 +10,20 @@ import (
 type Feed struct {
 	XMLName xml.Name `xml:"http://www.w3.org/2005/Atom feed"`
 	*CommonAttributes
-	Authors      []*Person           `xml:"author,omitempty"`
-	Categories   []*Category         `xml:"category,omitempty"`
-	Contributors []*Person           `xml:"contributor,omitempty"`
-	Generator    *Generator          `xml:"generator,omitempty"`
-	Icon         *Icon               `xml:"icon,omitempty"`
-	ID           *ID                 `xml:"id"`
-	Links        []*Link             `xml:"link,omitempty"`
-	Logo         *Logo               `xml:"logo,omitempty"`
+	Authors      []*Person   `xml:"author,omitempty"`
+	Categories   []*Category `xml:",omitempty"`
+	Contributors []*Person   `xml:"contributor,omitempty"`
+	Generator    *Generator  `xml:",omitempty"`
+	Icon         *Icon       `xml:",omitempty"`
+	ID           *ID
+	Links        []*Link             `xml:",omitempty"`
+	Logo         *Logo               `xml:",omitempty"`
 	Rights       Text                `xml:"rights,omitempty"`
 	Subtitle     Text                `xml:"subtitle,omitempty"`
 	Title        Text                `xml:"title"`
 	Updated      *Date               `xml:"updated"`
 	Extensions   []*ExtensionElement `xml:",any,omitempty"`
-	Entries      []*Entry            `xml:"entry,omitempty"`
+	Entries      []*Entry            `xml:",omitempty"`
 }
 
 // NewFeed creates a new Feed. It returns a *Feed and an error.