summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-10-20 20:37:46 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-10-20 20:37:46 +0000
commitd6fe1601cfb73ded1a19651c68cfade2a5531383 (patch)
treed694b1ac92c74de956c8757ba2e1a391f775d4a7 /docs
parenta18385e1e09794f8ed46d99883e1e00bf554f69a (diff)
docs: Updated licensing terms with acknowledgment clarification, updated changelog
git-svn-id: http://pugixml.googlecode.com/svn/trunk@771 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'docs')
-rw-r--r--docs/manual.qbk11
-rw-r--r--docs/quickstart.qbk7
2 files changed, 18 insertions, 0 deletions
diff --git a/docs/manual.qbk b/docs/manual.qbk
index 430ba36..e7184d3 100644
--- a/docs/manual.qbk
+++ b/docs/manual.qbk
@@ -84,6 +84,13 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
]
+This means that you can freely use pugixml in your applications, both open-source and proprietary. If you use pugixml in a product, it is sufficient, but not strictly necessary, to add an acknowledgment like this to the product distribution:
+
+[:
+This software is based on pugixml library (http://pugixml.org).'''<sbr />'''
+pugixml is Copyright (C) 2006-2010 Arseny Kapoulkine.
+]
+
[endsect] [/license]
[endsect] [/overview]
@@ -1628,6 +1635,9 @@ Major release, featuring many XPath enhancements, wide character filename suppor
* Specification changes:
# CDATA nodes containing ]]> are printed as several nodes; while this changes the internal structure, this is the only way to escape CDATA contents
# Memory allocation errors during parsing now preserve last parsed offset (to give an idea about parsing progress)
+ # If an element node has the only child, and it is of CDATA type, then the extra indentation is omitted (previously this behavior only held for PCDATA children)
+
+* Additional functionality:
# Added xml_parse_result default constructor
# Added xml_document::load_file and xml_document::save_file with wide character paths
# Added as_utf8 and as_wide overloads for std::wstring/std::string arguments
@@ -1636,6 +1646,7 @@ Major release, featuring many XPath enhancements, wide character filename suppor
# Added xml_node::hash_value() and xml_attribute::hash_value() functions for use in hash-based containers
# Added internal_object() and additional constructor for both xml_node and xml_attribute for easier marshalling (useful for language bindings)
# Added xml_document::document_element() function
+ # Added xml_node::prepend_attribute, xml_node::prepend_child and xml_node::prepend_copy functions
* Performance improvements:
# xml_node::root() and xml_node::offset_debug() are now O(1) instead of O(logN)
diff --git a/docs/quickstart.qbk b/docs/quickstart.qbk
index adf0c33..7b15d8f 100644
--- a/docs/quickstart.qbk
+++ b/docs/quickstart.qbk
@@ -248,6 +248,13 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
]
+This means that you can freely use pugixml in your applications, both open-source and proprietary. If you use pugixml in a product, it is sufficient, but not strictly necessary, to add an acknowledgment like this to the product distribution:
+
+[:
+This software is based on pugixml library (http://pugixml.org).'''<sbr />'''
+pugixml is Copyright (C) 2006-2010 Arseny Kapoulkine.
+]
+
[endsect] [/license]
[endsect] [/main]