Index: xword/TestXWikiLib/TestXWikiLib.csproj
===================================================================
--- xword/TestXWikiLib/TestXWikiLib.csproj	(revision 18239)
+++ xword/TestXWikiLib/TestXWikiLib.csproj	(working copy)
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BCF8C79A-A683-4B68-927A-64AD96F37847}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -32,6 +32,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>E:\bin\NUnit\bin\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -56,6 +60,7 @@
     <Compile Include="WebClientMock.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="XmlDocumentExtensionTest.cs" />
     <Compile Include="XWikiHTTPClientTest.cs" />
   </ItemGroup>
   <ItemGroup>
Index: xword/TestXWikiLib/XmlDocumentExtensionTest.cs
===================================================================
--- xword/TestXWikiLib/XmlDocumentExtensionTest.cs	(revision 0)
+++ xword/TestXWikiLib/XmlDocumentExtensionTest.cs	(revision 0)
@@ -0,0 +1,69 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using XWiki.Xml;
+using NUnit.Framework;
+
+namespace TestXWikiLib
+{
+    /// <summary>
+    /// Test class for XmlDocument extensions.
+    /// </summary>
+    [TestFixture]
+    public class XmlDocumentExtensionTest
+    {
+        private XmlDocument xmlDoc;
+        private string html;
+        private string expectedHtml;
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public XmlDocumentExtensionTest()
+        {
+        }
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            xmlDoc = new XmlDocument();
+            html = "<html><head><title>Page Title</title></head>"
+                + "<body>\n<h1 align=\"center\">Document Title</h1>"
+                + "<p>Some content goes here</p>"
+                + "<p><b>Related <u>links</u>:</b><br/>"
+                + "<a href=\"http://www.example.com\">Example.com</a></p>"
+                + "</body></html>";
+            expectedHtml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>" + Environment.NewLine +
+                "<html>" + Environment.NewLine +
+                "  <head>" + Environment.NewLine +
+                "    <title>Page Title</title>" + Environment.NewLine +
+                "  </head>" + Environment.NewLine +
+                "  <body>" + Environment.NewLine +
+                "    <h1 align=\"center\">Document Title</h1>" + Environment.NewLine +
+                "    <p>Some content goes here</p>" + Environment.NewLine +
+                "    <p>" + Environment.NewLine +
+                "      <b>Related <u>links</u>:</b>" + Environment.NewLine +
+                "      <br />" + Environment.NewLine +
+                "      <a href=\"http://www.example.com\">Example.com</a>" + Environment.NewLine +
+                "    </p>" + Environment.NewLine +
+                "  </body>" + Environment.NewLine +
+                "</html>";
+        }
+
+        /// <summary>
+        /// Test method for GetIndendedXml() extension method.
+        /// </summary>
+        [Test]
+        public void TestGetIndentedXml()
+        {
+            string indentedHtml;
+            xmlDoc.LoadXml(html);
+            indentedHtml = xmlDoc.GetIndentedXml();
+            Assert.AreEqual(indentedHtml, expectedHtml);
+        }
+    }
+}
Index: xword/XWikiLib/Office/Word/LocalToWebHTML.cs
===================================================================
--- xword/XWikiLib/Office/Word/LocalToWebHTML.cs	(revision 18239)
+++ xword/XWikiLib/Office/Word/LocalToWebHTML.cs	(working copy)
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Xml;
 using System.Xml.XPath;
+using XWiki.Xml;
 
 namespace XWiki.Office.Word
 {
@@ -51,7 +52,7 @@
             AdaptLists(ref xmlDoc);
             AdaptMacros(ref xmlDoc);
             ClearOfficeAttributes(ref xmlDoc);
-            StringBuilder sb = new StringBuilder(xmlDoc.InnerXml);
+            StringBuilder sb = new StringBuilder(xmlDoc.GetIndentedXml());
             sb.Replace(" xmlns=\"\"","");
             return sb.ToString();
         }
Index: xword/XWikiLib/Office/Word/WebToLocalHTML.cs
===================================================================
--- xword/XWikiLib/Office/Word/WebToLocalHTML.cs	(revision 18239)
+++ xword/XWikiLib/Office/Word/WebToLocalHTML.cs	(working copy)
@@ -9,6 +9,7 @@
 using System.Xml.XPath;
 using XWiki.Clients;
 using XWiki.Html;
+using XWiki.Xml;
 
 namespace XWiki.Office.Word
 {
@@ -109,7 +110,7 @@
             }
             AdaptMacros(ref xmlDoc);
             AdaptImages(ref xmlDoc);            
-            return xmlDoc.InnerXml;
+            return xmlDoc.GetIndentedXml();
         }
 
         /// <summary>
Index: xword/XWikiLib/XWikiLib.csproj
===================================================================
--- xword/XWikiLib/XWikiLib.csproj	(revision 18239)
+++ xword/XWikiLib/XWikiLib.csproj	(working copy)
@@ -72,6 +72,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
+    <Compile Include="Xml\XmlDocumentExtension.cs" />
     <Compile Include="XWiki\Space.cs" />
     <Compile Include="XWiki\WikiStructure.cs" />
     <Compile Include="Clients\XWikiHTTPClient.cs" />
@@ -89,9 +90,6 @@
   <ItemGroup>
     <Content Include="XWikiLibXmlDoc.XML" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Xml\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: xword/XWikiLib/XWikiLibXmlDoc.XML
===================================================================
--- xword/XWikiLib/XWikiLibXmlDoc.XML	(revision 18239)
+++ xword/XWikiLib/XWikiLibXmlDoc.XML	(working copy)
@@ -4,162 +4,31 @@
         <name>XWikiLib</name>
     </assembly>
     <members>
-        <member name="T:XWiki.Clients.HTTPResponses">
+        <member name="T:XWiki.XWikiDocument">
             <summary>
-            Contains response strings from the velocity pages that provide XWord functionality.
+            Describes a document on the XWiki server.
             </summary>
         </member>
-        <member name="F:XWiki.Clients.HTTPResponses.SAVE_OK">
+        <member name="F:XWiki.XWikiDocument.name">
             <summary>
-            Specifies that the saving process was completed successfully.
+            The name of the document.
             </summary>
         </member>
-        <member name="F:XWiki.Clients.HTTPResponses.WRONG_REQUEST">
+        <member name="F:XWiki.XWikiDocument.space">
             <summary>
-            Appears when a request was in a wrong format or had insufficinet parameters.
+            The space name of the document.
             </summary>
         </member>
-        <member name="F:XWiki.Clients.HTTPResponses.VELOCITY_PARSER_ERROR">
+        <member name="F:XWiki.XWikiDocument.content">
             <summary>
-            Appears when the the server fails to parse a page.
+            The rendered content of the document.
             </summary>
         </member>
-        <member name="F:XWiki.Clients.HTTPResponses.INSUFFICIENT_MEMMORY">
+        <member name="M:XWiki.XWikiDocument.#ctor">
             <summary>
-            Appears when the server has insufficeinet memmory for the current tasks.
+            Default constructor, creates a new instance of the XWikiDocument class.
             </summary>
         </member>
-        <member name="F:XWiki.Clients.HTTPResponses.NO_PROGRAMMING_RIGHTS">
-            <summary>
-            Returned if the page requires programming rights 
-            but it was las saved by a user without programming rights
-            </summary>
-        </member>
-        <member name="F:XWiki.Clients.HTTPResponses.NO_EDIT_RIGHTS">
-            <summary>
-            Returned if the current user does not have the right to edit the specified page.
-            </summary>
-        </member>
-        <member name="F:XWiki.Clients.HTTPResponses.NO_GROOVY_RIGHTS">
-            <summary>
-            Returned when the user/page does not have the right to parse and execute groovy pages.
-            </summary>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptSource(System.String)">
-            <summary>
-            Adapts the HTML source from it's local MS Word form in order to be used by the wiki.
-            </summary>
-            <param name="content">The initial HTML source.</param>
-            <returns>The adapted HTML code.</returns>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.ClearStyles(System.Xml.XmlDocument@)">
-            <summary>
-            Deletes the style attributes from the Word generated content
-            </summary>
-            <param name="xmlDoc">A refrence to the xml document.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.ClearOfficeAttributes(System.Xml.XmlDocument@)">
-            <summary>
-            Deletes all office specific attributes
-            </summary>
-            <param name="xmlDoc">A reference to the xml document.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptImages(System.Xml.XmlDocument@)">
-            <summary>
-            Adapts the images from the local(file:///) to the xwiki format.
-            </summary>
-            <param name="xmlDoc">A reference to the xml document.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptMacros(System.Xml.XmlDocument@)">
-            <summary>
-            Replaces the read-only Word content controls with XWiki macro markup.
-            </summary>
-            <param name="xmlDoc">A reference to the xml document instance.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptLists(System.Xml.XmlDocument@)">
-            <summary>
-            Adapts to the lists to a less styled format.
-            </summary>
-            <param name="xmlDoc">A reference to the xml document instance.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.RemoveExtraLists(System.Xml.XmlDocument@)">
-            <summary>
-            Removes the extra lists Word creates for sublists.
-            The child 'ul' is moved to the previous sibling.
-            </summary>
-            <param name="xmlDoc">A reference to the xml document.</param>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.IsImageDirty(System.Xml.XmlNode)">
-            <summary>
-            Specifies if an image is new or has been modified.
-            </summary>
-            <param name="node">The XML node(element) that contains the image tag</param>
-            <returns>Returns true is the image is new or has been modified. Otherwise returns false.</returns>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.HasXWordId(System.Xml.XmlNode)">
-            <summary>
-            Specifies if an image has an XWordId 
-            </summary>
-            <param name="node">The currently processed</param>
-            <returns>True if the note has a xword attribute, false if not.</returns>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.GetMatchingImages(System.Xml.XmlNode)">
-            <summary>
-            Gets a list with the GUIDs assigned assigned to image across the html source.
-            </summary>
-            <param name="node">Teh </param>
-            <returns></returns>
-        </member>
-        <member name="M:XWiki.Office.Word.LocalToWebHTML.BorderImages(System.Xml.XmlDocument@)">
-            <summary>
-            Adds comments before and after image tags.
-            </summary>
-            <param name="xmlDoc">A reference to the filtered XmlDocument instance.</param>
-        </member>
-        <member name="T:XWiki.XWikiURLs">
-            <summary>
-            Contains a list with the XWiki Word services url's.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.AttachmentServiceURL">
-            <summary>
-            Gets or sets the URL of the service that handles attachments.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.LoginURL">
-            <summary>
-            Gets or sets the URL of the service/page that handles authentication.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.SavePageURL">
-            <summary>
-            Gets the URL of the service that handles page editing and saving.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.GetPageURL">
-            <summary>
-            Gets the URL of the service that provides page content and rendering.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.WikiStructureURL">
-            <summary>
-            Gets the URL of the service that provides access to the structure of the wiki.
-            </summary>
-        </member>
-        <member name="P:XWiki.XWikiURLs.ProtectedPagesURL">
-            <summary>
-            Gets or sets the URL of the page that contains the list of protected wiki pages.
-            This wiki pages contain scripts that provide functionality to the wiki and cannot be edited
-            with Word without having macro support.
-            </summary>
-        </member>
-        <member name="T:XWiki.Clients.XWikiHTTPClient">
-            <summary>
-            Adaptor over System.Net.WebClient
-            Uses plain HTTP calls to send and retrieve data from the XWiki server
-            Service pages on the server are in the MSOffice space
-            </summary>
-        </member>
         <member name="T:XWiki.Clients.IXWikiClient">
             <summary>
             Primary interface used in communication between XOffice and XWiki servers.
@@ -328,299 +197,97 @@
             Specifies if the current user is logged in to the server.
             </summary>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.#ctor(System.String,System.String,System.String)">
-            <param name="serverURL">The url of the server.</param>
-            <param name="username">The username used to authenticate.</param>
-            <param name="password">The passowrd used to authenticate.</param>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.InsertCookies">
+        <member name="M:XWiki.Clients.XWikiXMLRPCClient.#ctor">
             <summary>
-            Inserts the authetication cookies into the request headers.
+            XML-RPC implementation of IXWikiCLient.
+            Provides access to the main features of XWiki using the XML-RPC API.
             </summary>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.Login">
+        <member name="M:XWiki.Clients.XWikiXMLRPCClient.Login(System.String,System.String)">
             <summary>
             Authenticates the user to the server.
             </summary>
-            <returns>True if the opration succeded. False if the operation failed.</returns>
+            <returns>True if the operation succedes. False if the operation fails.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetCookie(System.String,System.String)">
+        <member name="P:XWiki.Clients.XWikiXMLRPCClient.IsLoggedIn">
             <summary>
-            Parses the cookies for the server response and returns the requested value.
-            <remarks>Returns "" if the searched value is not found.</remarks>
+            Specifies if the current user is logged in.
             </summary>
-            <param name="searchedCookie"></param>
-            <param name="cookiesString"></param>
-            <returns></returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.OpenRead(System.String)">
+        <member name="T:XWiki.WikiStructure">
             <summary>
-            Starts reading from an address.
+            Class used to store data about the wiki structure.
+            Contains the list of spaces and documents.
             </summary>
-            <param name="address">The adress.</param>
-            <returns>A stream with the read data.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.OpenRead(System.Uri)">
+        <member name="F:XWiki.WikiStructure.spaces">
             <summary>
-            Starts reading from an address.
+            A list with all spaces in the wiki.
             </summary>
-            <param name="address">The adress.</param>
-            <returns>A stream with the read data.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadValues(System.String,System.Collections.Specialized.NameValueCollection)">
+        <member name="M:XWiki.WikiStructure.#ctor">
             <summary>
-            Uploads(POSTs) the values to the server.
+            Default constructor. Instantiates the spaces list.
             </summary>
-            <param name="address">The adress where the values are uploaded.</param>
-            <param name="values">Name value collection with the upload data.</param>
-            <returns>A stream with the server response.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadValues(System.String,System.String,System.Collections.Specialized.NameValueCollection)">
+        <member name="M:XWiki.WikiStructure.GetAllDocuments">
             <summary>
-            Uploads the values to the server.
+            Gets all document instances in the wiki.
             </summary>
-            <param name="address">The adress where the values are uploaded.</param>
-            <param name="method">The mothod used to send data to the server.</param>
-            <param name="values">Name value collection with the upload data.</param>
-            <returns>A stream with the server response.</returns>
+            <returns>A list with all document instances.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.String,System.Byte[])">
+        <member name="M:XWiki.WikiStructure.RemoveXWikiDocument(XWiki.XWikiDocument)">
             <summary>
-            Uploads data to the server.
+            Removes a XWikiDocument instance from the wiki structure.
+            This has no effect on the server. It only affects the document list
+            Word works with.
             </summary>
-            <param name="address">The adress where the data will be uploaded.</param>
-            <param name="data">The data that will be uploaded.</param>
-            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.Uri,System.Byte[])">
+        <member name="T:XWiki.Office.Word.ImageInfo">
             <summary>
-            Uploads data to the server.
+            Contains the states of a image in both web an local file system environments.
             </summary>
-            <param name="address">The adress where the data will be uploaded.</param>
-            <param name="data">The data that will be uploaded.</param>
-            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.String,System.String,System.Byte[])">
+        <member name="F:XWiki.Office.Word.ImageInfo.XWORD_IMG_ATTRIBUTE">
             <summary>
-            Uploads data to the server.
+            Image attribute used by XWord
             </summary>
-            <param name="address">The adress where the data will be uploaded.</param>
-            <param name="method">The web method used to upload the data.</param>
-            <param name="data">The data that will be uploaded.</param>
-            <see cref="M:System.Net.WebClient.UploadData(System.String,System.String,System.Byte[])"/>
-            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.Uri,System.String,System.Byte[])">
+        <member name="F:XWiki.Office.Word.ImageInfo.altText">
             <summary>
-            Uploads data to the server.
+            Alternative text used by the image
             </summary>
-            <param name="address">The adress where the data will be uploaded.</param>
-            <param name="method">The web method used to upload the data.</param>
-            <param name="data">The data that will be uploaded.</param>
-            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.DownloadData(System.Uri)">
+        <member name="F:XWiki.Office.Word.ImageInfo.imgWebSrc">
             <summary>
-            Downloads data from the server.
+            The value of the src attribute while on a website.
             </summary>
-            <param name="address">The adress of the resource.</param>
-            <returns>A byte array with the downloaded data.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.DownloadData(System.String)">
+        <member name="F:XWiki.Office.Word.ImageInfo.imgLocalSrc">
             <summary>
-            Downloads data from the server.
+            The value of the src attribute while on file system.
             </summary>
-            <param name="address">The adress of the resource.</param>
-            <returns>A byte array with the downloaded data.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.ParseList(System.String)">
+        <member name="F:XWiki.Office.Word.ImageInfo.filePath">
             <summary>
-            Parses a velocity response into a list.
+            The full path to the local file.
             </summary>
-            <param name="input"></param>
-            <returns></returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.ConvertEncoding(System.String)">
+        <member name="F:XWiki.Office.Word.ImageInfo.fileURI">
             <summary>
-            Converts a string to a specified encoding.
+            The URI representing the local file.
             </summary>
-            <param name="content">The string to be converted.</param>
-            <returns>The convertes string.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.Login(System.String,System.String)">
+        <member name="F:XWiki.Office.Word.ImageInfo.fileSize">
             <summary>
-            Authenticates the user to the server.
+            The size of the local file.
             </summary>
-            <param name="username">The username.</param>
-            <param name="password">The password.</param>
-            <returns>True if the operation succeded. False if the operation failed.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetWikiStructure">
+        <member name="F:XWiki.Office.Word.ImageInfo.fileCreationDate">
             <summary>
-            Gets the spaces and pages of the wiki.
+            The creation date of the local file.
             </summary>
-            <returns>A stream with a serialized WikiStructure object.</returns>
         </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetWikiPageAsPlainHTML(System.String)">
-            <summary>
-            Gets the rendered content of the page.
-            </summary>
-            <param name="docName">The full name of the page.</param>
-            <returns>A stream with content.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetSpaces">
-            <summary>
-            Gets the spaces of a wiki.
-            </summary>
-            <returns>A list containing the spaces names.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetPages(System.String)">
-            <summary>
-            Gets the pages names for the specified space.
-            </summary>
-            <param name="spaceName">The name of the space.</param>
-            <returns>A list with the pages names.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.SavePageHTML(System.String,System.String,System.String)">
-            <summary>
-            Saves the content of the page in the specified syntax.
-            </summary>
-            <param name="docName">The full name of the page.</param>
-            <param name="content">The html content to be converted.</param>
-            <param name="syntax">The syntax in wich the html code will be converted.</param>
-            <returns>True if the operation was completed successfully. Failse if saving failed.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String,System.IO.Stream)">
-            <summary>
-            Adds an attachment to a specified page.
-            </summary>
-            <param name="docName">The full name of the page.</param>
-            <param name="fileName">The name of the file. This is the name that will appear in the wiki.</param>
-            <param name="content">A stream to read the file content.</param>
-            <returns></returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddObject(System.String,System.String,System.Collections.Specialized.NameValueCollection)">
-            <summary>
-            Adds an object to a wiki page.
-            </summary>
-            <param name="docName">The fullname of the wiki page.</param>
-            <param name="ClassName">The xwiki class name of the object.</param>
-            <param name="fieldsValues">The values of the object's fields.</param>
-            <returns>The index of the inserted object.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetDocumentAttachmentList(System.String)">
-            <summary>
-            Gets a list with the attachmets' names of the specified page.
-            </summary>
-            <param name="docFullName">THe full name of the wiki page.</param>
-            <returns>A list with the names of the attachments.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentURL(System.String,System.String)">
-            <summary>
-            Gets the url of an attachment.
-            </summary>
-            <param name="docFullName">The full name of the wiki page.</param>
-            <param name="attachmentName">The name of the attachment.</param>
-            <returns>The url of the attached file.HttpResponses errors in caee if an error occures.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentContent(System.String,System.String)">
-            <summary>
-            Gets the content of an attachment.
-            </summary>
-            <param name="pageName">The full name of the wiki page.</param>
-            <param name="fileName">The name of the attachment.</param>
-            <returns>The content of the attachment.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentContent(System.String)">
-            <summary>
-            Get the content of an attachment.
-            </summary>
-            <param name="URL">The url of the attachment.</param>
-            <returns>The content of the attachment.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String)">
-            <summary>
-            Adds an attachment to the wiki.
-            </summary>
-            <param name="docName">The full name of the wiki page.</param>
-            <param name="filePath">The path to the file to be attached.</param>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String,System.String)">
-            <summary>
-            Attaches a file to the wiki.
-            </summary>
-            <param name="space">The space name.</param>
-            <param name="page">The short page name.</param>
-            <param name="filePath">The path to the file to be attached.</param>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachmentAsync(System.String,System.String)">
-            <summary>
-            Attaches a file to the wiki by using an async call. 
-            </summary>
-            <param name="docName">The full name of the wiki page.</param>
-            <param name="filePath">The path to the file to be attached.</param>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachmentAsync(System.String,System.String,System.String)">
-            <summary>
-            Attaches a file to the wiki by using an async call. 
-            </summary>
-            <param name="space">The space name.</param>
-            <param name="page">The short page name.</param>
-            <param name="filePath">The path to the file to be attached.</param>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetRenderedPageContent(System.String)">
-            <summary>
-            Gets the rendered content of a page.
-            </summary>
-            <param name="pageFullName">The full nae of the wiki page.</param>
-            <returns>The rendred content of the page.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetRenderedPageContent(System.String,System.String)">
-            <summary>
-            Gets the rendered page content of a page.
-            </summary>
-            <param name="space">The space name.</param>
-            <param name="page">The page name.</param>
-            <returns>The rendered content of the page.</returns>
-        </member>
-        <member name="M:XWiki.Clients.XWikiHTTPClient.GetURL(System.String,System.String)">
-            <summary>
-            Gets the url of a wiki page with the specified action.
-            </summary>
-            <param name="documentFullName">The full name of the wiki page.</param>
-            <param name="xwikiAction">The name of the action. Eg: edit, view, delete</param>
-            <returns>The url of the wiki page.</returns>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.Cookies">
-            <summary>
-            String collection containing the client's cookies.
-            </summary>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.WebClient">
-            <summary>
-            The WebClient instance.
-            </summary>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.LoggedIn">
-            <summary>
-            Specifies if the user is logged in;
-            </summary>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.Headers">
-            <summary>
-            The webclient's headers.
-            </summary>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.ServerURL">
-            <summary>
-            The url of the server that the client connects to.
-            </summary>
-        </member>
-        <member name="P:XWiki.Clients.XWikiHTTPClient.IsLoggedIn">
-            <summary>
-            Specifies if the current user is logged in.
-            </summary>
-        </member>
         <member name="T:XWiki.Html.HtmlUtil">
             <summary>
             Provides functionalities for cleaning and repairing html code.
@@ -730,48 +397,39 @@
             <param name="newBodyTag">The new body tag.</param>
             <returns>The new html code.</returns>
         </member>
-        <member name="T:XWiki.Space">
+        <member name="T:XWiki.Office.Word.ConverterActionState">
             <summary>
-            Describes a space in a XWiki server.
+            The states of the conversion.
             </summary>
         </member>
-        <member name="F:XWiki.Space.name">
+        <member name="F:XWiki.Office.Word.ConverterActionState.Downloading">
             <summary>
-            The name of the space.
+            The page is retrieved from server.
             </summary>
         </member>
-        <member name="F:XWiki.Space.hidden">
+        <member name="F:XWiki.Office.Word.ConverterActionState.Uploading">
             <summary>
-            Specifies if the space should be visible to the user.
+            The page is uploaded/saved on the server.
             </summary>
         </member>
-        <member name="F:XWiki.Space.documents">
+        <member name="F:XWiki.Office.Word.ConverterActionState.EditingPage">
             <summary>
-            The list of documents in the space.
+            The user is editing the opened page.
             </summary>
         </member>
-        <member name="M:XWiki.Space.#ctor">
+        <member name="F:XWiki.Office.Word.ConverterActionState.StoringForOffileUsage">
             <summary>
-            Default constructor. Creates a new instance of the Space class.
+            The page is stored for offline use.
+            <remarks>
+            Not yet implemented.
+            </remarks>
             </summary>
         </member>
-        <member name="M:XWiki.Clients.XWikiXMLRPCClient.#ctor">
+        <member name="F:XWiki.Office.Word.ConverterActionState.Exporting">
             <summary>
-            XML-RPC implementation of IXWikiCLient.
-            Provides access to the main features of XWiki using the XML-RPC API.
+            Exporting a new document to wiki.
             </summary>
         </member>
-        <member name="M:XWiki.Clients.XWikiXMLRPCClient.Login(System.String,System.String)">
-            <summary>
-            Authenticates the user to the server.
-            </summary>
-            <returns>True if the operation succedes. False if the operation fails.</returns>
-        </member>
-        <member name="P:XWiki.Clients.XWikiXMLRPCClient.IsLoggedIn">
-            <summary>
-            Specifies if the current user is logged in.
-            </summary>
-        </member>
         <member name="T:XWiki.Office.Word.BidirectionalConversionStates">
             <summary>
             Contains the states of the bidirectional conversion(Wiki->Word, Word->Wiki)
@@ -879,295 +537,649 @@
             True only if local file to web page conversion is in progress.
             </summary>
         </member>
-        <member name="T:XWiki.Office.Word.ImageInfo">
+        <member name="T:XWiki.Office.Word.ImageDownloadInfo">
             <summary>
-            Contains the states of a image in both web an local file system environments.
+            Class used to package the image information between threads.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.XWORD_IMG_ATTRIBUTE">
+        <member name="F:XWiki.Office.Word.ImageDownloadInfo.downloadFolder">
             <summary>
-            Image attribute used by XWord
+            The folder where the local image is located.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.altText">
+        <member name="M:XWiki.Office.Word.ImageDownloadInfo.#ctor(System.String,System.String,XWiki.Office.Word.ImageInfo)">
             <summary>
-            Alternative text used by the image
+            Creates a new instance for the ImageInfo class.
             </summary>
+            <param name="URI">The URI of the image.</param>
+            <param name="downloadFolder">The folder where the image will be downloaded.</param>
+            <param name="imageInfo">The states of the image on the server and on the local file system.</param>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.imgWebSrc">
+        <member name="P:XWiki.Office.Word.ImageDownloadInfo.URI">
             <summary>
-            The value of the src attribute while on a website.
+            The URI of the image.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.imgLocalSrc">
+        <member name="P:XWiki.Office.Word.ImageDownloadInfo.ImageInfo">
             <summary>
-            The value of the src attribute while on file system.
+            Gets or sets the states of the XWord image.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.filePath">
+        <member name="P:XWiki.Office.Word.ImageDownloadInfo.DownloadFolder">
             <summary>
-            The full path to the local file.
+            The folder where the image is downloaded to.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.fileURI">
+        <member name="T:XWiki.Office.Word.WebToLocalHTML">
             <summary>
-            The URI representing the local file.
+            Adapts the html source returned by the XWiki server and makes it usable by Word using a local html file.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.fileSize">
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.#ctor(XWiki.Office.Word.ConversionManager)">
             <summary>
-            The size of the local file.
+            Creates a new instance of the WebToLocalHTML class.
             </summary>
+            <param name="manager">The instance of the bidirectional conversion manager.</param>
         </member>
-        <member name="F:XWiki.Office.Word.ImageInfo.fileCreationDate">
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptSource(System.String)">
             <summary>
-            The creation date of the local file.
+            Adapts the Word generated content to XWiki friendly content.
             </summary>
+            <param name="content"></param>
+            <returns></returns>
         </member>
-        <member name="T:XWiki.Office.Word.ConverterActionState">
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptMacros(System.Xml.XmlDocument@)">
             <summary>
+            Adapts the html source to convert XWiki macros to Word Content Controls.
+            </summary>
+            <param name="xmlDoc">A reference to the xml dom containing the source.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.ReplaceMacros(System.Xml.XmlNode@,System.Xml.XmlDocument@)">
+            <summary>
+            Replaces the macros in a xml node with a Word content control tag.
+            </summary>
+            <param name="node">The xml node to be adapted.</param>
+            <param name="xmlDoc">A refrence to the xml document.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.GenerateContentControlNode(System.Xml.XmlDocument@)">
+            <summary>
+            Generates a new node instance for the Word Content Control.
+            </summary>
+            <param name="xmlDoc">A refence to the xml document.</param>
+            <returns>The instance of the new node.</returns>
+        </member>
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptImages(System.Xml.XmlDocument@)">
+            <summary>
+            Adapts the html source returned by the XWiki server and makes it usable by Word using a local html file.
+            </summary>
+            <param name="xmlDoc">A reference to the xml dom.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptLists(System.Xml.XmlDocument@)">
+            <summary>
+            Adapts lthe lists from the XWiki server to a format used by Word.
+            </summary>
+            <param name="xmlDoc"></param>
+        </member>
+        <member name="M:XWiki.Office.Word.WebToLocalHTML.DownloadImage(System.Object)">
+            <summary>
+            Downloads the image from the server and saves it to a local file.
+            </summary>
+            <param name="obj">The image data. Instance of ImageDownloadInfo used in cross thread data sharing.</param>
+        </member>
+        <member name="T:XWiki.Space">
+            <summary>
+            Describes a space in a XWiki server.
+            </summary>
+        </member>
+        <member name="F:XWiki.Space.name">
+            <summary>
+            The name of the space.
+            </summary>
+        </member>
+        <member name="F:XWiki.Space.hidden">
+            <summary>
+            Specifies if the space should be visible to the user.
+            </summary>
+        </member>
+        <member name="F:XWiki.Space.documents">
+            <summary>
+            The list of documents in the space.
+            </summary>
+        </member>
+        <member name="M:XWiki.Space.#ctor">
+            <summary>
+            Default constructor. Creates a new instance of the Space class.
+            </summary>
+        </member>
+        <member name="T:XWiki.Office.Word.ConversionManager">
+            <summary>
+            Manages the bidirectional conversion.(Web to Word and Word to Web)
+            </summary>
+        </member>
+        <member name="M:XWiki.Office.Word.ConversionManager.#ctor(System.String,System.String,System.String,System.String,XWiki.Clients.IXWikiClient)">
+            <summary>
+            Creates a new instance of the ConversionManager class.
+            </summary>
+            <param name="serverURL">The url of the server.</param>
+            <param name="localFolder">The local folder where documents are saved/</param>
+            <param name="docFullName">The full name of the wiki page.</param>
+            <param name="localFileName">The local file coresponding to the edited wiki page.</param>
+            <param name="client">IXWikiClient implementation, handling Client server communication.</param>
+        </member>
+        <member name="F:XWiki.Office.Word.ConversionManager.xwikiClient">
+            <summary>
+            IXWikiClient instance.
+            </summary>
+        </member>
+        <member name="F:XWiki.Office.Word.ConversionManager.localToWebHtml">
+            <summary>
+            Handler for Word->Web conversion
+            </summary>
+        </member>
+        <member name="F:XWiki.Office.Word.ConversionManager.webToLocalHtml">
+            <summary>
+            Instaqnce for the Web->Word convertor.
+            </summary>
+        </member>
+        <member name="F:XWiki.Office.Word.ConversionManager.states">
+            <summary>
             The states of the conversion.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ConverterActionState.Downloading">
+        <member name="M:XWiki.Office.Word.ConversionManager.ConvertFromWebToWord(System.String)">
             <summary>
-            The page is retrieved from server.
+            Converts a html source from a Web form to Word compatible format.
             </summary>
+            <param name="content">The html to be converted.</param>
+            <returns>The converted html.</returns>
         </member>
-        <member name="F:XWiki.Office.Word.ConverterActionState.Uploading">
+        <member name="M:XWiki.Office.Word.ConversionManager.ConvertFromWordToWeb(System.String)">
             <summary>
-            The page is uploaded/saved on the server.
+            Converts a html source from local Word format to xhtml usable on web.
             </summary>
+            <param name="content">The html to be converted.</param>
+            <returns>The new  xhtml.</returns>
         </member>
-        <member name="F:XWiki.Office.Word.ConverterActionState.EditingPage">
+        <member name="P:XWiki.Office.Word.ConversionManager.XWikiClient">
             <summary>
-            The user is editing the opened page.
+            Gets or sets the instance for the client.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ConverterActionState.StoringForOffileUsage">
+        <member name="P:XWiki.Office.Word.ConversionManager.LocalToWebHtml">
             <summary>
-            The page is stored for offline use.
-            <remarks>
-            Not yet implemented.
-            </remarks>
+            Gets or sets the instance of the Word->Web convertor.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ConverterActionState.Exporting">
+        <member name="P:XWiki.Office.Word.ConversionManager.WebToLocalHtml">
             <summary>
-            Exporting a new document to wiki.
+            Gets or sets the instance for the Web->Word convertor.
             </summary>
         </member>
-        <member name="T:XWiki.XWikiDocument">
+        <member name="P:XWiki.Office.Word.ConversionManager.States">
             <summary>
-            Describes a document on the XWiki server.
+            Gets or sets the states of the conversion.
             </summary>
         </member>
-        <member name="F:XWiki.XWikiDocument.name">
+        <member name="T:XWiki.Clients.HTTPResponses">
             <summary>
-            The name of the document.
+            Contains response strings from the velocity pages that provide XWord functionality.
             </summary>
         </member>
-        <member name="F:XWiki.XWikiDocument.space">
+        <member name="F:XWiki.Clients.HTTPResponses.SAVE_OK">
             <summary>
-            The space name of the document.
+            Specifies that the saving process was completed successfully.
             </summary>
         </member>
-        <member name="F:XWiki.XWikiDocument.content">
+        <member name="F:XWiki.Clients.HTTPResponses.WRONG_REQUEST">
             <summary>
-            The rendered content of the document.
+            Appears when a request was in a wrong format or had insufficinet parameters.
             </summary>
         </member>
-        <member name="M:XWiki.XWikiDocument.#ctor">
+        <member name="F:XWiki.Clients.HTTPResponses.VELOCITY_PARSER_ERROR">
             <summary>
-            Default constructor, creates a new instance of the XWikiDocument class.
+            Appears when the the server fails to parse a page.
             </summary>
         </member>
-        <member name="T:XWiki.WikiStructure">
+        <member name="F:XWiki.Clients.HTTPResponses.INSUFFICIENT_MEMMORY">
             <summary>
-            Class used to store data about the wiki structure.
-            Contains the list of spaces and documents.
+            Appears when the server has insufficeinet memmory for the current tasks.
             </summary>
         </member>
-        <member name="F:XWiki.WikiStructure.spaces">
+        <member name="F:XWiki.Clients.HTTPResponses.NO_PROGRAMMING_RIGHTS">
             <summary>
-            A list with all spaces in the wiki.
+            Returned if the page requires programming rights 
+            but it was las saved by a user without programming rights
             </summary>
         </member>
-        <member name="M:XWiki.WikiStructure.#ctor">
+        <member name="F:XWiki.Clients.HTTPResponses.NO_EDIT_RIGHTS">
             <summary>
-            Default constructor. Instantiates the spaces list.
+            Returned if the current user does not have the right to edit the specified page.
             </summary>
         </member>
-        <member name="M:XWiki.WikiStructure.GetAllDocuments">
+        <member name="F:XWiki.Clients.HTTPResponses.NO_GROOVY_RIGHTS">
             <summary>
-            Gets all document instances in the wiki.
+            Returned when the user/page does not have the right to parse and execute groovy pages.
             </summary>
-            <returns>A list with all document instances.</returns>
         </member>
-        <member name="M:XWiki.WikiStructure.RemoveXWikiDocument(XWiki.XWikiDocument)">
+        <member name="T:XWiki.XWikiURLs">
             <summary>
-            Removes a XWikiDocument instance from the wiki structure.
-            This has no effect on the server. It only affects the document list
-            Word works with.
+            Contains a list with the XWiki Word services url's.
             </summary>
         </member>
-        <member name="T:XWiki.Office.Word.ImageDownloadInfo">
+        <member name="P:XWiki.XWikiURLs.AttachmentServiceURL">
             <summary>
-            Class used to package the image information between threads.
+            Gets or sets the URL of the service that handles attachments.
             </summary>
         </member>
-        <member name="F:XWiki.Office.Word.ImageDownloadInfo.downloadFolder">
+        <member name="P:XWiki.XWikiURLs.LoginURL">
             <summary>
-            The folder where the local image is located.
+            Gets or sets the URL of the service/page that handles authentication.
             </summary>
         </member>
-        <member name="M:XWiki.Office.Word.ImageDownloadInfo.#ctor(System.String,System.String,XWiki.Office.Word.ImageInfo)">
+        <member name="P:XWiki.XWikiURLs.SavePageURL">
             <summary>
-            Creates a new instance for the ImageInfo class.
+            Gets the URL of the service that handles page editing and saving.
             </summary>
-            <param name="URI">The URI of the image.</param>
-            <param name="downloadFolder">The folder where the image will be downloaded.</param>
-            <param name="imageInfo">The states of the image on the server and on the local file system.</param>
         </member>
-        <member name="P:XWiki.Office.Word.ImageDownloadInfo.URI">
+        <member name="P:XWiki.XWikiURLs.GetPageURL">
             <summary>
-            The URI of the image.
+            Gets the URL of the service that provides page content and rendering.
             </summary>
         </member>
-        <member name="P:XWiki.Office.Word.ImageDownloadInfo.ImageInfo">
+        <member name="P:XWiki.XWikiURLs.WikiStructureURL">
             <summary>
-            Gets or sets the states of the XWord image.
+            Gets the URL of the service that provides access to the structure of the wiki.
             </summary>
         </member>
-        <member name="P:XWiki.Office.Word.ImageDownloadInfo.DownloadFolder">
+        <member name="P:XWiki.XWikiURLs.ProtectedPagesURL">
             <summary>
-            The folder where the image is downloaded to.
+            Gets or sets the URL of the page that contains the list of protected wiki pages.
+            This wiki pages contain scripts that provide functionality to the wiki and cannot be edited
+            with Word without having macro support.
             </summary>
         </member>
-        <member name="T:XWiki.Office.Word.WebToLocalHTML">
+        <member name="T:XWiki.Clients.XWikiHTTPClient">
             <summary>
-            Adapts the html source returned by the XWiki server and makes it usable by Word using a local html file.
+            Adaptor over System.Net.WebClient
+            Uses plain HTTP calls to send and retrieve data from the XWiki server
+            Service pages on the server are in the MSOffice space
             </summary>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.#ctor(XWiki.Office.Word.ConversionManager)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.#ctor(System.String,System.String,System.String)">
+            <param name="serverURL">The url of the server.</param>
+            <param name="username">The username used to authenticate.</param>
+            <param name="password">The passowrd used to authenticate.</param>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.InsertCookies">
             <summary>
-            Creates a new instance of the WebToLocalHTML class.
+            Inserts the authetication cookies into the request headers.
             </summary>
-            <param name="manager">The instance of the bidirectional conversion manager.</param>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptSource(System.String)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.Login">
             <summary>
-            Adapts the Word generated content to XWiki friendly content.
+            Authenticates the user to the server.
             </summary>
-            <param name="content"></param>
+            <returns>True if the opration succeded. False if the operation failed.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetCookie(System.String,System.String)">
+            <summary>
+            Parses the cookies for the server response and returns the requested value.
+            <remarks>Returns "" if the searched value is not found.</remarks>
+            </summary>
+            <param name="searchedCookie"></param>
+            <param name="cookiesString"></param>
             <returns></returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptMacros(System.Xml.XmlDocument@)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.OpenRead(System.String)">
             <summary>
-            Adapts the html source to convert XWiki macros to Word Content Controls.
+            Starts reading from an address.
             </summary>
-            <param name="xmlDoc">A reference to the xml dom containing the source.</param>
+            <param name="address">The adress.</param>
+            <returns>A stream with the read data.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.ReplaceMacros(System.Xml.XmlNode@,System.Xml.XmlDocument@)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.OpenRead(System.Uri)">
             <summary>
-            Replaces the macros in a xml node with a Word content control tag.
+            Starts reading from an address.
             </summary>
-            <param name="node">The xml node to be adapted.</param>
-            <param name="xmlDoc">A refrence to the xml document.</param>
+            <param name="address">The adress.</param>
+            <returns>A stream with the read data.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.GenerateContentControlNode(System.Xml.XmlDocument@)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadValues(System.String,System.Collections.Specialized.NameValueCollection)">
             <summary>
-            Generates a new node instance for the Word Content Control.
+            Uploads(POSTs) the values to the server.
             </summary>
-            <param name="xmlDoc">A refence to the xml document.</param>
-            <returns>The instance of the new node.</returns>
+            <param name="address">The adress where the values are uploaded.</param>
+            <param name="values">Name value collection with the upload data.</param>
+            <returns>A stream with the server response.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptImages(System.Xml.XmlDocument@)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadValues(System.String,System.String,System.Collections.Specialized.NameValueCollection)">
             <summary>
-            Adapts the html source returned by the XWiki server and makes it usable by Word using a local html file.
+            Uploads the values to the server.
             </summary>
-            <param name="xmlDoc">A reference to the xml dom.</param>
+            <param name="address">The adress where the values are uploaded.</param>
+            <param name="method">The mothod used to send data to the server.</param>
+            <param name="values">Name value collection with the upload data.</param>
+            <returns>A stream with the server response.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.AdaptLists(System.Xml.XmlDocument@)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.String,System.Byte[])">
             <summary>
-            Adapts lthe lists from the XWiki server to a format used by Word.
+            Uploads data to the server.
             </summary>
-            <param name="xmlDoc"></param>
+            <param name="address">The adress where the data will be uploaded.</param>
+            <param name="data">The data that will be uploaded.</param>
+            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.WebToLocalHTML.DownloadImage(System.Object)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.Uri,System.Byte[])">
             <summary>
-            Downloads the image from the server and saves it to a local file.
+            Uploads data to the server.
             </summary>
-            <param name="obj">The image data. Instance of ImageDownloadInfo used in cross thread data sharing.</param>
+            <param name="address">The adress where the data will be uploaded.</param>
+            <param name="data">The data that will be uploaded.</param>
+            <returns>The server response.</returns>
         </member>
-        <member name="T:XWiki.Office.Word.ConversionManager">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.String,System.String,System.Byte[])">
             <summary>
-            Manages the bidirectional conversion.(Web to Word and Word to Web)
+            Uploads data to the server.
             </summary>
+            <param name="address">The adress where the data will be uploaded.</param>
+            <param name="method">The web method used to upload the data.</param>
+            <param name="data">The data that will be uploaded.</param>
+            <see cref="M:System.Net.WebClient.UploadData(System.String,System.String,System.Byte[])"/>
+            <returns>The server response.</returns>
         </member>
-        <member name="M:XWiki.Office.Word.ConversionManager.#ctor(System.String,System.String,System.String,System.String,XWiki.Clients.IXWikiClient)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.UploadData(System.Uri,System.String,System.Byte[])">
             <summary>
-            Creates a new instance of the ConversionManager class.
+            Uploads data to the server.
             </summary>
-            <param name="serverURL">The url of the server.</param>
-            <param name="localFolder">The local folder where documents are saved/</param>
+            <param name="address">The adress where the data will be uploaded.</param>
+            <param name="method">The web method used to upload the data.</param>
+            <param name="data">The data that will be uploaded.</param>
+            <returns>The server response.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.DownloadData(System.Uri)">
+            <summary>
+            Downloads data from the server.
+            </summary>
+            <param name="address">The adress of the resource.</param>
+            <returns>A byte array with the downloaded data.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.DownloadData(System.String)">
+            <summary>
+            Downloads data from the server.
+            </summary>
+            <param name="address">The adress of the resource.</param>
+            <returns>A byte array with the downloaded data.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.ParseList(System.String)">
+            <summary>
+            Parses a velocity response into a list.
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.ConvertEncoding(System.String)">
+            <summary>
+            Converts a string to a specified encoding.
+            </summary>
+            <param name="content">The string to be converted.</param>
+            <returns>The convertes string.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.Login(System.String,System.String)">
+            <summary>
+            Authenticates the user to the server.
+            </summary>
+            <param name="username">The username.</param>
+            <param name="password">The password.</param>
+            <returns>True if the operation succeded. False if the operation failed.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetWikiStructure">
+            <summary>
+            Gets the spaces and pages of the wiki.
+            </summary>
+            <returns>A stream with a serialized WikiStructure object.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetWikiPageAsPlainHTML(System.String)">
+            <summary>
+            Gets the rendered content of the page.
+            </summary>
+            <param name="docName">The full name of the page.</param>
+            <returns>A stream with content.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetSpaces">
+            <summary>
+            Gets the spaces of a wiki.
+            </summary>
+            <returns>A list containing the spaces names.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetPages(System.String)">
+            <summary>
+            Gets the pages names for the specified space.
+            </summary>
+            <param name="spaceName">The name of the space.</param>
+            <returns>A list with the pages names.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.SavePageHTML(System.String,System.String,System.String)">
+            <summary>
+            Saves the content of the page in the specified syntax.
+            </summary>
+            <param name="docName">The full name of the page.</param>
+            <param name="content">The html content to be converted.</param>
+            <param name="syntax">The syntax in wich the html code will be converted.</param>
+            <returns>True if the operation was completed successfully. Failse if saving failed.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String,System.IO.Stream)">
+            <summary>
+            Adds an attachment to a specified page.
+            </summary>
+            <param name="docName">The full name of the page.</param>
+            <param name="fileName">The name of the file. This is the name that will appear in the wiki.</param>
+            <param name="content">A stream to read the file content.</param>
+            <returns></returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddObject(System.String,System.String,System.Collections.Specialized.NameValueCollection)">
+            <summary>
+            Adds an object to a wiki page.
+            </summary>
+            <param name="docName">The fullname of the wiki page.</param>
+            <param name="ClassName">The xwiki class name of the object.</param>
+            <param name="fieldsValues">The values of the object's fields.</param>
+            <returns>The index of the inserted object.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetDocumentAttachmentList(System.String)">
+            <summary>
+            Gets a list with the attachmets' names of the specified page.
+            </summary>
+            <param name="docFullName">THe full name of the wiki page.</param>
+            <returns>A list with the names of the attachments.</returns>
+        </member>
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentURL(System.String,System.String)">
+            <summary>
+            Gets the url of an attachment.
+            </summary>
             <param name="docFullName">The full name of the wiki page.</param>
-            <param name="localFileName">The local file coresponding to the edited wiki page.</param>
-            <param name="client">IXWikiClient implementation, handling Client server communication.</param>
+            <param name="attachmentName">The name of the attachment.</param>
+            <returns>The url of the attached file.HttpResponses errors in caee if an error occures.</returns>
         </member>
-        <member name="F:XWiki.Office.Word.ConversionManager.xwikiClient">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentContent(System.String,System.String)">
             <summary>
-            IXWikiClient instance.
+            Gets the content of an attachment.
             </summary>
+            <param name="pageName">The full name of the wiki page.</param>
+            <param name="fileName">The name of the attachment.</param>
+            <returns>The content of the attachment.</returns>
         </member>
-        <member name="F:XWiki.Office.Word.ConversionManager.localToWebHtml">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetAttachmentContent(System.String)">
             <summary>
-            Handler for Word->Web conversion
+            Get the content of an attachment.
             </summary>
+            <param name="URL">The url of the attachment.</param>
+            <returns>The content of the attachment.</returns>
         </member>
-        <member name="F:XWiki.Office.Word.ConversionManager.webToLocalHtml">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String)">
             <summary>
-            Instaqnce for the Web->Word convertor.
+            Adds an attachment to the wiki.
             </summary>
+            <param name="docName">The full name of the wiki page.</param>
+            <param name="filePath">The path to the file to be attached.</param>
         </member>
-        <member name="F:XWiki.Office.Word.ConversionManager.states">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachment(System.String,System.String,System.String)">
             <summary>
-            The states of the conversion.
+            Attaches a file to the wiki.
             </summary>
+            <param name="space">The space name.</param>
+            <param name="page">The short page name.</param>
+            <param name="filePath">The path to the file to be attached.</param>
         </member>
-        <member name="M:XWiki.Office.Word.ConversionManager.ConvertFromWebToWord(System.String)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachmentAsync(System.String,System.String)">
             <summary>
-            Converts a html source from a Web form to Word compatible format.
+            Attaches a file to the wiki by using an async call. 
             </summary>
-            <param name="content">The html to be converted.</param>
-            <returns>The converted html.</returns>
+            <param name="docName">The full name of the wiki page.</param>
+            <param name="filePath">The path to the file to be attached.</param>
         </member>
-        <member name="M:XWiki.Office.Word.ConversionManager.ConvertFromWordToWeb(System.String)">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.AddAttachmentAsync(System.String,System.String,System.String)">
             <summary>
-            Converts a html source from local Word format to xhtml usable on web.
+            Attaches a file to the wiki by using an async call. 
             </summary>
-            <param name="content">The html to be converted.</param>
-            <returns>The new  xhtml.</returns>
+            <param name="space">The space name.</param>
+            <param name="page">The short page name.</param>
+            <param name="filePath">The path to the file to be attached.</param>
         </member>
-        <member name="P:XWiki.Office.Word.ConversionManager.XWikiClient">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetRenderedPageContent(System.String)">
             <summary>
-            Gets or sets the instance for the client.
+            Gets the rendered content of a page.
             </summary>
+            <param name="pageFullName">The full nae of the wiki page.</param>
+            <returns>The rendred content of the page.</returns>
         </member>
-        <member name="P:XWiki.Office.Word.ConversionManager.LocalToWebHtml">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetRenderedPageContent(System.String,System.String)">
             <summary>
-            Gets or sets the instance of the Word->Web convertor.
+            Gets the rendered page content of a page.
             </summary>
+            <param name="space">The space name.</param>
+            <param name="page">The page name.</param>
+            <returns>The rendered content of the page.</returns>
         </member>
-        <member name="P:XWiki.Office.Word.ConversionManager.WebToLocalHtml">
+        <member name="M:XWiki.Clients.XWikiHTTPClient.GetURL(System.String,System.String)">
             <summary>
-            Gets or sets the instance for the Web->Word convertor.
+            Gets the url of a wiki page with the specified action.
             </summary>
+            <param name="documentFullName">The full name of the wiki page.</param>
+            <param name="xwikiAction">The name of the action. Eg: edit, view, delete</param>
+            <returns>The url of the wiki page.</returns>
         </member>
-        <member name="P:XWiki.Office.Word.ConversionManager.States">
+        <member name="P:XWiki.Clients.XWikiHTTPClient.Cookies">
             <summary>
-            Gets or sets the states of the conversion.
+            String collection containing the client's cookies.
             </summary>
         </member>
+        <member name="P:XWiki.Clients.XWikiHTTPClient.WebClient">
+            <summary>
+            The WebClient instance.
+            </summary>
+        </member>
+        <member name="P:XWiki.Clients.XWikiHTTPClient.LoggedIn">
+            <summary>
+            Specifies if the user is logged in;
+            </summary>
+        </member>
+        <member name="P:XWiki.Clients.XWikiHTTPClient.Headers">
+            <summary>
+            The webclient's headers.
+            </summary>
+        </member>
+        <member name="P:XWiki.Clients.XWikiHTTPClient.ServerURL">
+            <summary>
+            The url of the server that the client connects to.
+            </summary>
+        </member>
+        <member name="P:XWiki.Clients.XWikiHTTPClient.IsLoggedIn">
+            <summary>
+            Specifies if the current user is logged in.
+            </summary>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptSource(System.String)">
+            <summary>
+            Adapts the HTML source from it's local MS Word form in order to be used by the wiki.
+            </summary>
+            <param name="content">The initial HTML source.</param>
+            <returns>The adapted HTML code.</returns>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.ClearStyles(System.Xml.XmlDocument@)">
+            <summary>
+            Deletes the style attributes from the Word generated content
+            </summary>
+            <param name="xmlDoc">A refrence to the xml document.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.ClearOfficeAttributes(System.Xml.XmlDocument@)">
+            <summary>
+            Deletes all office specific attributes
+            </summary>
+            <param name="xmlDoc">A reference to the xml document.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptImages(System.Xml.XmlDocument@)">
+            <summary>
+            Adapts the images from the local(file:///) to the xwiki format.
+            </summary>
+            <param name="xmlDoc">A reference to the xml document.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptMacros(System.Xml.XmlDocument@)">
+            <summary>
+            Replaces the read-only Word content controls with XWiki macro markup.
+            </summary>
+            <param name="xmlDoc">A reference to the xml document instance.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.AdaptLists(System.Xml.XmlDocument@)">
+            <summary>
+            Adapts to the lists to a less styled format.
+            </summary>
+            <param name="xmlDoc">A reference to the xml document instance.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.RemoveExtraLists(System.Xml.XmlDocument@)">
+            <summary>
+            Removes the extra lists Word creates for sublists.
+            The child 'ul' is moved to the previous sibling.
+            </summary>
+            <param name="xmlDoc">A reference to the xml document.</param>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.IsImageDirty(System.Xml.XmlNode)">
+            <summary>
+            Specifies if an image is new or has been modified.
+            </summary>
+            <param name="node">The XML node(element) that contains the image tag</param>
+            <returns>Returns true is the image is new or has been modified. Otherwise returns false.</returns>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.HasXWordId(System.Xml.XmlNode)">
+            <summary>
+            Specifies if an image has an XWordId 
+            </summary>
+            <param name="node">The currently processed</param>
+            <returns>True if the note has a xword attribute, false if not.</returns>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.GetMatchingImages(System.Xml.XmlNode)">
+            <summary>
+            Gets a list with the GUIDs assigned assigned to image across the html source.
+            </summary>
+            <param name="node">Teh </param>
+            <returns></returns>
+        </member>
+        <member name="M:XWiki.Office.Word.LocalToWebHTML.BorderImages(System.Xml.XmlDocument@)">
+            <summary>
+            Adds comments before and after image tags.
+            </summary>
+            <param name="xmlDoc">A reference to the filtered XmlDocument instance.</param>
+        </member>
+        <member name="T:XWiki.Xml.XmlDocumentExtension">
+            <summary>
+            Extension for XmlDocument class.
+            </summary>
+        </member>
+        <member name="M:XWiki.Xml.XmlDocumentExtension.GetIndentedXml(System.Xml.XmlDocument)">
+            <summary>
+            Extension method providing indended output.
+            </summary>
+            <param name="xmlDoc">XmlDocument instance.</param>
+            <returns>Indended XML</returns>
+        </member>
     </members>
 </doc>
Index: xword/XWord/XWordXmlDoc.XML
===================================================================
--- xword/XWord/XWordXmlDoc.XML	(revision 18239)
+++ xword/XWord/XWordXmlDoc.XML	(working copy)
@@ -4,279 +4,322 @@
         <name>XWord</name>
     </assembly>
     <members>
-        <member name="T:XWriter.XWikiRibbon">
+        <member name="T:XWriter.LoadingDialog">
             <summary>
-            Provides XWiki specific UI elements using the Office 2007 Ribbon UI.
+            A dialog that is shown when a long operation is executed or a Word instance restart/swich is required.
             </summary>
         </member>
-        <member name="M:XWriter.XWikiRibbon.#ctor">
+        <member name="F:XWriter.LoadingDialog.components">
             <summary>
-            Default constructor. Initializes all components.
+            Required designer variable.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.components">
+        <member name="M:XWriter.LoadingDialog.Dispose(System.Boolean)">
             <summary>
-            Required designer variable.
-            </summary>
-        </member>
-        <member name="M:XWriter.XWikiRibbon.Dispose(System.Boolean)">
-            <summary> 
             Clean up any resources being used.
             </summary>
             <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         </member>
-        <member name="M:XWriter.XWikiRibbon.InitializeComponent">
+        <member name="M:XWriter.LoadingDialog.InitializeComponent">
             <summary>
             Required method for Designer support - do not modify
             the contents of this method with the code editor.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.AttachmentsGroup">
+        <member name="M:XWriter.LoadingDialog.#ctor(System.String)">
             <summary>
-            Group containing the buttons for handling attachments.
+            Displays a continuous progress bar while an operation is in progress.
             </summary>
+            <param name="message"></param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.uploadAttToPage">
+        <member name="M:XWriter.LoadingDialog.ShowSyncDialog(System.Object)">
             <summary>
-            Button used to upload the active document to the selected page.
+            Shows the form.
             </summary>
+            <remarks>Recomended for cross tread calls.</remarks>
+            <param name="obj">Extra parameter to match the wait callback signature.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.downloadAtt">
+        <member name="M:XWriter.LoadingDialog.CloseSyncDialog">
             <summary>
-            Button used to upload the download the selected attachment.
+            Closes the dialog in a safe cross thread manner.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnNewPage">
+        <member name="T:XWriter.AddinSettingsForm">
             <summary>
-            Button used to create a new page.
+            Provides UI for changing the add-in settings.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnPublishDocument">
+        <member name="M:XWriter.AddinSettingsForm.#ctor">
             <summary>
-            Button used to save/publish the active document to the wiki.
+            Default constructor. Initializes all components.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnAddPage">
+        <member name="M:XWriter.AddinSettingsForm.btnApply_Click(System.Object,System.EventArgs)">
             <summary>
-            Button used to add the a new page to the wiki.
+            Event triggered when the "Apply" button is clicked.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnUpload">
+        <member name="M:XWriter.AddinSettingsForm.ApplyConnectionSettings">
             <summary>
-            Button used to upload the active document to the seleted page.
+            Sets the new connection settings for the addin,
+            connects to the server and refreshes the active wiki explorer.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnDownload">
+        <member name="M:XWriter.AddinSettingsForm.ApplyRepositoriesSettings">
             <summary>
-            Button used to donwload the selected attachment.
+            Sets the pages and attachments repositories.
             </summary>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnShowPages">
+        <member name="M:XWriter.AddinSettingsForm.btnCancel_Click(System.Object,System.EventArgs)">
             <summary>
-            Button used to show the pages of a space in Wiki Explorer.
+            Event triggered when the "Cancel button is pressed.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnShowAttachments">
+        <member name="M:XWriter.AddinSettingsForm.ConnectionSettingsForm_Load(System.Object,System.EventArgs)">
             <summary>
-            Button used to show the attachments of a page in Wiki Exploerer.
+            Event that is automatically triggered the Form is loading.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnViewInBrowser">
+        <member name="M:XWriter.AddinSettingsForm.txtAnyConnectionSetting_TextChanged(System.Object,System.EventArgs)">
             <summary>
-            Button used to view the selected page in the default browser.
+            Event triggered when a connection setting is changed.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnDownloadAndOpen">
+        <member name="M:XWriter.AddinSettingsForm.btnOK_Click(System.Object,System.EventArgs)">
             <summary>
-            Downloads and opens the selected attachement with the assigned application.
+            Event triggered when the OK button is pressed.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.btnEditPage">
+        <member name="M:XWriter.AddinSettingsForm.btnPagesRepo_Click(System.Object,System.EventArgs)">
             <summary>
-            Edit the selected page with Word.
+            Event triggered when the select pages repository is clicked.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.dropDownSyntax">
+        <member name="M:XWriter.AddinSettingsForm.btnAttachmentsRepo_Click(System.Object,System.EventArgs)">
             <summary>
-            Contains the syntax options to save a pege on the wiki.
+            Event triggered when the select downloaded attachments repository is clicked.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="F:XWriter.XWikiRibbon.dropDownSaveFormat">
+        <member name="M:XWriter.AddinSettingsForm.ValidateURL(System.String)">
             <summary>
-            Contains a list with the html formats that Word can use to save the local wiki pages.
+            Checks if a url is valid.
             </summary>
+            <param name="url">The value of the url to be checked.</param>
+            <returns>True if the url is valid. False if the url is not valid.</returns>
         </member>
-        <member name="P:XWriter.XWikiRibbon.Addin">
+        <member name="M:XWriter.AddinSettingsForm.ValidatePath(System.String)">
             <summary>
-            The addin instance.
+            Checks if a path is valid
             </summary>
+            <param name="path">The value of the path.</param>
+            <returns>True if the path is valid. False if the path is not valid.</returns>
         </member>
-        <member name="T:XWriter.Properties.Resources">
+        <member name="M:XWriter.AddinSettingsForm.txtPagesRepo_Leave(System.Object,System.EventArgs)">
             <summary>
-              A strongly-typed resource class, for looking up localized strings, etc.
+            Event triggered when the textbox loses the focus.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="P:XWriter.Properties.Resources.ResourceManager">
+        <member name="M:XWriter.AddinSettingsForm.txtAttachmentsRepo_Leave(System.Object,System.EventArgs)">
             <summary>
-              Returns the cached ResourceManager instance used by this class.
+            Event triggered when the textbox loses the focus.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="P:XWriter.Properties.Resources.Culture">
+        <member name="M:XWriter.AddinSettingsForm.anyRepoSettingChanged_TextChanged(System.Object,System.EventArgs)">
             <summary>
-              Overrides the current thread's CurrentUICulture property for all
-              resource lookups using this strongly typed resource class.
+            Event triggered when a repository setting is changed.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event paramaters.</param>
         </member>
-        <member name="T:XWriter.AddinStatus">
+        <member name="F:XWriter.AddinSettingsForm.components">
             <summary>
-            Represents the context of the add-in.
+            Required designer variable.
             </summary>
         </member>
-        <member name="M:XWriter.AddinStatus.SetTaskPaneSelectedPage(System.String,System.String)">
+        <member name="M:XWriter.AddinSettingsForm.Dispose(System.Boolean)">
             <summary>
-            Sets the values corresponding to the selected page in the tree view
+            Clean up any resources being used.
             </summary>
-            <param name="space">The value for the "space" key.</param>
-            <param name="page">The value for the "page" key.</param>
+            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         </member>
-        <member name="P:XWriter.AddinStatus.Syntax">
+        <member name="M:XWriter.AddinSettingsForm.InitializeComponent">
             <summary>
-            The syntax used to save the wiki pages.
-            <remarks>The conversion is done on the web server</remarks>
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
             </summary>
         </member>
-        <member name="P:XWriter.AddinStatus.ServerURL">
+        <member name="P:XWriter.AddinSettingsForm.Addin">
             <summary>
-            The URL of the server to which the user is conected.
+            Gets a refferesnce to the Addin instance.
             </summary>
         </member>
-        <member name="P:XWriter.AddinStatus.LoggedIn">
+        <member name="P:XWriter.AddinSettingsForm.ServerURL">
             <summary>
-            Specifies if the user is logged in to XWiki server or not.
+            Gets or sets the URL of the server that the add-in conncets to.
             </summary>
         </member>
-        <member name="P:XWriter.AddinStatus.ConnectedWithServer">
+        <member name="P:XWriter.AddinSettingsForm.UserName">
             <summary>
-            Specifies if the server is connected to the XWiki server or not.
+            Gets the user name that was provided.
             </summary>
         </member>
-        <member name="P:XWriter.AddinStatus.TaskPaneSelectedPage">
+        <member name="P:XWriter.AddinSettingsForm.Password">
             <summary>
-            Gets the value of the curently selected tree node representing a page
+            Gets the password that was provided.
             </summary>
         </member>
-        <member name="P:XWriter.AddinStatus.TaskPaneShown">
+        <member name="T:XWriter.AddPageForm">
             <summary>
-            Gets/Sets the status of the task pane.
-            The keys are: "page" and "space".
+            UI for adding a page or a space.
             </summary>
         </member>
-        <member name="T:XWriter.RepositorySettings">
+        <member name="F:XWriter.AddPageForm.components">
             <summary>
-            Structure used for writing and retrieving data from Isolated Storage.
+            Required designer variable.
             </summary>
         </member>
-        <member name="M:XWriter.RepositorySettings.#ctor">
+        <member name="M:XWriter.AddPageForm.Dispose(System.Boolean)">
             <summary>
-            Creates a new instance of the class.
-            <remarks>Used for serialization.</remarks>
+            Clean up any resources being used.
             </summary>
+            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         </member>
-        <member name="P:XWriter.RepositorySettings.PagesRepository">
+        <member name="M:XWriter.AddPageForm.InitializeComponent">
             <summary>
-            Gets or sets the value for the pages repositoy.
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
             </summary>
         </member>
-        <member name="P:XWriter.RepositorySettings.DownloadedAttachmentsRepository">
+        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@)">
+            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
+        </member>
+        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@,System.String)">
+            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
+            <param name="_spaceName">
+            The default space name in which the new page will be created
+            </param>
+        </member>
+        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@,System.Boolean,System.Boolean)">
+            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
+            <param name="newSpace">Specifies if a new space will be created.</param>
+            <param name="_exportMode">
+            Specifies if the form is used to assign an export destination
+            for a document
+            </param>
+        </member>
+        <member name="M:XWriter.AddPageForm.AddPageForm_Load(System.Object,System.EventArgs)">
             <summary>
-            Gets ot sets the value of the path where the downloaded attachments are stored.
+            Event triggered when the form is loading.
             </summary>
+            <param name="sender">The control that triggered the event.</param>
+            <param name="e">The event parameters.</param>
         </member>
-        <member name="T:XWriter.Repositories">
+        <member name="M:XWriter.AddPageForm.LoadSpaces">
             <summary>
-            Offers functionality for storing the repository settings to Isolated Storage.
+            Loads the spaces into the combo.
             </summary>
         </member>
-        <member name="M:XWriter.Repositories.WriteRepositorySettings(XWriter.RepositorySettings)">
+        <member name="M:XWriter.AddPageForm.radioButton1_CheckedChanged(System.Object,System.EventArgs)">
             <summary>
-            Writes the repository settings to Isolated Storage.
+            Refreshes the UI to the coresponding option regarding the space.
             </summary>
-            <param name="settings">The settings to be saved.</param>
-            <returns>True if the operation succeded. False if the operation failed.</returns>
+            <param name="sender"></param>
+            <param name="e"></param>
         </member>
-        <member name="M:XWriter.Repositories.GetRepositorySettings">
+        <member name="M:XWriter.AddPageForm.btnAddPage_Click(System.Object,System.EventArgs)">
             <summary>
-            Gets the repository settings from Isolated Storage.
+            Event triggered when the "Add page" button is pressed.
             </summary>
-            <returns>A instance containing the repository settings.</returns>
+            <param name="sender"></param>
+            <param name="e"></param>
         </member>
-        <member name="M:XWriter.Repositories.HasRepositorySettings">
+        <member name="M:XWriter.AddPageForm.ValidateFormData">
             <summary>
-            Specifies if the application has the repository settings saved in Isolated Storage.
+            Validates the data.
             </summary>
-            <returns>
-            True is the repository configuration file exists in Isolated Storage.
-            False if the file does not exist.
-            </returns>
+            <returns>True if data is valid. False if data is invalid.</returns>
         </member>
-        <member name="T:XWriter.LoadingDialog">
+        <member name="M:XWriter.AddPageForm.comboBox1_SelectedIndexChanged(System.Object,System.EventArgs)">
             <summary>
-            A dialog that is shown when a long operation is executed or a Word instance restart/swich is required.
+            Sets the instance of the selected space when the combo box selection is changed
             </summary>
         </member>
-        <member name="M:XWriter.LoadingDialog.#ctor(System.String)">
+        <member name="M:XWriter.AddPageForm.btnCancel_Click(System.Object,System.EventArgs)">
             <summary>
-            Displays a continuous progress bar while an operation is in progress.
+            Closes the form.
             </summary>
-            <param name="message"></param>
         </member>
-        <member name="M:XWriter.LoadingDialog.ShowSyncDialog(System.Object)">
+        <member name="T:XWriter.Log">
             <summary>
-            Shows the form.
+            A class for writing logs to IsolatedStorage
             </summary>
-            <remarks>Recomended for cross tread calls.</remarks>
-            <param name="obj">Extra parameter to match the wait callback signature.</param>
         </member>
-        <member name="M:XWriter.LoadingDialog.CloseSyncDialog">
+        <member name="M:XWriter.Log.Write(System.String,System.Diagnostics.EventLogEntryType)">
             <summary>
-            Closes the dialog in a safe cross thread manner.
+            Writes a entry to the application's log.
             </summary>
+            <param name="message">The logged message.</param>
+            <param name="type">The type of the message.</param>
         </member>
-        <member name="F:XWriter.LoadingDialog.components">
+        <member name="M:XWriter.Log.Error(System.String)">
             <summary>
-            Required designer variable.
+            Reports an error.
             </summary>
+            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.LoadingDialog.Dispose(System.Boolean)">
+        <member name="M:XWriter.Log.Information(System.String)">
             <summary>
-            Clean up any resources being used.
+            Writes some information to the log.
             </summary>
-            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.LoadingDialog.InitializeComponent">
+        <member name="M:XWriter.Log.Success(System.String)">
             <summary>
-            Required method for Designer support - do not modify
-            the contents of this method with the code editor.
+            Reports an success of an audit/assertion.
             </summary>
+            <param name="message">The log message.</param>
         </member>
-        <member name="T:XWriter.ThisRibbonCollection">
-            
+        <member name="M:XWriter.Log.Warning(System.String)">
+            <summary>
+            Writes an warning message to the logs.
+            </summary>
+            <param name="message">The log message.</param>
         </member>
-        <member name="F:XWriter.AboutXWord.components">
+        <member name="M:XWriter.Log.FailAssert(System.String)">
             <summary>
-            Required designer variable.
+            Reports a failed assertion.
             </summary>
+            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.AboutXWord.Dispose(System.Boolean)">
+        <member name="M:XWriter.Log.ExceptionSummary(System.Exception)">
             <summary>
-            Clean up any resources being used.
+            Logs a summary info about an exception.
             </summary>
+            <param name="ex">The logged exception.</param>
         </member>
-        <member name="M:XWriter.AboutXWord.InitializeComponent">
+        <member name="M:XWriter.Log.Exception(System.Exception)">
             <summary>
-            Required method for Designer support - do not modify
-            the contents of this method with the code editor.
+            Logs info about an exception.
             </summary>
+            <param name="ex">The logged exception.</param>
         </member>
         <member name="T:XWriter.XWikiNavigationPane">
             <summary>
@@ -542,309 +585,6 @@
             Instance containing the most common actions the add-in could perform.
             </summary>
         </member>
-        <member name="T:XWriter.AddinActions">
-            <summary>
-            Provides implementations for the common addin actions.
-            This class should contain most VSTO specific code.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinActions.#ctor(XWriter.XWikiAddIn)">
-            <summary>
-            Creates an instance for this class.
-            </summary>
-            <param name="addin">The instance of the current add-in.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.DownloadAttachment(System.String,System.String,System.String)">
-            <summary>
-            Downloads the file to a local folder. The folder is located in MyDocuments
-            </summary>
-            <param name="pageFullName">FullName of the wiki page - Space.Name</param>
-            <param name="attachmentName">Name of the attached file</param>
-            <param name="path">The location where the attachment will be downloaded. Use null for default location.</param>
-            <returns></returns>
-        </member>
-        <member name="M:XWriter.AddinActions.AttachCurrentFile(System.String)">
-            <summary>
-            Saves the document and attaches it to a wiki page
-            </summary>
-            <param name="pageFullName">The full name of the wiki page.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.AttachCurrentFile(System.String,System.String)">
-            <summary>
-            Saves the document and attaches it to a wiki page
-            </summary>
-            <param name="space">The name of the wiki space.</param>
-            <param name="page">The name of the page.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.StartProcess(System.String)">
-            <summary>
-            Starts a new process. 
-             - If the file is executable then it will execute that file.
-             - If the file file is resistered to be opened with another application
-             then it will be opened with that application
-             - If the file doesnt have an assigned application then Windows Explorer openes it's directory.
-            </summary>
-            <param name="fullFileName">The full path and name of the file.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.IsOpened(System.String)">
-            <summary>
-            Specifies if a wiki page is opened for editing.
-            </summary>
-            <param name="pageFullName">The full name of the page.</param>
-            <returns>True if the page is already opened. False otherwise.</returns>
-        </member>
-        <member name="M:XWriter.AddinActions.EditPage(System.String)">
-            <summary>
-            Edits a wiki page.
-            The LoadingDialog is shown during the operation.
-            <see cref="M:XWriter.AddinActions.EditPage(System.String)"/>
-            </summary>
-            <param name="pageFullName">The full name of the wiki page that is being opened for editing.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.GetPage(System.Object)">
-            <summary>
-            Edits a wiki page.
-            </summary>
-            <param name="_pageFullName">The full name of the wiki page that is being opened for editing.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.SavePage(System.String,System.String@,System.String)">
-            <summary>
-            Saves the page to the wiki. Shows a message box with an error if the operation fails.
-            </summary>
-            <param name="pageName">The full name of the wiki page.</param>
-            <param name="pageContent">The contant to be saved.</param>
-            <param name="syntax">The wiki syntax of the saved page.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.OpenHTMLDocument(System.String)">
-            <summary>
-            Opens a local(document) file with Word.
-            </summary>
-            <param name="path">The path to the file.</param>
-            <returns>Returns a Document instance.</returns>
-        </member>
-        <member name="M:XWriter.AddinActions.SaveToServer">
-            <summary>
-            Saves the currently edited page or document to the server.
-            Displays the operation in progress dialog.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinActions.SaveToXwiki">
-            <summary>
-            Saves the currently edited page or document to the server.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinActions.AddNewPage(System.String,System.String)">
-            <summary>
-            Starts editing a new wiki page. The page will not be created in the wiki until the fisrt save.
-            </summary>
-            <param name="space">The name of the wiki space</param>
-            <param name="pageName">The name of page</param>
-        </member>
-        <member name="M:XWriter.AddinActions.ConvertToNormalFolder(System.String)">
-            <summary>
-            Converts the folder to a "Normal" type folder.
-            </summary>
-            <param name="folder"></param>
-        </member>
-        <member name="M:XWriter.AddinActions.AddNewPage(System.String,System.String,System.String,System.Windows.Forms.Form)">
-            <summary>
-            Starts editing a new wiki page. The page will not be created in the wiki until the fisrt save.
-            </summary>
-            <param name="space">The name of the wiki space.</param>
-            <param name="pageName">The name of page.</param>
-            <param name="pageTitle">The title of the page.</param>
-            <param name="sender">
-            The instance of the fprm that started the action.
-            This form need to be closed before swithing the Active Word Document.
-            </param>
-        </member>
-        <member name="M:XWriter.AddinActions.SaveFileDialog(System.String)">
-            <summary>
-            Displays a SaveFileDialog
-            </summary>
-            <param name="fileName">Optional name of file to be saved.</param>
-            <returns>The path to the file to be saved. Null if the user cancels the saving.</returns>
-        </member>
-        <member name="M:XWriter.AddinActions.CheckForErrors(System.String)">
-            <summary>
-            Searches the server response for error strings.
-            </summary>
-            <param name="content">The server response.</param>
-            <returns>True if the response contains error reports. False if the response does not ocntain error reports.</returns>
-        </member>
-        <member name="M:XWriter.AddinActions.HideProtectedPages(XWiki.WikiStructure,System.Collections.Generic.List{System.String})">
-            <summary>
-            Removes all protected pages from the Word wiki structure.
-            </summary>
-            <param name="wiki">The wiki instance.</param>
-            <param name="wildcards">The list of protected pages wildcards.</param>
-        </member>
-        <member name="M:XWriter.AddinActions.IsProtectedPage(System.String,System.Collections.Generic.List{System.String})">
-            <summary>
-            Specifies if a page is protected or not.
-            </summary>
-            <param name="pageFullName">The full name of the page.</param>
-            <param name="wildCards">The wildcard list of protected pages.</param>
-            <returns></returns>
-        </member>
-        <member name="M:XWriter.AddinActions.ShadowCopyDocument(Microsoft.Office.Interop.Word.Document,System.String,Microsoft.Office.Interop.Word.WdSaveFormat)">
-            <summary>
-            Copies a document to a specified path.
-            </summary>
-            <param name="document">The Document instance.</param>
-            <param name="path">The path where the new file will be saved.</param>
-            <param name="saveFormat">The save format.</param>
-            <exception cref="T:System.IO.IOException">When the file cannot be saved.</exception>
-            <remarks>The document is saved in Unicode little endian encoding.</remarks>
-            <returns>True if the operation succedes. False otherwise.</returns>
-        </member>
-        <member name="P:XWriter.AddinActions.Client">
-            <summary>
-            Generic webclient used for conneting to xwiki.
-            </summary>        
-        </member>
-        <member name="T:XWriter.AddinSettingsForm">
-            <summary>
-            Provides UI for changing the add-in settings.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.#ctor">
-            <summary>
-            Default constructor. Initializes all components.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.btnApply_Click(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the "Apply" button is clicked.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.ApplyConnectionSettings">
-            <summary>
-            Sets the new connection settings for the addin,
-            connects to the server and refreshes the active wiki explorer.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.ApplyRepositoriesSettings">
-            <summary>
-            Sets the pages and attachments repositories.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.btnCancel_Click(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the "Cancel button is pressed.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.ConnectionSettingsForm_Load(System.Object,System.EventArgs)">
-            <summary>
-            Event that is automatically triggered the Form is loading.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.txtAnyConnectionSetting_TextChanged(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when a connection setting is changed.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.btnOK_Click(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the OK button is pressed.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.btnPagesRepo_Click(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the select pages repository is clicked.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.btnAttachmentsRepo_Click(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the select downloaded attachments repository is clicked.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.ValidateURL(System.String)">
-            <summary>
-            Checks if a url is valid.
-            </summary>
-            <param name="url">The value of the url to be checked.</param>
-            <returns>True if the url is valid. False if the url is not valid.</returns>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.ValidatePath(System.String)">
-            <summary>
-            Checks if a path is valid
-            </summary>
-            <param name="path">The value of the path.</param>
-            <returns>True if the path is valid. False if the path is not valid.</returns>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.txtPagesRepo_Leave(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the textbox loses the focus.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.txtAttachmentsRepo_Leave(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when the textbox loses the focus.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.anyRepoSettingChanged_TextChanged(System.Object,System.EventArgs)">
-            <summary>
-            Event triggered when a repository setting is changed.
-            </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event paramaters.</param>
-        </member>
-        <member name="F:XWriter.AddinSettingsForm.components">
-            <summary>
-            Required designer variable.
-            </summary>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.Dispose(System.Boolean)">
-            <summary>
-            Clean up any resources being used.
-            </summary>
-            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        </member>
-        <member name="M:XWriter.AddinSettingsForm.InitializeComponent">
-            <summary>
-            Required method for Designer support - do not modify
-            the contents of this method with the code editor.
-            </summary>
-        </member>
-        <member name="P:XWriter.AddinSettingsForm.Addin">
-            <summary>
-            Gets a refferesnce to the Addin instance.
-            </summary>
-        </member>
-        <member name="P:XWriter.AddinSettingsForm.ServerURL">
-            <summary>
-            Gets or sets the URL of the server that the add-in conncets to.
-            </summary>
-        </member>
-        <member name="P:XWriter.AddinSettingsForm.UserName">
-            <summary>
-            Gets the user name that was provided.
-            </summary>
-        </member>
-        <member name="P:XWriter.AddinSettingsForm.Password">
-            <summary>
-            Gets the password that was provided.
-            </summary>
-        </member>
         <member name="T:XWord.Util.UtilityClass">
             <summary>
             Provides misc functionality for the add-in.
@@ -867,55 +607,22 @@
             <param name="casesensitive">Specifies if the comparation shouls be case sensitive or not.</param>
             <returns>True if the string mathches the wildcard. False otherwize.</returns>
         </member>
-        <member name="T:XWriter.XWikiRibbonTest">
+        <member name="F:XWriter.AboutXWord.components">
             <summary>
-            Test class for the ribbon.
+            Required designer variable.
             </summary>
         </member>
-        <member name="M:XWriter.XWikiRibbonTest.#ctor">
+        <member name="M:XWriter.AboutXWord.Dispose(System.Boolean)">
             <summary>
-            Default constructor
+            Clean up any resources being used.
             </summary>
         </member>
-        <member name="M:XWriter.XWikiRibbonTest.GlobalSetUp">
+        <member name="M:XWriter.AboutXWord.InitializeComponent">
             <summary>
-            Initialize the test.
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
             </summary>
         </member>
-        <member name="M:XWriter.XWikiRibbonTest.TestDropDownSaveFormat">
-            <summary>
-            Test method for DropDownSave format consistency
-            </summary>
-        </member>
-        <member name="T:XWriter.LoginData">
-            <summary>
-            Provindes functionality for storing authentication data. 
-            </summary>
-        </member>
-        <member name="M:XWriter.LoginData.WriteCredentials(System.String[])">
-            <summary>
-            Writes the user credentials to the disk for automatic login
-            </summary>
-            <param name="credentials">Array of strings containing the credentials</param>
-            <returns>True if the operation is uscessfull. False otherwise.</returns>
-        </member>
-        <member name="M:XWriter.LoginData.GetCredentials">
-            <summary>
-            Gets the last used credentials.
-            </summary>
-            <returns>Array of strings containing the last used credentials</returns>
-        </member>
-        <member name="M:XWriter.LoginData.ClearCredentials">
-            <summary>
-            Erases the last saved credentials form isolated storage.
-            </summary>
-        </member>
-        <member name="M:XWriter.LoginData.CanAutoLogin">
-            <summary>
-            Specifies if the last user saved his credentials for autologin.
-            </summary>
-            <returns></returns>
-        </member>
         <member name="T:XWriter.XWikiAddIn">
             
         </member>
@@ -1221,6 +928,9 @@
         <member name="M:XWriter.Globals.#ctor">
             
         </member>
+        <member name="T:XWriter.ThisRibbonCollection">
+            
+        </member>
         <member name="T:XWriter.VstoExtensions.ContentProtectionExtension">
             <summary>
             Extension for protecting Word content with VSTO
@@ -1253,140 +963,430 @@
             Protect BookMark
             </summary>
         </member>
-        <member name="T:XWriter.Log">
+        <member name="T:XWriter.XWikiRibbon">
             <summary>
-            A class for writing logs to IsolatedStorage
+            Provides XWiki specific UI elements using the Office 2007 Ribbon UI.
             </summary>
         </member>
-        <member name="M:XWriter.Log.Write(System.String,System.Diagnostics.EventLogEntryType)">
+        <member name="M:XWriter.XWikiRibbon.#ctor">
             <summary>
-            Writes a entry to the application's log.
+            Default constructor. Initializes all components.
             </summary>
-            <param name="message">The logged message.</param>
-            <param name="type">The type of the message.</param>
         </member>
-        <member name="M:XWriter.Log.Error(System.String)">
+        <member name="F:XWriter.XWikiRibbon.components">
             <summary>
-            Reports an error.
+            Required designer variable.
             </summary>
-            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.Log.Information(System.String)">
+        <member name="M:XWriter.XWikiRibbon.Dispose(System.Boolean)">
+            <summary> 
+            Clean up any resources being used.
+            </summary>
+            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        </member>
+        <member name="M:XWriter.XWikiRibbon.InitializeComponent">
             <summary>
-            Writes some information to the log.
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
             </summary>
-            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.Log.Success(System.String)">
+        <member name="F:XWriter.XWikiRibbon.AttachmentsGroup">
             <summary>
-            Reports an success of an audit/assertion.
+            Group containing the buttons for handling attachments.
             </summary>
-            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.Log.Warning(System.String)">
+        <member name="F:XWriter.XWikiRibbon.uploadAttToPage">
             <summary>
-            Writes an warning message to the logs.
+            Button used to upload the active document to the selected page.
             </summary>
-            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.Log.FailAssert(System.String)">
+        <member name="F:XWriter.XWikiRibbon.downloadAtt">
             <summary>
-            Reports a failed assertion.
+            Button used to upload the download the selected attachment.
             </summary>
-            <param name="message">The log message.</param>
         </member>
-        <member name="M:XWriter.Log.ExceptionSummary(System.Exception)">
+        <member name="F:XWriter.XWikiRibbon.btnNewPage">
             <summary>
-            Logs a summary info about an exception.
+            Button used to create a new page.
             </summary>
-            <param name="ex">The logged exception.</param>
         </member>
-        <member name="M:XWriter.Log.Exception(System.Exception)">
+        <member name="F:XWriter.XWikiRibbon.btnPublishDocument">
             <summary>
-            Logs info about an exception.
+            Button used to save/publish the active document to the wiki.
             </summary>
-            <param name="ex">The logged exception.</param>
         </member>
-        <member name="T:XWriter.AddPageForm">
+        <member name="F:XWriter.XWikiRibbon.btnAddPage">
             <summary>
-            UI for adding a page or a space.
+            Button used to add the a new page to the wiki.
             </summary>
         </member>
-        <member name="F:XWriter.AddPageForm.components">
+        <member name="F:XWriter.XWikiRibbon.btnUpload">
             <summary>
-            Required designer variable.
+            Button used to upload the active document to the seleted page.
             </summary>
         </member>
-        <member name="M:XWriter.AddPageForm.Dispose(System.Boolean)">
+        <member name="F:XWriter.XWikiRibbon.btnDownload">
             <summary>
-            Clean up any resources being used.
+            Button used to donwload the selected attachment.
             </summary>
-            <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         </member>
-        <member name="M:XWriter.AddPageForm.InitializeComponent">
+        <member name="F:XWriter.XWikiRibbon.btnShowPages">
             <summary>
-            Required method for Designer support - do not modify
-            the contents of this method with the code editor.
+            Button used to show the pages of a space in Wiki Explorer.
             </summary>
         </member>
-        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@)">
-            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
+        <member name="F:XWriter.XWikiRibbon.btnShowAttachments">
+            <summary>
+            Button used to show the attachments of a page in Wiki Exploerer.
+            </summary>
         </member>
-        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@,System.String)">
-            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
-            <param name="_spaceName">
-            The default space name in which the new page will be created
-            </param>
+        <member name="F:XWriter.XWikiRibbon.btnViewInBrowser">
+            <summary>
+            Button used to view the selected page in the default browser.
+            </summary>
         </member>
-        <member name="M:XWriter.AddPageForm.#ctor(XWiki.WikiStructure@,System.Boolean,System.Boolean)">
-            <param name="_wiki">A reference to the currently loaded wiki structure.</param>
-            <param name="newSpace">Specifies if a new space will be created.</param>
-            <param name="_exportMode">
-            Specifies if the form is used to assign an export destination
-            for a document
+        <member name="F:XWriter.XWikiRibbon.btnDownloadAndOpen">
+            <summary>
+            Downloads and opens the selected attachement with the assigned application.
+            </summary>
+        </member>
+        <member name="F:XWriter.XWikiRibbon.btnEditPage">
+            <summary>
+            Edit the selected page with Word.
+            </summary>
+        </member>
+        <member name="F:XWriter.XWikiRibbon.dropDownSyntax">
+            <summary>
+            Contains the syntax options to save a pege on the wiki.
+            </summary>
+        </member>
+        <member name="F:XWriter.XWikiRibbon.dropDownSaveFormat">
+            <summary>
+            Contains a list with the html formats that Word can use to save the local wiki pages.
+            </summary>
+        </member>
+        <member name="P:XWriter.XWikiRibbon.Addin">
+            <summary>
+            The addin instance.
+            </summary>
+        </member>
+        <member name="T:XWriter.AddinStatus">
+            <summary>
+            Represents the context of the add-in.
+            </summary>
+        </member>
+        <member name="M:XWriter.AddinStatus.SetTaskPaneSelectedPage(System.String,System.String)">
+            <summary>
+            Sets the values corresponding to the selected page in the tree view
+            </summary>
+            <param name="space">The value for the "space" key.</param>
+            <param name="page">The value for the "page" key.</param>
+        </member>
+        <member name="P:XWriter.AddinStatus.Syntax">
+            <summary>
+            The syntax used to save the wiki pages.
+            <remarks>The conversion is done on the web server</remarks>
+            </summary>
+        </member>
+        <member name="P:XWriter.AddinStatus.ServerURL">
+            <summary>
+            The URL of the server to which the user is conected.
+            </summary>
+        </member>
+        <member name="P:XWriter.AddinStatus.LoggedIn">
+            <summary>
+            Specifies if the user is logged in to XWiki server or not.
+            </summary>
+        </member>
+        <member name="P:XWriter.AddinStatus.ConnectedWithServer">
+            <summary>
+            Specifies if the server is connected to the XWiki server or not.
+            </summary>
+        </member>
+        <member name="P:XWriter.AddinStatus.TaskPaneSelectedPage">
+            <summary>
+            Gets the value of the curently selected tree node representing a page
+            </summary>
+        </member>
+        <member name="P:XWriter.AddinStatus.TaskPaneShown">
+            <summary>
+            Gets/Sets the status of the task pane.
+            The keys are: "page" and "space".
+            </summary>
+        </member>
+        <member name="T:XWriter.RepositorySettings">
+            <summary>
+            Structure used for writing and retrieving data from Isolated Storage.
+            </summary>
+        </member>
+        <member name="M:XWriter.RepositorySettings.#ctor">
+            <summary>
+            Creates a new instance of the class.
+            <remarks>Used for serialization.</remarks>
+            </summary>
+        </member>
+        <member name="P:XWriter.RepositorySettings.PagesRepository">
+            <summary>
+            Gets or sets the value for the pages repositoy.
+            </summary>
+        </member>
+        <member name="P:XWriter.RepositorySettings.DownloadedAttachmentsRepository">
+            <summary>
+            Gets ot sets the value of the path where the downloaded attachments are stored.
+            </summary>
+        </member>
+        <member name="T:XWriter.Repositories">
+            <summary>
+            Offers functionality for storing the repository settings to Isolated Storage.
+            </summary>
+        </member>
+        <member name="M:XWriter.Repositories.WriteRepositorySettings(XWriter.RepositorySettings)">
+            <summary>
+            Writes the repository settings to Isolated Storage.
+            </summary>
+            <param name="settings">The settings to be saved.</param>
+            <returns>True if the operation succeded. False if the operation failed.</returns>
+        </member>
+        <member name="M:XWriter.Repositories.GetRepositorySettings">
+            <summary>
+            Gets the repository settings from Isolated Storage.
+            </summary>
+            <returns>A instance containing the repository settings.</returns>
+        </member>
+        <member name="M:XWriter.Repositories.HasRepositorySettings">
+            <summary>
+            Specifies if the application has the repository settings saved in Isolated Storage.
+            </summary>
+            <returns>
+            True is the repository configuration file exists in Isolated Storage.
+            False if the file does not exist.
+            </returns>
+        </member>
+        <member name="T:XWriter.Properties.Resources">
+            <summary>
+              A strongly-typed resource class, for looking up localized strings, etc.
+            </summary>
+        </member>
+        <member name="P:XWriter.Properties.Resources.ResourceManager">
+            <summary>
+              Returns the cached ResourceManager instance used by this class.
+            </summary>
+        </member>
+        <member name="P:XWriter.Properties.Resources.Culture">
+            <summary>
+              Overrides the current thread's CurrentUICulture property for all
+              resource lookups using this strongly typed resource class.
+            </summary>
+        </member>
+        <member name="T:XWriter.LoginData">
+            <summary>
+            Provindes functionality for storing authentication data. 
+            </summary>
+        </member>
+        <member name="M:XWriter.LoginData.WriteCredentials(System.String[])">
+            <summary>
+            Writes the user credentials to the disk for automatic login
+            </summary>
+            <param name="credentials">Array of strings containing the credentials</param>
+            <returns>True if the operation is uscessfull. False otherwise.</returns>
+        </member>
+        <member name="M:XWriter.LoginData.GetCredentials">
+            <summary>
+            Gets the last used credentials.
+            </summary>
+            <returns>Array of strings containing the last used credentials</returns>
+        </member>
+        <member name="M:XWriter.LoginData.ClearCredentials">
+            <summary>
+            Erases the last saved credentials form isolated storage.
+            </summary>
+        </member>
+        <member name="M:XWriter.LoginData.CanAutoLogin">
+            <summary>
+            Specifies if the last user saved his credentials for autologin.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:XWriter.AddinActions">
+            <summary>
+            Provides implementations for the common addin actions.
+            This class should contain most VSTO specific code.
+            </summary>
+        </member>
+        <member name="M:XWriter.AddinActions.#ctor(XWriter.XWikiAddIn)">
+            <summary>
+            Creates an instance for this class.
+            </summary>
+            <param name="addin">The instance of the current add-in.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.DownloadAttachment(System.String,System.String,System.String)">
+            <summary>
+            Downloads the file to a local folder. The folder is located in MyDocuments
+            </summary>
+            <param name="pageFullName">FullName of the wiki page - Space.Name</param>
+            <param name="attachmentName">Name of the attached file</param>
+            <param name="path">The location where the attachment will be downloaded. Use null for default location.</param>
+            <returns></returns>
+        </member>
+        <member name="M:XWriter.AddinActions.AttachCurrentFile(System.String)">
+            <summary>
+            Saves the document and attaches it to a wiki page
+            </summary>
+            <param name="pageFullName">The full name of the wiki page.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.AttachCurrentFile(System.String,System.String)">
+            <summary>
+            Saves the document and attaches it to a wiki page
+            </summary>
+            <param name="space">The name of the wiki space.</param>
+            <param name="page">The name of the page.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.StartProcess(System.String)">
+            <summary>
+            Starts a new process. 
+             - If the file is executable then it will execute that file.
+             - If the file file is resistered to be opened with another application
+             then it will be opened with that application
+             - If the file doesnt have an assigned application then Windows Explorer openes it's directory.
+            </summary>
+            <param name="fullFileName">The full path and name of the file.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.IsOpened(System.String)">
+            <summary>
+            Specifies if a wiki page is opened for editing.
+            </summary>
+            <param name="pageFullName">The full name of the page.</param>
+            <returns>True if the page is already opened. False otherwise.</returns>
+        </member>
+        <member name="M:XWriter.AddinActions.EditPage(System.String)">
+            <summary>
+            Edits a wiki page.
+            The LoadingDialog is shown during the operation.
+            <see cref="M:XWriter.AddinActions.EditPage(System.String)"/>
+            </summary>
+            <param name="pageFullName">The full name of the wiki page that is being opened for editing.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.GetPage(System.Object)">
+            <summary>
+            Edits a wiki page.
+            </summary>
+            <param name="_pageFullName">The full name of the wiki page that is being opened for editing.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.SavePage(System.String,System.String@,System.String)">
+            <summary>
+            Saves the page to the wiki. Shows a message box with an error if the operation fails.
+            </summary>
+            <param name="pageName">The full name of the wiki page.</param>
+            <param name="pageContent">The contant to be saved.</param>
+            <param name="syntax">The wiki syntax of the saved page.</param>
+        </member>
+        <member name="M:XWriter.AddinActions.OpenHTMLDocument(System.String)">
+            <summary>
+            Opens a local(document) file with Word.
+            </summary>
+            <param name="path">The path to the file.</param>
+            <returns>Returns a Document instance.</returns>
+        </member>
+        <member name="M:XWriter.AddinActions.SaveToServer">
+            <summary>
+            Saves the currently edited page or document to the server.
+            Displays the operation in progress dialog.
+            </summary>
+        </member>
+        <member name="M:XWriter.AddinActions.SaveToXwiki">
+            <summary>
+            Saves the currently edited page or document to the server.
+            </summary>
+        </member>
+        <member name="M:XWriter.AddinActions.AddNewPage(System.String,System.String)">
+            <summary>
+            Starts editing a new wiki page. The page will not be created in the wiki until the fisrt save.
+            </summary>
+            <param name="space">The name of the wiki space</param>
+            <param name="pageName">The name of page</param>
+        </member>
+        <member name="M:XWriter.AddinActions.ConvertToNormalFolder(System.String)">
+            <summary>
+            Converts the folder to a "Normal" type folder.
+            </summary>
+            <param name="folder"></param>
+        </member>
+        <member name="M:XWriter.AddinActions.AddNewPage(System.String,System.String,System.String,System.Windows.Forms.Form)">
+            <summary>
+            Starts editing a new wiki page. The page will not be created in the wiki until the fisrt save.
+            </summary>
+            <param name="space">The name of the wiki space.</param>
+            <param name="pageName">The name of page.</param>
+            <param name="pageTitle">The title of the page.</param>
+            <param name="sender">
+            The instance of the fprm that started the action.
+            This form need to be closed before swithing the Active Word Document.
             </param>
         </member>
-        <member name="M:XWriter.AddPageForm.AddPageForm_Load(System.Object,System.EventArgs)">
+        <member name="M:XWriter.AddinActions.SaveFileDialog(System.String)">
             <summary>
-            Event triggered when the form is loading.
+            Displays a SaveFileDialog
             </summary>
-            <param name="sender">The control that triggered the event.</param>
-            <param name="e">The event parameters.</param>
+            <param name="fileName">Optional name of file to be saved.</param>
+            <returns>The path to the file to be saved. Null if the user cancels the saving.</returns>
         </member>
-        <member name="M:XWriter.AddPageForm.LoadSpaces">
+        <member name="M:XWriter.AddinActions.CheckForErrors(System.String)">
             <summary>
-            Loads the spaces into the combo.
+            Searches the server response for error strings.
             </summary>
+            <param name="content">The server response.</param>
+            <returns>True if the response contains error reports. False if the response does not ocntain error reports.</returns>
         </member>
-        <member name="M:XWriter.AddPageForm.radioButton1_CheckedChanged(System.Object,System.EventArgs)">
+        <member name="M:XWriter.AddinActions.HideProtectedPages(XWiki.WikiStructure,System.Collections.Generic.List{System.String})">
             <summary>
-            Refreshes the UI to the coresponding option regarding the space.
+            Removes all protected pages from the Word wiki structure.
             </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
+            <param name="wiki">The wiki instance.</param>
+            <param name="wildcards">The list of protected pages wildcards.</param>
         </member>
-        <member name="M:XWriter.AddPageForm.btnAddPage_Click(System.Object,System.EventArgs)">
+        <member name="M:XWriter.AddinActions.IsProtectedPage(System.String,System.Collections.Generic.List{System.String})">
             <summary>
-            Event triggered when the "Add page" button is pressed.
+            Specifies if a page is protected or not.
             </summary>
-            <param name="sender"></param>
-            <param name="e"></param>
+            <param name="pageFullName">The full name of the page.</param>
+            <param name="wildCards">The wildcard list of protected pages.</param>
+            <returns></returns>
         </member>
-        <member name="M:XWriter.AddPageForm.ValidateFormData">
+        <member name="M:XWriter.AddinActions.ShadowCopyDocument(Microsoft.Office.Interop.Word.Document,System.String,Microsoft.Office.Interop.Word.WdSaveFormat)">
             <summary>
-            Validates the data.
+            Copies a document to a specified path.
             </summary>
-            <returns>True if data is valid. False if data is invalid.</returns>
+            <param name="document">The Document instance.</param>
+            <param name="path">The path where the new file will be saved.</param>
+            <param name="saveFormat">The save format.</param>
+            <exception cref="T:System.IO.IOException">When the file cannot be saved.</exception>
+            <remarks>The document is saved in Unicode little endian encoding.</remarks>
+            <returns>True if the operation succedes. False otherwise.</returns>
         </member>
-        <member name="M:XWriter.AddPageForm.comboBox1_SelectedIndexChanged(System.Object,System.EventArgs)">
+        <member name="P:XWriter.AddinActions.Client">
             <summary>
-            Sets the instance of the selected space when the combo box selection is changed
+            Generic webclient used for conneting to xwiki.
+            </summary>        
+        </member>
+        <member name="T:XWriter.XWikiRibbonTest">
+            <summary>
+            Test class for the ribbon.
             </summary>
         </member>
-        <member name="M:XWriter.AddPageForm.btnCancel_Click(System.Object,System.EventArgs)">
+        <member name="M:XWriter.XWikiRibbonTest.#ctor">
             <summary>
-            Closes the form.
+            Default constructor
             </summary>
         </member>
+        <member name="M:XWriter.XWikiRibbonTest.GlobalSetUp">
+            <summary>
+            Initialize the test.
+            </summary>
+        </member>
+        <member name="M:XWriter.XWikiRibbonTest.TestDropDownSaveFormat">
+            <summary>
+            Test method for DropDownSave format consistency
+            </summary>
+        </member>
     </members>
 </doc>
