[19/29] ant-ivy git commit: Initial auto-converted .adoc files from xooki2asciidoc convertor

[ja...@apache.org]

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/ivyfile-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/ivyfile-small.png b/asciidoc/images/ivyfile-small.png
new file mode 100644
index 0000000..d92b6e2
Binary files /dev/null and b/asciidoc/images/ivyfile-small.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/logo.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/logo.png b/asciidoc/images/logo.png
new file mode 100644
index 0000000..5c01f3d
Binary files /dev/null and b/asciidoc/images/logo.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.odg
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.odg b/asciidoc/images/main-tasks.odg
new file mode 100644
index 0000000..2e75d56
Binary files /dev/null and b/asciidoc/images/main-tasks.odg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.png b/asciidoc/images/main-tasks.png
new file mode 100644
index 0000000..d37bc5d
Binary files /dev/null and b/asciidoc/images/main-tasks.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/main-tasks.svg
----------------------------------------------------------------------
diff --git a/asciidoc/images/main-tasks.svg b/asciidoc/images/main-tasks.svg
new file mode 100644
index 0000000..6334ddd
--- /dev/null
+++ b/asciidoc/images/main-tasks.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 647.669 503.39903" version="1.2" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <path fill-rule="evenodd" fill="#119a48" d="m237.42 102zm-170.04-102zm16.92 0c-8.399 0-16.92 8.52-16.92 17.039v67.921c0 8.52 8.521 17.04 16.92 17.04h136.08c8.521 0 17.04-8.521 17.04-17.04v-67.921c0-8.52-8.52-17.039-17.04-17.039h-136.08z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <path d="m84.298 0.000005c-8.399 0-16.92 8.52-16.92 17.039v67.921c0 8.52 8.521 17.04 16.92 17.04h136.08c8.521 0 17.04-8.521 17.04-17.04v-67.921c0-8.52-8.52-17.039-17.04-17.039h-136.08z"/>
+    <path d="m67.378 0.000005z"/>
+    <path d="m237.42 102z"/>
+  </g>
+  <path fill="#fff" d="m133.61 36.403c0 0.956-0.219 1.811-0.654 2.562-0.437 0.752-1.06 1.334-1.872 1.745-0.812 0.412-1.777 0.617-2.896 0.617h-3.691v5.231h-3.111v-14.86h6.677c1.778 0 3.148 0.409 4.107 1.229s1.44 1.978 1.44 3.476zm-3.133 0.053c0-1.562-0.922-2.342-2.764-2.342h-3.217v4.82h3.302c0.857 0 1.519-0.213 1.982-0.639 0.464-0.424 0.697-1.038 0.697-1.839zm8.152-1.309v6.402c0 2.004 0.675 3.006 2.024 3.006 0.718 0 1.296-0.308 1.735-0.923s0.659-1.404 0.659-2.368v-6.117h2.964v8.859c0 0.971 0.028 1.821 0.084 2.553h-2.826c-0.085-1.013-0.127-1.769-0.127-2.268h-0.053c-0.394 0.865-0.895 1.494-1.503 1.888s-1.33 0.591-2.167 0.591c-1.21 0-2.138-0.371-2.784-1.112-0.647-0.742-0.971-1.83-0.971-3.265v-7.246h2.965zm21.181 5.665c0 1.885-0.378 3.349-1.134 4.393s-1.837 1.566-3.243 1.566c-0.809 0-1.508-0.176-2.099-0.527s-1.044-0.857-1.36-1.519h-0.021c0 0.246-0.016 0.583-0.047 1.013-0.032 0.429-0.065 0.703-0.101 0.822h-2.879c0.056-0.654 0.084-1.522 0.084-2.605v-13.047h2.964v4.366l-0.042 1.856h0.042c0.
 668-1.463 1.884-2.194 3.649-2.194 1.35 0 2.385 0.512 3.105 1.535 0.722 1.023 1.082 2.47 1.082 4.341zm-5.442 3.933c1.568 0 2.353-1.311 2.353-3.934 0-1.294-0.19-2.254-0.569-2.879-0.38-0.626-0.967-0.939-1.762-0.939-0.802 0-1.411 0.336-1.83 1.008-0.418 0.671-0.627 1.64-0.627 2.905 0 1.21 0.205 2.151 0.616 2.827 0.411 0.675 1.018 1.012 1.819 1.012zm7.948 1.815v-15.652h2.964v15.652h-2.964zm5.982-13.469v-2.183h2.964v2.183h-2.964zm0 13.469v-11.413h2.964v11.413h-2.964zm10.849 0.211c-1.729 0-3.065-0.515-4.008-1.545s-1.413-2.467-1.413-4.309c0-1.885 0.475-3.353 1.424-4.403s2.295-1.577 4.039-1.577c1.343 0 2.454 0.338 3.333 1.013s1.431 1.606 1.655 2.795l-2.984 0.147c-0.084-0.583-0.295-1.049-0.633-1.397s-0.815-0.521-1.435-0.521c-1.525 0-2.288 1.276-2.288 3.828 0 2.63 0.776 3.944 2.33 3.944 0.562 0 1.034-0.177 1.414-0.532 0.379-0.355 0.615-0.884 0.706-1.587l2.975 0.137c-0.105 0.78-0.385 1.477-0.839 2.088-0.453 0.612-1.049 1.085-1.787 1.419s-1.568 0.5-2.489 0.5z"/>
+  <path fill="#fff" d="m101.17 70.439v-8.732c0-0.626-0.009-1.148-0.026-1.566-0.018-0.419-0.037-0.789-0.058-1.113h2.826c0.021 0.127 0.049 0.512 0.084 1.155s0.053 1.07 0.053 1.281h0.043c0.288-0.802 0.545-1.365 0.77-1.692s0.492-0.569 0.802-0.728 0.696-0.237 1.16-0.237c0.38 0 0.686 0.053 0.917 0.158v2.479c-0.478-0.105-0.899-0.158-1.266-0.158-0.738 0-1.312 0.299-1.724 0.896-0.412 0.598-0.617 1.483-0.617 2.657v5.601h-2.964zm17.871-2.889c-0.809 2.067-2.451 3.101-4.926 3.101-1.715 0-3.033-0.508-3.955-1.524-0.921-1.016-1.381-2.497-1.381-4.445 0-1.884 0.467-3.333 1.402-4.345 0.935-1.013 2.261-1.52 3.977-1.52 1.638 0 2.89 0.544 3.754 1.63 0.865 1.086 1.298 2.678 1.298 4.772v0.084h-7.319c0 1.112 0.205 1.95 0.616 2.516 0.412 0.566 0.997 0.85 1.757 0.85 1.047 0 1.708-0.454 1.982-1.361l2.795 0.242zm-4.925-6.866c-0.695 0-1.232 0.242-1.608 0.728s-0.574 1.164-0.596 2.036h4.43c-0.057-0.922-0.278-1.612-0.664-2.073-0.388-0.461-0.908-0.691-1.562-0.691zm18.137 3.997c0 1.905-0.382 3.377-1.145 4.414s-1.841 
 1.556-3.232 1.556c-0.802 0-1.5-0.174-2.094-0.522s-1.05-0.849-1.366-1.503h-0.062c0.042 0.211 0.062 0.852 0.062 1.92v4.377h-2.963v-13.269c0-1.076-0.028-1.951-0.085-2.627h2.88c0.035 0.127 0.064 0.377 0.089 0.749 0.025 0.373 0.037 0.742 0.037 1.107h0.042c0.668-1.398 1.885-2.099 3.649-2.099 1.329 0 2.359 0.512 3.091 1.534 0.731 1.025 1.097 2.479 1.097 4.363zm-5.464 3.944c1.582 0 2.373-1.313 2.373-3.944 0-2.559-0.783-3.839-2.352-3.839-0.787 0-1.391 0.345-1.809 1.033-0.419 0.69-0.628 1.652-0.628 2.891 0 1.23 0.209 2.181 0.628 2.853 0.419 0.671 1.015 1.006 1.788 1.006zm18.682-3.902c0 1.851-0.513 3.3-1.54 4.351-1.026 1.052-2.446 1.577-4.261 1.577-1.778 0-3.175-0.527-4.187-1.582-1.013-1.055-1.52-2.503-1.52-4.346 0-1.835 0.507-3.278 1.52-4.329 1.012-1.051 2.429-1.577 4.25-1.577 1.863 0 3.285 0.509 4.267 1.524 0.981 1.015 1.471 2.477 1.471 4.382zm-5.832 3.902c1.821 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.664-2.953-0.443-0.611-1.087-0.917-1.931-0.917-1.8 0-2.7 1.291-2.7 3.87 0 1.273 0.22
  2.241 0.659 2.906 0.44 0.664 1.075 0.996 1.905 0.996zm17.914-1.519c0 1.104-0.451 1.971-1.355 2.6-0.903 0.63-2.153 0.944-3.749 0.944-1.568 0-2.769-0.248-3.602-0.743-0.833-0.496-1.387-1.268-1.661-2.315l2.604-0.391c0.148 0.542 0.403 0.925 0.765 1.15 0.362 0.226 0.993 0.337 1.894 0.337 0.83 0 1.435-0.105 1.814-0.316s0.569-0.541 0.569-0.991c0-0.365-0.153-0.655-0.459-0.87s-0.824-0.396-1.556-0.543c-1.674-0.331-2.802-0.639-3.386-0.923-0.583-0.285-1.028-0.654-1.334-1.107-0.306-0.454-0.459-1.011-0.459-1.672 0-1.09 0.42-1.938 1.261-2.547 0.84-0.608 2.03-0.912 3.57-0.912 1.356 0 2.448 0.264 3.274 0.791s1.341 1.29 1.545 2.288l-2.626 0.274c-0.084-0.464-0.292-0.811-0.622-1.039-0.331-0.229-0.854-0.343-1.571-0.343-0.703 0-1.23 0.09-1.582 0.27-0.352 0.179-0.527 0.479-0.527 0.901 0 0.331 0.135 0.593 0.405 0.786 0.271 0.193 0.727 0.353 1.366 0.479 0.893 0.184 1.686 0.371 2.378 0.564 0.693 0.193 1.248 0.424 1.667 0.69 0.418 0.268 0.752 0.61 1.002 1.028 0.25 0.421 0.375 0.957 0.375 1.61zm2.262-10.135v-2
 .183h2.963v2.183h-2.963zm0 13.468v-11.412h2.963v11.412h-2.963zm11.512-0.168c-0.73 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.237-2.015-0.712s-0.707-1.192-0.707-2.156v-6.729h-1.444v-2.004h1.593l0.928-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.556 0.105 0.965 0.316 1.229s0.538 0.396 0.98 0.396c0.232 0 0.562-0.049 0.991-0.147v1.833h0.001zm12.614-5.548c0 1.851-0.514 3.3-1.54 4.351-1.026 1.052-2.447 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582s-1.519-2.503-1.519-4.346c0-1.835 0.506-3.278 1.519-4.329s2.43-1.577 4.25-1.577c1.863 0 3.286 0.509 4.267 1.524s1.472 2.477 1.472 4.382zm-5.833 3.902c1.821 0 2.731-1.301 2.731-3.902 0-1.356-0.221-2.341-0.664-2.953-0.443-0.611-1.086-0.917-1.93-0.917-1.801 0-2.7 1.291-2.7 3.87 0 1.273 0.22 2.241 0.659 2.906 0.44 0.664 1.075 0.996 1.904 0.996zm8.166 1.814v-8.732c0-0.626-0.009-1.148-0.026-1.566-0.018-0.419-0.036-0.789-0.058-1.113h2.826c0.021 0.127 0.05 0.512 0.085 1.155s0.053 1.07 0.053 1.281h0.042c0.288-0.802 0.545-1.365 0.77-1.692 0.226-0.
 327 0.492-0.569 0.802-0.728s0.696-0.237 1.16-0.237c0.38 0 0.686 0.053 0.918 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.313 0.299-1.725 0.896s-0.617 1.483-0.617 2.657v5.601h-2.964zm9.88 4.483c-0.71 0-1.332-0.046-1.867-0.137v-2.109c0.373 0.056 0.714 0.084 1.023 0.084 0.422 0 0.771-0.066 1.05-0.2 0.277-0.134 0.527-0.355 0.748-0.665 0.222-0.309 0.47-0.833 0.744-1.571l-4.515-11.296h3.133l1.793 5.348c0.281 0.767 0.637 1.94 1.065 3.522l0.264-1.002 0.686-2.479 1.688-5.39h3.101l-4.514 12.014c-0.605 1.462-1.232 2.475-1.883 3.037s-1.49 0.844-2.516 0.844z"/>
+  <path fill-rule="evenodd" fill="#119a48" d="m230.7 367.44zm-170.16-102.12zm17.04 0c-8.521 0-17.04 8.521-17.04 17.04v67.92c0 8.521 8.52 17.161 17.04 17.161h136.08c8.52 0 17.04-8.641 17.04-17.161v-67.92c0-8.52-8.521-17.04-17.04-17.04h-136.08z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <path d="m77.578 265.32c-8.521 0-17.04 8.521-17.04 17.04v67.92c0 8.521 8.52 17.161 17.04 17.161h136.08c8.52 0 17.04-8.641 17.04-17.161v-67.92c0-8.52-8.521-17.04-17.04-17.04h-136.08z"/>
+    <path d="m60.538 265.32z"/>
+    <path d="m230.7 367.44z"/>
+  </g>
+  <path fill="#fff" d="m93.663 311.88v-14.859h11.686v2.405h-8.574v3.733h7.932v2.404h-7.932v3.912h9.007v2.404h-12.119zm21.842 0v-6.4c0-2.004-0.679-3.007-2.035-3.007-0.718 0-1.296 0.308-1.735 0.923s-0.659 1.404-0.659 2.367v6.117h-2.964v-8.859c0-0.611-0.009-1.112-0.026-1.502-0.018-0.391-0.036-0.741-0.058-1.05h2.826c0.021 0.133 0.05 0.49 0.085 1.07s0.053 0.98 0.053 1.198h0.042c0.4-0.872 0.903-1.505 1.508-1.898 0.605-0.394 1.326-0.591 2.162-0.591 1.21 0 2.138 0.373 2.785 1.118 0.646 0.745 0.97 1.835 0.97 3.27v7.244h-2.954zm11.333-0.169c-0.73 0.239-1.564 0.359-2.499 0.359-0.872 0-1.544-0.237-2.015-0.712s-0.707-1.194-0.707-2.157v-6.729h-1.444v-2.004h1.593l0.928-2.68h1.856v2.68h2.162v2.004h-2.162v5.927c0 0.556 0.105 0.966 0.316 1.229s0.538 0.395 0.98 0.395c0.232 0 0.562-0.049 0.991-0.147v1.835h0.001zm11.37-2.721c-0.809 2.067-2.45 3.101-4.926 3.101-1.716 0-3.034-0.507-3.955-1.523s-1.382-2.498-1.382-4.446c0-1.884 0.468-3.332 1.403-4.345s2.261-1.519 3.976-1.519c1.639 0 2.891 0.543 3.755 1.63 0
 .865 1.086 1.298 2.678 1.298 4.772v0.085h-7.32c0 1.11 0.206 1.948 0.617 2.515s0.997 0.849 1.756 0.849c1.048 0 1.709-0.452 1.983-1.359l2.795 0.24zm-4.925-6.865c-0.696 0-1.232 0.242-1.608 0.727s-0.574 1.165-0.596 2.037h4.43c-0.057-0.921-0.277-1.612-0.664-2.073-0.388-0.461-0.908-0.691-1.562-0.691zm7.208 9.755v-8.732c0-0.626-0.009-1.147-0.026-1.565-0.018-0.419-0.037-0.79-0.059-1.113h2.827c0.021 0.126 0.049 0.512 0.084 1.155s0.053 1.071 0.053 1.282h0.042c0.289-0.802 0.545-1.367 0.771-1.693 0.225-0.327 0.492-0.57 0.802-0.729 0.309-0.158 0.695-0.236 1.16-0.236 0.379 0 0.686 0.052 0.917 0.157v2.479c-0.478-0.105-0.899-0.159-1.266-0.159-0.738 0-1.312 0.3-1.725 0.897-0.411 0.598-0.616 1.483-0.616 2.658v5.599h-2.964zm19.203-5.759c0 1.906-0.383 3.378-1.146 4.415s-1.84 1.555-3.231 1.555c-0.802 0-1.5-0.173-2.095-0.521-0.594-0.348-1.049-0.85-1.365-1.503h-0.063c0.043 0.211 0.063 0.851 0.063 1.919v4.378h-2.964v-13.268c0-1.076-0.028-1.952-0.084-2.627h2.879c0.035 0.126 0.064 0.377 0.09 0.75 0.024 0.372
  0.037 0.74 0.037 1.105h0.042c0.668-1.398 1.884-2.098 3.649-2.098 1.329 0 2.358 0.512 3.09 1.534 0.731 1.024 1.098 2.477 1.098 4.361zm-5.464 3.945c1.582 0 2.373-1.315 2.373-3.945 0-2.559-0.784-3.839-2.352-3.839-0.788 0-1.392 0.345-1.81 1.034-0.418 0.688-0.627 1.652-0.627 2.89 0 1.23 0.209 2.182 0.627 2.854 0.419 0.67 1.015 1.006 1.789 1.006zm7.84 1.814v-8.732c0-0.626-0.01-1.147-0.026-1.565-0.019-0.419-0.037-0.79-0.059-1.113h2.827c0.021 0.126 0.048 0.512 0.084 1.155 0.034 0.644 0.053 1.071 0.053 1.282h0.042c0.288-0.802 0.545-1.367 0.771-1.693 0.224-0.327 0.491-0.57 0.801-0.729s0.696-0.236 1.16-0.236c0.38 0 0.686 0.052 0.918 0.157v2.479c-0.479-0.105-0.9-0.159-1.266-0.159-0.738 0-1.313 0.3-1.725 0.897s-0.617 1.483-0.617 2.658v5.599h-2.963zm8.402-13.467v-2.185h2.963v2.185h-2.963zm0 13.467v-11.411h2.963v11.411h-2.963zm15.602-3.333c0 1.104-0.452 1.972-1.355 2.601-0.903 0.63-2.153 0.943-3.749 0.943-1.568 0-2.769-0.247-3.603-0.743-0.833-0.495-1.387-1.268-1.661-2.315l2.605-0.389c0.147 0.541 
 0.402 0.923 0.765 1.148 0.362 0.225 0.993 0.337 1.894 0.337 0.829 0 1.434-0.105 1.813-0.316s0.569-0.541 0.569-0.991c0-0.365-0.152-0.655-0.458-0.869-0.307-0.215-0.825-0.396-1.556-0.544-1.674-0.33-2.803-0.638-3.386-0.922-0.584-0.285-1.028-0.654-1.334-1.107-0.307-0.454-0.459-1.011-0.459-1.672 0-1.09 0.42-1.939 1.26-2.547 0.841-0.608 2.03-0.912 3.57-0.912 1.357 0 2.449 0.263 3.275 0.79s1.341 1.291 1.545 2.29l-2.626 0.273c-0.085-0.464-0.292-0.811-0.623-1.039-0.33-0.229-0.854-0.344-1.571-0.344-0.703 0-1.23 0.091-1.582 0.27-0.352 0.18-0.527 0.48-0.527 0.902 0 0.331 0.136 0.592 0.406 0.785s0.726 0.354 1.366 0.48c0.893 0.184 1.686 0.371 2.378 0.564s1.248 0.423 1.666 0.689c0.419 0.268 0.753 0.611 1.002 1.029 0.251 0.419 0.376 0.956 0.376 1.609zm11.988 0.443c-0.809 2.067-2.45 3.101-4.926 3.101-1.716 0-3.034-0.507-3.955-1.523s-1.382-2.498-1.382-4.446c0-1.884 0.468-3.332 1.403-4.345s2.261-1.519 3.976-1.519c1.639 0 2.891 0.543 3.755 1.63 0.865 1.086 1.298 2.678 1.298 4.772v0.085h-7.32c0 1.11 0.20
 6 1.948 0.617 2.515s0.997 0.849 1.756 0.849c1.048 0 1.709-0.452 1.983-1.359l2.795 0.24zm-4.926-6.865c-0.696 0-1.232 0.242-1.608 0.727s-0.574 1.165-0.596 2.037h4.43c-0.057-0.921-0.277-1.612-0.664-2.073s-0.908-0.691-1.562-0.691z"/>
+  <path fill="#fff" d="m94.326 335.76v-8.733c0-0.625-0.009-1.148-0.026-1.565-0.018-0.419-0.037-0.79-0.058-1.113h2.826c0.021 0.127 0.05 0.511 0.085 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.288-0.802 0.545-1.365 0.77-1.693 0.226-0.326 0.492-0.569 0.802-0.727 0.31-0.159 0.696-0.238 1.16-0.238 0.38 0 0.686 0.053 0.918 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.313 0.299-1.725 0.896s-0.617 1.484-0.617 2.658v5.601h-2.964zm18-2.89c-0.809 2.066-2.45 3.101-4.925 3.101-1.716 0-3.034-0.509-3.955-1.523-0.922-1.018-1.382-2.499-1.382-4.446 0-1.885 0.468-3.333 1.402-4.346 0.936-1.012 2.261-1.519 3.977-1.519 1.638 0 2.89 0.544 3.755 1.629 0.864 1.088 1.297 2.678 1.297 4.773v0.084h-7.319c0 1.111 0.205 1.949 0.617 2.517 0.411 0.564 0.996 0.848 1.756 0.848 1.048 0 1.708-0.453 1.982-1.36l2.795 0.242zm-4.924-6.866c-0.696 0-1.232 0.242-1.608 0.728-0.377 0.485-0.575 1.164-0.597 2.035h4.43c-0.056-0.921-0.277-1.611-0.664-2.072-0.388-0.461-0.908-0.691-1.561-0.691zm18.007 3.997c0 1.905-0
 .381 3.377-1.144 4.413-0.764 1.038-1.841 1.557-3.233 1.557-0.801 0-1.499-0.174-2.093-0.522-0.595-0.348-1.05-0.849-1.366-1.503h-0.063c0.042 0.211 0.063 0.851 0.063 1.92v4.377h-2.964v-13.269c0-1.075-0.028-1.951-0.084-2.626h2.879c0.035 0.127 0.065 0.376 0.09 0.74901 0.025 0.373 0.037 0.742 0.037 1.107h0.042c0.668-1.399 1.885-2.099 3.649-2.099 1.329 0 2.358 0.512 3.09 1.534 0.731 1.024 1.097 2.477 1.097 4.362zm-5.463 3.944c1.582 0 2.373-1.314 2.373-3.944 0-2.56-0.784-3.839-2.352-3.839-0.788 0-1.391 0.345-1.81 1.033-0.418 0.689-0.627 1.652-0.627 2.89 0 1.23 0.209 2.183 0.627 2.853 0.419 0.672 1.015 1.007 1.789 1.007zm18.811-3.902c0 1.85-0.514 3.3-1.54 4.351-1.027 1.052-2.446 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.346 0-1.835 0.507-3.278 1.519-4.329 1.013-1.052 2.43-1.577 4.251-1.577 1.862 0 3.285 0.509 4.266 1.523 0.982 1.018 1.472 2.478 1.472 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.665-2.953-0.442-0.611-1.086-0.
 917-1.93-0.917-1.8 0-2.7 1.29-2.7 3.87 0 1.272 0.22 2.241 0.659 2.906 0.44 0.663 1.075 0.996 1.905 0.996zm17.784-1.518c0 1.104-0.452 1.971-1.354 2.6-0.904 0.63-2.153 0.944-3.75 0.944-1.567 0-2.769-0.249-3.602-0.743-0.833-0.497-1.387-1.268-1.661-2.315l2.605-0.391c0.147 0.542 0.401 0.925 0.765 1.149 0.361 0.226 0.993 0.338 1.893 0.338 0.83 0 1.435-0.105 1.814-0.31599 0.379-0.211 0.569-0.541 0.569-0.991 0-0.366-0.153-0.656-0.459-0.87-0.306-0.215-0.824-0.396-1.556-0.543-1.673-0.331-2.802-0.638-3.386-0.924-0.583-0.283-1.028-0.654-1.334-1.106-0.306-0.454-0.459-1.011-0.459-1.672 0-1.09 0.421-1.939 1.261-2.547 0.84-0.60899 2.03-0.913 3.57-0.913 1.356 0 2.448 0.264 3.274 0.791s1.342 1.291 1.545 2.289l-2.626 0.274c-0.084-0.464-0.292-0.81-0.622-1.04-0.33-0.227-0.854-0.342-1.571-0.342-0.703 0-1.23 0.089-1.582 0.27-0.352 0.178-0.527 0.479-0.527 0.901 0 0.33 0.135 0.592 0.406 0.786 0.27 0.192 0.726 0.353 1.365 0.479 0.894 0.183 1.686 0.371 2.379 0.563 0.691 0.194 1.248 0.424 1.666 0.691s0.752 0.6
 09 1.002 1.029c0.25 0.418 0.375 0.954 0.375 1.609zm2.391-10.136v-2.183h2.964v2.183h-2.964zm0 13.469v-11.412h2.964v11.412h-2.964zm11.404-0.169c-0.731 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.236-2.015-0.712-0.472-0.474-0.707-1.193-0.707-2.156v-6.729h-1.444v-2.004h1.592l0.929-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.556 0.105 0.966 0.316 1.228 0.211 0.266 0.537 0.396 0.98 0.396 0.232 0 0.562-0.049 0.991-0.147v1.834h0.001zm12.614-5.548c0 1.85-0.514 3.3-1.54 4.351-1.027 1.052-2.446 1.577-4.261 1.577-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.346 0-1.835 0.507-3.278 1.519-4.329 1.013-1.052 2.429-1.577 4.251-1.577 1.862 0 3.285 0.509 4.266 1.523 0.982 1.018 1.472 2.478 1.472 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.356-0.222-2.341-0.665-2.953-0.442-0.611-1.086-0.917-1.93-0.917-1.801 0-2.7 1.29-2.7 3.87 0 1.272 0.22 2.241 0.659 2.906 0.441 0.663 1.074 0.996 1.905 0.996zm8.166 1.815v-8.733c0-0.625-0.01-1.148-0.026-1.565-0.018-0.419-0.037-0.79-0.
 059-1.113h2.827c0.021 0.127 0.049 0.511 0.084 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.289-0.802 0.545-1.365 0.771-1.693 0.225-0.326 0.491-0.569 0.802-0.727 0.309-0.159 0.695-0.238 1.16-0.238 0.379 0 0.686 0.053 0.917 0.158v2.479c-0.479-0.105-0.9-0.158-1.266-0.158-0.738 0-1.312 0.299-1.725 0.896-0.411 0.598-0.616 1.484-0.616 2.658v5.601h-2.964zm9.879 4.482c-0.71 0-1.333-0.046-1.867-0.138v-2.109c0.373 0.057 0.714 0.085 1.023 0.085 0.422 0 0.771-0.067 1.049-0.2 0.278-0.134 0.527-0.355 0.749-0.665s0.47-0.833 0.744-1.571l-4.515-11.296h3.133l1.793 5.348c0.281 0.767 0.636 1.94 1.065 3.522l0.264-1.002 0.686-2.479 1.688-5.39h3.101l-4.515 12.013c-0.604 1.463-1.231 2.476-1.882 3.038s-1.489 0.844-2.516 0.844z"/>
+  <path fill-rule="evenodd" fill="#119a48" d="m570.78 234.72zm-170.04-102.12zm16.92 0c-8.4 0-16.92 8.52-16.92 17.04v68.04c0 8.521 8.52 17.04 16.92 17.04h136.08c8.52 0 17.04-8.52 17.04-17.04v-68.04c0-8.521-8.521-17.04-17.04-17.04h-136.08z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <path d="m417.66 132.6c-8.4 0-16.92 8.52-16.92 17.04v68.04c0 8.521 8.52 17.04 16.92 17.04h136.08c8.52 0 17.04-8.52 17.04-17.04v-68.04c0-8.521-8.521-17.04-17.04-17.04h-136.08z"/>
+    <path d="m400.74 132.6z"/>
+    <path d="m570.78 234.72z"/>
+  </g>
+  <path fill="#fff" d="m461.8 188.92c1.877 0 3.182-0.942 3.912-2.827l2.711 1.023c-0.584 1.435-1.439 2.501-2.567 3.201-1.129 0.699-2.481 1.049-4.056 1.049-2.391 0-4.238-0.677-5.542-2.03-1.305-1.354-1.957-3.246-1.957-5.679 0-2.44 0.629-4.314 1.888-5.622s3.083-1.962 5.474-1.962c1.744 0 3.164 0.351 4.261 1.05 1.098 0.699 1.867 1.728 2.311 3.085l-2.742 0.749c-0.232-0.745-0.688-1.338-1.365-1.777-0.679-0.439-1.479-0.659-2.4-0.659-1.406 0-2.473 0.436-3.2 1.308s-1.093 2.148-1.093 3.829c0 1.708 0.375 3.013 1.124 3.912 0.747 0.9 1.827 1.35 3.241 1.35zm15.109 0.2c-0.829 1.498-2.081 2.246-3.754 2.246-1.104 0-1.966-0.3-2.584-0.901-0.619-0.602-0.929-1.446-0.929-2.536 0-1.182 0.386-2.082 1.155-2.7 0.771-0.619 1.886-0.936 3.349-0.949l2.457-0.042v-0.58c0-0.746-0.13-1.3-0.39-1.661-0.261-0.362-0.686-0.544-1.276-0.544-0.549 0-0.95 0.125-1.207 0.375-0.257 0.249-0.417 0.662-0.48 1.239l-3.091-0.147c0.19-1.111 0.699-1.953 1.525-2.526s1.952-0.859 3.379-0.859c1.441 0 2.553 0.354 3.333 1.065 0.78 0.71 1.171 1.
 719 1.171 3.026v4.155c0 0.641 0.072 1.081 0.217 1.324 0.145 0.242 0.385 0.363 0.722 0.363 0.226 0 0.443-0.021 0.654-0.062v1.603c-0.176 0.042-0.334 0.081-0.475 0.116s-0.281 0.063-0.422 0.084-0.29 0.039-0.448 0.053c-0.158 0.015-0.343 0.021-0.554 0.021-0.745 0-1.295-0.183-1.65-0.549-0.354-0.365-0.568-0.903-0.639-1.613h-0.063v-0.001zm-0.305-3.248-1.519 0.021c-0.689 0.028-1.178 0.104-1.466 0.227s-0.508 0.312-0.659 0.564c-0.15 0.253-0.227 0.591-0.227 1.013 0 0.541 0.125 0.944 0.375 1.208 0.249 0.264 0.581 0.396 0.996 0.396 0.464 0 0.888-0.127 1.271-0.38s0.683-0.604 0.9-1.05c0.219-0.446 0.327-0.919 0.327-1.418v-0.581zm10.552 5.494c-1.729 0-3.065-0.515-4.008-1.545s-1.413-2.466-1.413-4.309c0-1.884 0.475-3.352 1.424-4.403s2.296-1.576 4.039-1.576c1.343 0 2.454 0.337 3.333 1.013 0.879 0.675 1.431 1.606 1.656 2.795l-2.985 0.147c-0.084-0.584-0.295-1.05-0.633-1.397-0.337-0.349-0.815-0.522-1.435-0.522-1.525 0-2.288 1.276-2.288 3.829 0 2.629 0.776 3.944 2.331 3.944 0.562 0 1.033-0.178 1.413-0.533 0.
 38-0.354 0.615-0.884 0.706-1.587l2.975 0.137c-0.105 0.781-0.386 1.477-0.839 2.089-0.454 0.611-1.049 1.084-1.787 1.418s-1.569 0.5-2.489 0.5zm10.173-9.344c0.401-0.872 0.904-1.505 1.509-1.898 0.604-0.395 1.325-0.591 2.162-0.591 1.209 0 2.138 0.372 2.784 1.118 0.646 0.745 0.971 1.835 0.971 3.27v7.234h-2.953v-6.391c0-2.004-0.679-3.006-2.036-3.006-0.717 0-1.295 0.308-1.734 0.923s-0.659 1.404-0.659 2.367v6.106h-2.964v-15.651h2.964v4.271c0 0.767-0.028 1.516-0.085 2.247h0.041zm19.854 6.244c-0.809 2.067-2.451 3.101-4.926 3.101-1.716 0-3.034-0.508-3.955-1.523-0.921-1.017-1.382-2.498-1.382-4.445 0-1.885 0.468-3.333 1.403-4.346s2.26-1.519 3.976-1.519c1.639 0 2.89 0.543 3.755 1.629 0.865 1.087 1.297 2.678 1.297 4.772v0.085h-7.319c0 1.11 0.205 1.949 0.616 2.516 0.412 0.565 0.998 0.849 1.757 0.849 1.048 0 1.709-0.453 1.983-1.36l2.795 0.241zm-4.926-6.867c-0.696 0-1.232 0.243-1.609 0.729-0.376 0.484-0.574 1.163-0.595 2.035h4.43c-0.057-0.921-0.278-1.612-0.665-2.072-0.387-0.461-0.907-0.692-1.561-0.692z
 "/>
+  <path fill-rule="evenodd" fill="#119a48" d="m574.26 503.4zm-170.16-102zm17.041 0c-8.521 0-17.041 8.52-17.041 16.92v68.04c0 8.52 8.52 17.04 17.041 17.04h136.08c8.399 0 17.04-8.521 17.04-17.04v-68.04c0-8.4-8.641-16.92-17.04-16.92h-136.08z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <path d="m421.14 401.4c-8.521 0-17.041 8.52-17.041 16.92v68.04c0 8.52 8.52 17.04 17.041 17.04h136.08c8.399 0 17.04-8.521 17.04-17.04v-68.04c0-8.4-8.641-16.92-17.04-16.92h-136.08z"/>
+    <path d="m404.1 401.4z"/>
+    <path d="m574.26 503.4z"/>
+  </g>
+  <path fill="#fff" d="m466.25 437.8c0 0.956-0.218 1.811-0.653 2.563-0.437 0.752-1.061 1.333-1.873 1.746-0.812 0.41-1.776 0.616-2.895 0.616h-3.691v5.231h-3.111v-14.861h6.676c1.779 0 3.148 0.409 4.107 1.229 0.96 0.819 1.44 1.979 1.44 3.476zm-3.131 0.052c0-1.561-0.923-2.341-2.764-2.341h-3.217v4.819h3.301c0.858 0 1.52-0.212 1.983-0.639 0.464-0.423 0.697-1.037 0.697-1.839zm5.356 10.105v-8.733c0-0.626-0.009-1.148-0.026-1.565-0.018-0.42-0.037-0.79-0.059-1.113h2.827c0.021 0.127 0.049 0.511 0.084 1.155 0.035 0.643 0.053 1.07 0.053 1.281h0.042c0.289-0.802 0.545-1.365 0.771-1.693 0.225-0.326 0.492-0.569 0.802-0.727 0.309-0.159 0.695-0.238 1.16-0.238 0.379 0 0.686 0.053 0.917 0.158v2.479c-0.478-0.105-0.899-0.158-1.266-0.158-0.738 0-1.312 0.299-1.724 0.896s-0.617 1.483-0.617 2.658v5.601h-2.964zm19.244-5.717c0 1.85-0.513 3.3-1.54 4.35-1.026 1.053-2.446 1.578-4.261 1.578-1.778 0-3.173-0.527-4.186-1.582s-1.519-2.504-1.519-4.346c0-1.835 0.506-3.279 1.519-4.329 1.013-1.052 2.428-1.577 4.249-1.577 1.
 863 0 3.286 0.509 4.267 1.523 0.982 1.018 1.471 2.478 1.471 4.383zm-5.831 3.903c1.82 0 2.73-1.301 2.73-3.902 0-1.357-0.221-2.342-0.663-2.953-0.443-0.611-1.088-0.918-1.932-0.918-1.8 0-2.7 1.291-2.7 3.871 0 1.272 0.221 2.24 0.66 2.906 0.44 0.662 1.074 0.996 1.905 0.996zm8.113 6.296c-0.703 0-1.301-0.032-1.793-0.096v-2.088l0.537 0.042c0.507 0 0.853-0.11 1.04-0.333 0.185-0.22 0.278-0.68 0.278-1.375v-12.045h2.964v12.762c0 1.006-0.255 1.779-0.764 2.32-0.51 0.542-1.264 0.813-2.262 0.813zm0.063-17.951v-2.184h2.964v2.184h-2.964zm15.571 10.578c-0.809 2.067-2.452 3.102-4.926 3.102-1.717 0-3.034-0.509-3.955-1.523-0.922-1.018-1.382-2.499-1.382-4.446 0-1.885 0.468-3.333 1.403-4.346 0.934-1.013 2.259-1.519 3.976-1.519 1.638 0 2.891 0.544 3.755 1.629 0.865 1.088 1.298 2.678 1.298 4.773v0.084h-7.32c0 1.111 0.205 1.949 0.617 2.516 0.411 0.565 0.997 0.849 1.756 0.849 1.047 0 1.709-0.453 1.983-1.36l2.795 0.241zm-4.926-6.865c-0.696 0-1.232 0.242-1.608 0.728-0.377 0.485-0.574 1.163-0.596 2.035h4.43c-0.058
 -0.921-0.279-1.611-0.664-2.073-0.389-0.459-0.907-0.69-1.562-0.69zm12.094 9.967c-1.729 0-3.065-0.516-4.008-1.545-0.942-1.031-1.413-2.467-1.413-4.309 0-1.885 0.475-3.354 1.424-4.403 0.949-1.052 2.296-1.577 4.039-1.577 1.344 0 2.454 0.338 3.333 1.013s1.431 1.606 1.656 2.795l-2.985 0.147c-0.084-0.584-0.295-1.049-0.633-1.398-0.337-0.347-0.815-0.521-1.434-0.521-1.526 0-2.289 1.276-2.289 3.829 0 2.63 0.777 3.944 2.331 3.944 0.562 0 1.033-0.178 1.413-0.532 0.38-0.356 0.615-0.885 0.707-1.588l2.974 0.138c-0.105 0.78-0.386 1.477-0.839 2.088s-1.049 1.085-1.787 1.418c-0.738 0.334-1.568 0.501-2.489 0.501zm12.674-0.38c-0.731 0.239-1.564 0.358-2.499 0.358-0.872 0-1.544-0.236-2.015-0.713-0.472-0.473-0.707-1.192-0.707-2.156v-6.729h-1.444v-2.004h1.592l0.929-2.679h1.856v2.679h2.162v2.004h-2.162v5.928c0 0.555 0.105 0.965 0.316 1.228 0.211 0.265 0.537 0.396 0.98 0.396 0.232 0 0.562-0.05 0.991-0.147v1.835h0.001z"/>
+  <path fill="#fff" d="m447.23 471.84h-3.133l-1.813-6.961c-0.085-0.316-0.25-1.097-0.496-2.341l-0.548 2.362-1.836 6.939h-3.132l-2.953-11.411h2.784l1.877 8.722 0.148-0.781 0.264-1.233 1.793-6.707h3.174l1.751 6.707c0.099 0.366 0.243 1.036 0.433 2.015l0.295-1.394 1.646-7.328h2.742l-2.996 11.411zm15.392-5.716c0 1.849-0.514 3.299-1.54 4.35s-2.446 1.577-4.261 1.577c-1.779 0-3.175-0.527-4.188-1.582-1.012-1.055-1.519-2.503-1.519-4.345 0-1.836 0.507-3.279 1.519-4.33 1.013-1.052 2.43-1.576 4.251-1.576 1.863 0 3.286 0.507 4.267 1.523s1.471 2.477 1.471 4.383zm-5.832 3.902c1.82 0 2.731-1.301 2.731-3.902 0-1.357-0.222-2.342-0.665-2.953-0.442-0.612-1.086-0.919-1.93-0.919-1.8 0-2.7 1.291-2.7 3.872 0 1.272 0.221 2.24 0.66 2.904 0.441 0.665 1.074 0.998 1.904 0.998zm8.166 1.814v-8.732c0-0.626-0.009-1.148-0.026-1.567-0.018-0.418-0.036-0.788-0.058-1.111h2.826c0.021 0.126 0.05 0.511 0.085 1.154s0.053 1.069 0.053 1.28h0.042c0.288-0.802 0.545-1.365 0.77-1.692 0.226-0.326 0.492-0.569 0.802-0.728s0.696-0.237 
 1.16-0.237c0.38 0 0.686 0.054 0.918 0.159v2.478c-0.479-0.105-0.9-0.157-1.266-0.157-0.738 0-1.313 0.298-1.726 0.896-0.411 0.598-0.616 1.483-0.616 2.657v5.602h-2.964zm15.691 0-3.048-5.168-1.276 0.886v4.282h-2.964v-15.651h2.964v8.965l4.071-4.725h3.186l-4.008 4.45 4.313 6.961h-3.238zm14.212-3.333c0 1.104-0.453 1.971-1.356 2.6s-2.152 0.944-3.749 0.944c-1.567 0-2.769-0.248-3.602-0.744-0.834-0.495-1.387-1.267-1.661-2.314l2.605-0.392c0.147 0.543 0.401 0.926 0.764 1.151 0.362 0.225 0.994 0.337 1.894 0.337 0.83 0 1.435-0.105 1.814-0.316s0.569-0.541 0.569-0.991c0-0.365-0.153-0.656-0.459-0.87-0.306-0.215-0.824-0.396-1.556-0.543-1.673-0.33-2.802-0.639-3.385-0.924-0.584-0.284-1.029-0.653-1.335-1.107-0.306-0.453-0.458-1.011-0.458-1.672 0-1.09 0.419-1.938 1.26-2.547 0.84-0.607 2.03-0.912 3.57-0.912 1.357 0 2.448 0.265 3.274 0.792s1.341 1.289 1.546 2.287l-2.627 0.274c-0.084-0.464-0.291-0.81-0.622-1.038s-0.854-0.343-1.571-0.343c-0.703 0-1.23 0.09-1.582 0.269-0.352 0.18-0.527 0.479-0.527 0.901 0 0.33 
 0.135 0.593 0.405 0.786s0.727 0.353 1.366 0.479c0.894 0.183 1.686 0.371 2.378 0.564s1.248 0.425 1.667 0.691c0.418 0.268 0.752 0.609 1.002 1.028s0.376 0.957 0.376 1.61zm13.19-2.426c0 1.906-0.382 3.377-1.146 4.414-0.763 1.037-1.84 1.556-3.231 1.556-0.802 0-1.5-0.175-2.095-0.522-0.594-0.348-1.049-0.849-1.365-1.502h-0.062c0.042 0.211 0.062 0.851 0.062 1.919v4.377h-2.963v-13.269c0-1.076-0.028-1.95-0.085-2.625h2.88c0.035 0.126 0.064 0.375 0.089 0.747 0.024 0.373 0.037 0.743 0.037 1.108h0.042c0.668-1.398 1.885-2.1 3.649-2.1 1.329 0 2.359 0.512 3.091 1.535 0.731 1.024 1.097 2.478 1.097 4.362zm-5.464 3.945c1.582 0 2.373-1.315 2.373-3.945 0-2.559-0.783-3.839-2.352-3.839-0.787 0-1.391 0.345-1.81 1.034-0.418 0.688-0.627 1.652-0.627 2.89 0 1.23 0.209 2.181 0.627 2.853 0.42 0.67 1.016 1.007 1.789 1.007zm14.361-0.221c-0.829 1.497-2.081 2.246-3.755 2.246-1.104 0-1.965-0.301-2.584-0.902-0.618-0.601-0.928-1.446-0.928-2.536 0-1.181 0.385-2.081 1.154-2.699 0.77-0.619 1.887-0.936 3.35-0.949l2.457-0.043v
 -0.581c0-0.745-0.13-1.298-0.391-1.66-0.26-0.362-0.686-0.543-1.275-0.543-0.549 0-0.952 0.124-1.209 0.374-0.256 0.25-0.416 0.662-0.479 1.238l-3.091-0.147c0.19-1.11 0.697-1.952 1.523-2.525s1.954-0.858 3.381-0.858c1.441 0 2.553 0.354 3.333 1.063s1.171 1.721 1.171 3.028v4.155c0 0.64 0.071 1.081 0.216 1.323 0.144 0.242 0.385 0.364 0.723 0.364 0.225 0 0.443-0.021 0.654-0.063v1.604c-0.176 0.042-0.334 0.081-0.475 0.116s-0.281 0.063-0.422 0.084-0.291 0.039-0.449 0.053c-0.158 0.015-0.342 0.021-0.553 0.021-0.746 0-1.297-0.183-1.651-0.549-0.355-0.365-0.567-0.903-0.638-1.613h-0.062v-0.001zm-0.306-3.25-1.519 0.021c-0.689 0.028-1.178 0.104-1.466 0.228-0.289 0.123-0.509 0.312-0.66 0.564s-0.227 0.591-0.227 1.013c0 0.541 0.125 0.943 0.374 1.207 0.25 0.264 0.583 0.396 0.997 0.396 0.465 0 0.888-0.126 1.271-0.379 0.384-0.254 0.685-0.604 0.902-1.051 0.218-0.446 0.327-0.918 0.327-1.418v-0.581zm10.551 5.496c-1.73 0-3.066-0.516-4.008-1.546-0.942-1.029-1.414-2.467-1.414-4.309 0-1.885 0.477-3.352 1.426-4.402 0
 .949-1.052 2.294-1.576 4.038-1.576 1.343 0 2.454 0.337 3.333 1.012 0.879 0.676 1.431 1.605 1.656 2.794l-2.985 0.147c-0.085-0.583-0.296-1.049-0.633-1.396-0.338-0.348-0.815-0.522-1.435-0.522-1.525 0-2.287 1.277-2.287 3.829 0 2.63 0.775 3.945 2.329 3.945 0.562 0 1.034-0.179 1.413-0.533 0.38-0.355 0.615-0.885 0.708-1.588l2.975 0.138c-0.105 0.78-0.386 1.477-0.839 2.089-0.454 0.611-1.051 1.084-1.789 1.418s-1.567 0.5-2.488 0.5zm16.851-3.101c-0.809 2.067-2.451 3.101-4.926 3.101-1.716 0-3.034-0.509-3.955-1.524s-1.382-2.497-1.382-4.445c0-1.884 0.468-3.332 1.403-4.345s2.26-1.519 3.976-1.519c1.639 0 2.89 0.542 3.755 1.629 0.865 1.086 1.297 2.676 1.297 4.771v0.084h-7.319c0 1.111 0.205 1.95 0.616 2.517 0.412 0.565 0.998 0.85 1.757 0.85 1.048 0 1.709-0.454 1.983-1.362l2.795 0.243zm-4.925-6.867c-0.696 0-1.232 0.244-1.609 0.729-0.376 0.485-0.574 1.163-0.595 2.035h4.43c-0.057-0.922-0.278-1.611-0.665-2.072s-0.907-0.692-1.561-0.692z"/>
+  <path fill-rule="evenodd" fill="#010101" d="m158.58 241.56zm-13.679-115.68zm3.479 0v86.64h-3.479l6.84 29.04 6.84-29.04h-3.48v-86.64h-6.721z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <polygon transform="translate(-2.779 0.000005)" points="154.52 241.56 161.36 212.52 157.88 212.52 157.88 125.88 151.16 125.88 151.16 212.52 147.68 212.52"/>
+    <path d="m144.9 125.88z"/>
+    <path d="m158.58 241.56z"/>
+  </g>
+  <path fill-rule="evenodd" fill="#010101" d="m496.14 381zm-13.561-115.68zm3.361 0v86.76h-3.36l6.72 28.921 6.841-28.921h-3.36v-86.76h-6.841z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <polygon transform="translate(-2.779 0.000005)" points="492.08 381 498.92 352.08 495.56 352.08 495.56 265.32 488.72 265.32 488.72 352.08 485.36 352.08"/>
+    <path d="m482.58 265.32z"/>
+    <path d="m496.14 381z"/>
+  </g>
+  <path fill-rule="evenodd" fill="#010101" d="m378.18 217.08zm-110.64 49.199zm1.68 2.761 78.12-45.121-1.56-2.76 29.16-9.6-22.8 20.521-1.681-2.761-78.12 45.24-3.119-5.519z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <polygon transform="translate(-2.779 0.000005)" points="377.72 211.56 354.92 232.08 353.24 229.32 275.12 274.56 272 269.04 350.12 223.92 348.56 221.16"/>
+    <path d="m267.54 266.28z"/>
+    <path d="m378.18 217.08z"/>
+  </g>
+  <path fill-rule="evenodd" fill="#010101" d="m273.78 364.08zm97.92 71.161zm1.559-2.761-78.119-45.12-1.681 2.76-22.92-20.52 29.28 9.479-1.561 2.881 78.121 45.119-3.12 5.401z"/>
+  <g stroke-width="0" stroke-miterlimit="10" fill="none">
+    <polygon transform="translate(-2.779 0.000005)" points="273.32 369.6 302.6 379.08 301.04 381.96 379.16 427.08 376.04 432.48 297.92 387.36 296.24 390.12"/>
+    <path d="m371.7 435.24z"/>
+    <path d="m273.78 364.08z"/>
+  </g>
+  <g fill="#010101">
+    <path d="m12.487 191.76-12.487-6.24l12.487-6.243v1.74l-8.996 4.503 8.996 4.493v1.751zm4.4-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm8.485 0-4.261-11.454h2.077l3.333 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.545 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.627 3.502-8.627h1.961l-6.254 15.62h-2.161zm10.798-13.532v-2.088h2.078v2.088h-2.078zm0 9.366v-2.078h2.078v2.078h-2.078zm6.53-13.532v-2.077h2.078v2.077h-2.078zm0 13.532v-11.454h2.078v11.454h-2.078zm6.114 0v-11.454h2.077v2.151c1.097-1.603 2.44-2.404 4.029-2.404 0.991 0 1.782 0.314 2.373 0.943 0.591 0.63 0.886 1.476 0.886 2.537v8.227h-2.078v-7.552c0-0.851-0.124-1.457-0.374-1.819s-0.663-0.543-1.239-0.543c-1.272 0-2.472 0.833-3.597 2.499v7.415h-2.077zm16.451 0.263c-0.949 0-2.103-0.222-3.46-0.665v-1.908c1.357 0.675 2.539 1.012 3.544 1.012 0.598 0 1.094-0.161 1.487-0.484 0.394-0.324 0.591-0.729 0.591-1.213 0-0.711-0.552-1.298-1.656-1.762l-1.213-0.517c-1.793-0.745-2.689-1.817-2.689-3.217 0-0.999 0.354-1.
 784 1.061-2.357 0.706-0.573 1.675-0.859 2.905-0.859 0.64 0 1.431 0.088 2.373 0.264l0.433 0.084v1.729c-1.16-0.344-2.081-0.517-2.764-0.517-1.336 0-2.004 0.485-2.004 1.456 0 0.625 0.507 1.152 1.519 1.582l1.002 0.422c1.133 0.478 1.934 0.982 2.405 1.513s0.706 1.194 0.706 1.988c0 1.006-0.396 1.832-1.191 2.479-0.796 0.647-1.812 0.97-3.049 0.97zm12.996-0.263c-0.64 0.176-1.195 0.264-1.666 0.264-1.055 0-1.877-0.303-2.468-0.907s-0.886-1.445-0.886-2.521v-6.729h-1.435v-1.561h1.435v-2.078l2.077-0.2v2.278h2.995v1.561h-2.995v6.35c0 1.498 0.647 2.246 1.94 2.246 0.274 0 0.608-0.045 1.002-0.137v1.434h0.001zm10.693 0.263c-0.971 0-1.589-0.573-1.856-1.72-1.244 1.146-2.443 1.72-3.597 1.72-0.949 0-1.736-0.297-2.362-0.892-0.626-0.594-0.938-1.345-0.938-2.252 0-1.251 0.525-2.213 1.576-2.884 1.052-0.672 2.558-1.008 4.52-1.008h0.496v-1.382c0-1.328-0.683-1.993-2.046-1.993-1.098 0-2.282 0.338-3.555 1.013v-1.719c1.399-0.57 2.711-0.854 3.934-0.854 1.28 0 2.224 0.288 2.832 0.864 0.608 0.577 0.912 1.474 0.912 2.689v5
 .189c0 1.188 0.366 1.782 1.098 1.782 0.091 0 0.225-0.014 0.4-0.042l0.147 1.149c-0.471 0.228-0.991 0.34-1.561 0.34zm-4.862-1.698c0.865 0 1.765-0.383 2.7-1.149v-2.964l-0.696-0.021c-1.139 0-2.061 0.217-2.764 0.649s-1.055 1-1.055 1.703c0 0.499 0.176 0.921 0.527 1.266s0.782 0.516 1.288 0.516zm9.088 1.435v-16.653h2.078v16.653h-2.078zm6.112 0v-16.653h2.078v16.653h-2.078zm6.2 3.122 5.622-18.731h1.635l-5.622 18.731h-1.635zm11.69-3.122 12.488-6.244-12.488-6.243v1.74l8.997 4.503-8.997 4.493v1.751z"/>
+    <path d="m515.89 331.2-12.487-6.244 12.487-6.244v1.74l-8.996 4.504 8.996 4.493v1.751zm4.399-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm8.487 0-4.261-11.454h2.078l3.332 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.545 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.627 3.502-8.627h1.962l-6.255 15.62h-2.161zm10.798-13.532v-2.088h2.078v2.088h-2.078zm0 9.366v-2.078h2.078v2.078h-2.078zm6.529 0v-11.454h2.078v2.151c0.822-1.604 2.018-2.404 3.586-2.404 0.211 0 0.433 0.018 0.664 0.053v1.94c-0.358-0.12-0.675-0.18-0.949-0.18-1.314 0-2.415 0.78-3.301 2.342v7.552h-2.078zm17.166-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.408-4.271 0.938-1.11 2.14-1.666 3.602-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.927-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.485 1.065-2.669 3.196h5.053c0-2.131-0.795-3.196-
 2.384-3.196zm13.225 10.157c-0.64 0.174-1.195 0.264-1.667 0.264-1.055 0-1.877-0.303-2.468-0.907s-0.886-1.445-0.886-2.521v-6.729h-1.435v-1.561h1.435v-2.078l2.078-0.2v2.278h2.995v1.561h-2.995v6.35c0 1.497 0.646 2.246 1.94 2.246 0.274 0 0.608-0.046 1.002-0.137v1.434h0.001zm2.929 0v-11.454h2.077v2.151c0.823-1.604 2.019-2.404 3.586-2.404 0.211 0 0.433 0.018 0.665 0.053v1.94c-0.358-0.12-0.675-0.18-0.949-0.18-1.315 0-2.415 0.78-3.302 2.342v7.552h-2.077zm8.771-13.532v-2.077h2.077v2.077h-2.077zm0 13.532v-11.454h2.077v11.454h-2.077zm14.637-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.407-4.271 0.939-1.11 2.141-1.666 3.603-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.926-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.486 1.065-2.669 3.196h5.052c0-2.131-0.794-3.196-2.383-3.196zm10.493 10.157-4.261-11.454h2.078l3.333 8.912 3.512-8
 .912h1.94l-4.524 11.454h-2.078zm17.189-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.064-0.561-4.13-1.684-1.065-1.12-1.598-2.574-1.598-4.36 0-1.736 0.469-3.16 1.408-4.271 0.938-1.11 2.14-1.666 3.602-1.666 1.386 0 2.455 0.492 3.211 1.477s1.135 2.384 1.135 4.197l-0.011 0.644h-7.225c0.303 2.721 1.635 4.082 3.997 4.082 0.865 0 1.927-0.232 3.186-0.696v1.644zm-4.419-9.788c-1.597 0-2.485 1.065-2.669 3.196h5.053c0-2.131-0.795-3.196-2.384-3.196zm8.384 10.157 12.487-6.244-12.487-6.244v1.74l8.996 4.504-8.996 4.493v1.751z"/>
+    <path d="m260.77 463.92-12.488-6.243 12.488-6.244v1.74l-8.997 4.504 8.997 4.493v1.75zm4.398-13.531v-2.078h2.078v2.078h-2.078zm0 13.531v-11.453h2.078v11.453h-2.078zm8.487 0-4.262-11.453h2.078l3.333 8.912 3.512-8.912h1.94l-4.524 11.453h-2.077zm9.545 4.166 1.855-4.166-4.43-11.453h2.247l3.28 8.627 3.501-8.627h1.962l-6.254 15.619h-2.161zm10.797-13.531v-2.088h2.078v2.088h-2.078zm0 9.365v-2.077h2.078v2.077h-2.078zm6.531 4.166v-15.619h2.078v2.151c0.851-1.604 2.127-2.405 3.828-2.405 1.378 0 2.463 0.503 3.254 1.509 0.791 1.005 1.187 2.38 1.187 4.124 0 1.898-0.448 3.43-1.345 4.592-0.896 1.165-2.076 1.746-3.539 1.746-1.356 0-2.485-0.52-3.385-1.561v5.463h-2.078zm2.078-6.897c1.068 0.956 2.088 1.435 3.059 1.435 1.996 0 2.995-1.522 2.995-4.566 0-2.686-0.886-4.029-2.658-4.029-1.16 0-2.292 0.629-3.396 1.888v5.272zm18.647 2.731v-2.151c-1.104 1.61-2.443 2.415-4.018 2.415-0.999 0-1.793-0.313-2.384-0.944-0.591-0.628-0.886-1.477-0.886-2.546v-8.227h2.078v7.551c0 0.859 0.124 1.469 0.374 1.83 0.249 0.363
  0.666 0.543 1.25 0.543 1.265 0 2.46-0.833 3.585-2.499v-7.425h2.078v11.453h-2.077zm6.167 0.127v-16.78h2.077v7.352c0.851-1.604 2.127-2.405 3.829-2.405 1.378 0 2.462 0.503 3.253 1.509 0.791 1.005 1.187 2.38 1.187 4.124 0 1.898-0.448 3.43-1.345 4.592-0.896 1.165-2.075 1.746-3.538 1.746-1.357 0-2.485-0.52-3.386-1.561l-0.253 1.424h-1.824zm2.077-2.858c1.069 0.956 2.089 1.435 3.059 1.435 1.997 0 2.995-1.522 2.995-4.566 0-2.686-0.886-4.029-2.657-4.029-1.16 0-2.292 0.629-3.396 1.888v5.272zm11.488 2.731v-16.653h2.077v16.653h-2.077zm6.242-13.531v-2.078h2.078v2.078h-2.078zm0 13.531v-11.453h2.078v11.453h-2.078zm9.15 0.264c-0.949 0-2.103-0.221-3.46-0.664v-1.909c1.357 0.675 2.538 1.013 3.544 1.013 0.598 0 1.094-0.162 1.487-0.485s0.591-0.728 0.591-1.213c0-0.71-0.553-1.297-1.656-1.761l-1.213-0.518c-1.793-0.744-2.689-1.817-2.689-3.217 0-0.998 0.354-1.783 1.061-2.357 0.707-0.572 1.675-0.859 2.905-0.859 0.64 0 1.431 0.088 2.373 0.264l0.433 0.085v1.729c-1.16-0.345-2.082-0.517-2.764-0.517-1.336 0-2.004 0
 .485-2.004 1.455 0 0.627 0.506 1.154 1.519 1.582l1.002 0.422c1.132 0.479 1.934 0.983 2.405 1.513 0.471 0.532 0.706 1.194 0.706 1.989 0 1.007-0.397 1.831-1.191 2.479-0.796 0.645-1.811 0.969-3.049 0.969zm7.979-0.264v-16.653h2.078v7.352c1.097-1.604 2.439-2.405 4.029-2.405 0.991 0 1.782 0.315 2.373 0.943 0.59 0.631 0.886 1.477 0.886 2.537v8.227h-2.078v-7.551c0-0.85-0.125-1.457-0.375-1.82-0.249-0.361-0.663-0.543-1.238-0.543-1.274 0-2.473 0.834-3.597 2.5v7.414h-2.078zm13.591 0 12.487-6.243-12.487-6.244v1.74l8.996 4.504-8.996 4.493v1.75z"/>
+    <path d="m264.13 195.24-12.487-6.243 12.487-6.244v1.74l-8.996 4.504 8.996 4.492v1.751zm4.4-13.531v-2.078h2.077v2.078h-2.077zm0 13.531v-11.454h2.077v11.454h-2.077zm8.615 0-4.261-11.454h2.078l3.332 8.912 3.513-8.912h1.94l-4.524 11.454h-2.078zm9.459 4.166 1.856-4.166-4.43-11.454h2.246l3.28 8.628 3.502-8.628h1.961l-6.254 15.62h-2.161zm10.906-13.531v-2.089h2.077v2.089h-2.077zm0 9.365v-2.077h2.077v2.077h-2.077zm6.422 0v-11.454h2.077v2.152c0.823-1.604 2.019-2.405 3.586-2.405 0.211 0 0.433 0.018 0.665 0.053v1.94c-0.358-0.119-0.675-0.179-0.949-0.179-1.315 0-2.415 0.78-3.302 2.341v7.552h-2.077zm17.164-0.369c-1.392 0.422-2.584 0.633-3.574 0.633-1.688 0-3.064-0.561-4.13-1.682-1.064-1.122-1.598-2.575-1.598-4.361 0-1.736 0.47-3.16 1.408-4.271s2.14-1.667 3.602-1.667c1.386 0 2.456 0.492 3.212 1.477s1.133 2.384 1.133 4.198l-0.011 0.644h-7.224c0.303 2.721 1.635 4.081 3.997 4.081 0.864 0 1.926-0.231 3.185-0.696v1.644zm-4.418-9.787c-1.597 0-2.486 1.065-2.669 3.195h5.052c0-2.13-0.794-3.195-2.383-3.1
 95zm11.157 10.42c-0.949 0-2.104-0.222-3.459-0.664v-1.909c1.355 0.675 2.537 1.013 3.544 1.013 0.597 0 1.092-0.162 1.485-0.485 0.395-0.323 0.591-0.728 0.591-1.213 0-0.71-0.552-1.297-1.654-1.762l-1.214-0.517c-1.793-0.744-2.688-1.817-2.688-3.217 0-0.998 0.353-1.784 1.06-2.357 0.706-0.572 1.674-0.859 2.906-0.859 0.639 0 1.43 0.089 2.371 0.264l0.434 0.085v1.729c-1.16-0.344-2.082-0.517-2.763-0.517-1.337 0-2.004 0.484-2.004 1.455 0 0.626 0.506 1.153 1.519 1.582l1.001 0.422c1.132 0.479 1.934 0.982 2.404 1.514 0.472 0.53 0.708 1.193 0.708 1.988 0 1.006-0.398 1.831-1.193 2.479-0.795 0.647-1.811 0.969-3.048 0.969zm12.461 0c-1.639 0-2.946-0.543-3.924-1.629-0.977-1.087-1.466-2.54-1.466-4.361 0-1.842 0.49-3.3 1.471-4.372s2.312-1.608 3.993-1.608c1.68 0 3.01 0.536 3.991 1.608 0.98 1.072 1.472 2.522 1.472 4.351 0 1.871-0.492 3.34-1.477 4.409s-2.337 1.602-4.06 1.602zm-3.175-5.99c0 2.953 1.069 4.43 3.206 4.43 2.201 0 3.302-1.483 3.302-4.451 0-2.932-1.087-4.397-3.259-4.397-2.166-0.001-3.249 1.471-3.249 
 4.418zm11.89 5.726v-16.653h2.078v16.653h-2.078zm8.486 0-4.262-11.454h2.078l3.333 8.912 3.512-8.912h1.94l-4.524 11.454h-2.077zm17.276-0.369c-1.393 0.422-2.584 0.633-3.575 0.633-1.688 0-3.063-0.561-4.129-1.682-1.065-1.122-1.599-2.575-1.599-4.361 0-1.736 0.471-3.16 1.409-4.271s2.139-1.667 3.601-1.667c1.386 0 2.457 0.492 3.213 1.477s1.133 2.384 1.133 4.198l-0.011 0.644h-7.225c0.303 2.721 1.635 4.081 3.997 4.081 0.865 0 1.927-0.231 3.186-0.696v1.644zm-4.419-9.787c-1.597 0-2.485 1.065-2.669 3.195h5.053c0-2.13-0.795-3.195-2.384-3.195zm8.384 10.156 12.487-6.243-12.487-6.244v1.74l8.996 4.504-8.996 4.492v1.751z"/>
+  </g>
+</svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/open.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/open.gif b/asciidoc/images/open.gif
new file mode 100644
index 0000000..bd0be79
Binary files /dev/null and b/asciidoc/images/open.gif differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/report-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/report-small.png b/asciidoc/images/report-small.png
new file mode 100644
index 0000000..2868867
Binary files /dev/null and b/asciidoc/images/report-small.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/searched.gif
----------------------------------------------------------------------
diff --git a/asciidoc/images/searched.gif b/asciidoc/images/searched.gif
new file mode 100644
index 0000000..7e7437b
Binary files /dev/null and b/asciidoc/images/searched.gif differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/warning.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/warning.png b/asciidoc/images/warning.png
new file mode 100644
index 0000000..283cc71
Binary files /dev/null and b/asciidoc/images/warning.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-edit-small.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-edit-small.png b/asciidoc/images/xooki-edit-small.png
new file mode 100644
index 0000000..9d9eb39
Binary files /dev/null and b/asciidoc/images/xooki-edit-small.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-edit.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-edit.png b/asciidoc/images/xooki-edit.png
new file mode 100644
index 0000000..808a23b
Binary files /dev/null and b/asciidoc/images/xooki-edit.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/xooki-toolbar.png
----------------------------------------------------------------------
diff --git a/asciidoc/images/xooki-toolbar.png b/asciidoc/images/xooki-toolbar.png
new file mode 100644
index 0000000..bfe266e
Binary files /dev/null and b/asciidoc/images/xooki-toolbar.png differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step1.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step1.jpg b/asciidoc/images/yed-step1.jpg
new file mode 100644
index 0000000..9eb99e4
Binary files /dev/null and b/asciidoc/images/yed-step1.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step2.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step2.jpg b/asciidoc/images/yed-step2.jpg
new file mode 100644
index 0000000..300c20b
Binary files /dev/null and b/asciidoc/images/yed-step2.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step3-2.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step3-2.jpg b/asciidoc/images/yed-step3-2.jpg
new file mode 100644
index 0000000..2f7d200
Binary files /dev/null and b/asciidoc/images/yed-step3-2.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step3.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step3.jpg b/asciidoc/images/yed-step3.jpg
new file mode 100644
index 0000000..638d692
Binary files /dev/null and b/asciidoc/images/yed-step3.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step4.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step4.jpg b/asciidoc/images/yed-step4.jpg
new file mode 100644
index 0000000..1803a53
Binary files /dev/null and b/asciidoc/images/yed-step4.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step5.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step5.jpg b/asciidoc/images/yed-step5.jpg
new file mode 100644
index 0000000..39ce414
Binary files /dev/null and b/asciidoc/images/yed-step5.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step6.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step6.jpg b/asciidoc/images/yed-step6.jpg
new file mode 100644
index 0000000..880472d
Binary files /dev/null and b/asciidoc/images/yed-step6.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/images/yed-step7.jpg
----------------------------------------------------------------------
diff --git a/asciidoc/images/yed-step7.jpg b/asciidoc/images/yed-step7.jpg
new file mode 100644
index 0000000..407d9d7
Binary files /dev/null and b/asciidoc/images/yed-step7.jpg differ

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/index.adoc b/asciidoc/index.adoc
new file mode 100644
index 0000000..210e156
--- /dev/null
+++ b/asciidoc/index.adoc
@@ -0,0 +1,69 @@
+
+Welcome to the official Ivy documentation.
+
+
+== What is Ivy?
+
+Ivy is a tool for managing (recording, tracking, resolving and reporting) project dependencies. It is characterized by the following:
+
+
+. flexibility and configurability - Ivy is essentially process agnostic and is not tied to any methodology or structure. Instead it provides the necessary flexibility and configurability to be adapted to a broad range of dependency management and build processes. +
+
+
+. tight integration with Apache Ant - while available as a standalone tool, Ivy works particularly well with Apache Ant providing a number of powerful Ant tasks ranging from dependency resolution to dependency reporting and publication. +
+
+Ivy is open source and released under a very permissive Apache License.
+
+Ivy has a lot of powerful features, the most popular and useful being its flexibility, integration with ant, and its strong transitive dependencies management engine.
+
+The transitive dependencies management is a feature which lets you get dependencies of your dependencies, transitively. In order to address this general problem, ivy needs to find metadata about your modules, usually in an link:ivyfile.html[ivy file]. To find the metadata and your dependencies' artifacts (usually jars), Ivy can be configured to use a lot of different link:configuration/resolvers.html[repositories].
+
+
+== About this doc
+
+
+[NOTE]
+====
+
+Tip: The menu on the left is dynamic, you  can click on the arrows to browse the menu without going to each page.
+
+====
+
+This documentation has been migrated from the old Ivy web site hosted by Jayasoft, feel free to report any problem on the mailing-lists.
+
+If you browse this documentation from your installation of Ivy, you can also check the link:http://ant.apache.org/ivy/[online version] for the latest updates.
+
+You can also browse this documentation offline either by downloading the documentation distribution, or by checking out the doc directory from git. This documentation uses link:http://xooki.sourceforge.net/[xooki] as its documentation engine, so you can very easily edit it and submit patches when you browse it from source.
+
+A link:book.html[printer-friendly version] of this whole documentation is also provided for your convenience.
+
+Since Ivy 2.0.0-alpha-2, we keep an online history of the documentation. You can thus browse history versions online (in the history menu in the web site) and even check the trunk version documentation currently in development.
+
+For earlier versions, we suggest downloading the documentation to browse the documentation corresponding to the version you use. The full history of Ivy versions with corresponding links for download is available in the history menu on the web site.
+
+
+== Other places to go
+
+Check out Ivy features. 
+Read our FAQ.
+Ask for help on our mailing lists.
+Report a bug or feature request in our issue tracking system.
+Check external tools and resources.
+
+
+== Overview
+
+This documentation is composed of three main parts:
+
+  
+* link:tutorial.html[Tutorials] + 
+The tutorials is the best way to begin to play with Ivy. You will easily and quickly learn the basics of Ivy.
+  
+* link:reference.html[Reference] + 
+The reference documentation gives you all the details of Ivy. 
+The introduction part is particularly useful: it defines some vocabulary, explains main concepts such as dependency resolvers and patterns, and gives an overview of how ivy works internally. 
+It's also in the reference doc that you will find all you always dreamed to know about ivy settings, ivy files, and ivy use (especially with ant).
+  
+* link:dev.html[Developer doc] + 
+The developers's doc is useful for users who would like to extend Ivy or build it from source. It's also the documentation used by the Ivy team, so you will also find information about how we make releases.
+

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/install.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/install.adoc b/asciidoc/install.adoc
new file mode 100644
index 0000000..aa9def6
--- /dev/null
+++ b/asciidoc/install.adoc
@@ -0,0 +1,74 @@
+
+There are basically two ways to install Ivy: either manually or automatically.
+
+== Manually
+
+Download the version you want here, unpack the downloaded zip file wherever you want, and copy the ivy jar file into your ant lib directory (ANT_HOME/lib).
+
+If you use ant 1.6.0 or superior, you can then simply go to the src/example/hello-ivy dir and run ant: if the build is successful, you have successfully installed Ivy!
+
+If you use ant 1.5.1 or superior, you have to modify the build files in the examples:
+- remove the namespace section at their head: xmlns:ivy="antlib:org.apache.ivy.ant" 
+- add taskdefs for ivy tasks:
+
+[source]
+----
+
+  <taskdef name="ivy-configure" classname="org.apache.ivy.ant.IvyConfigure"/>
+  <taskdef name="ivy-resolve" classname="org.apache.ivy.ant.IvyResolve"/>
+  <taskdef name="ivy-retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
+  <taskdef name="ivy-publish" classname="org.apache.ivy.ant.IvyPublish"/> 
+
+----
+
+- replace ivy:xxx tasks by ivy-xxx
+You can now run the build, if it is successful, you have successfully installed Ivy!
+
+If the build is not successful, check the FAQ to see what might be the problem with the ivyrep resolver.
+
+
+=== Ivy dependendencies
+
+
+One of the two binary versions of Ivy doesn't include the optional dependencies. To download them using Ivy, all you need is to run the Ant build file provided in the distribution. This will use Ivy itself to download the dependencies. Then you should see the Ivy optional dependencies in the lib directory, organized per configuration (see the ivy.xml for details about the configurations and their use).
+
+
+== Automatically
+
+If you want to use Ivy only in your ant build scripts, and have an internet connection when you build, you can download Ivy from this site and use the downloaded version automatically, using this simple build snippet:
+
+[source]
+----
+
+    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+      <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ant" />
+    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+    <target name="download-ivy" unless="offline">
+
+        <mkdir dir="${ivy.jar.dir}"/>
+        <!-- download Ivy from web site so that it can be used even without any special installation -->
+        <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
+             dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <target name="init-ivy" depends="download-ivy">
+      <!-- try to load ivy here from ivy home, in case the user has not already dropped
+              it into ant's lib dir (note that the latter copy will always take precedence).
+              We will not fail as long as local lib dir exists (it may be empty) and
+              ivy is in at least one of ant's lib dir or the local lib dir. -->
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+----
+
+Then the only thing to do is to add the init-ivy target in the depends attribute of your targets using Ivy, and add the ivy namespace to your build script. See the self contained link:https://git-wip-us.apache.org/repos/asf?p=ant-ivy.git;a=blob;f=src/example/go-ivy/build.xml[go-ivy] example for details about this.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile.adoc b/asciidoc/ivyfile.adoc
new file mode 100644
index 0000000..4d8fe7c
--- /dev/null
+++ b/asciidoc/ivyfile.adoc
@@ -0,0 +1,126 @@
+
+Ivy use is entirely based on _module descriptors_ known as "ivy files". Ivy files are xml files, usually called ivy.xml, containing the description of the dependencies of a module, its published artifacts and its configurations.
+
+Here is the simplest ivy file you can write:
+
+[source]
+----
+
+<ivy-module version="2.0">
+  <info organisation="myorg"
+        module="mymodule"
+        />
+</ivy-module>
+
+----
+
+If you want to see a sample module descriptor using almost all possibilities of ivy files, check this one, link:samples/ivy-sample-xslt.xml[with] or link:samples/ivy-sample.xml[without] xslt.
+
+Before beginning the reference itself, it is required to have in mind the terminology defined in the link:reference.html[main page] of this reference documentation.
+
+For those familiar with xml schema, the schema used to validate ivy files can be found link:http://ant.apache.org/ivy/schemas/ivy.xsd[here]. For those using xsd aware IDE, you can declare the xsd in your ivy files to benefit from code completion / validation:
+
+[source]
+----
+
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0" 
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation=
+                   "http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="myorg"
+        module="mymodule"
+        />
+</ivy-module>
+
+----
+
+
+=== Dynamic and [[resolved]]resolved ivy files
+
+
+A module descriptor (ivy file) is needed both before and after the publication of each revision of the module. Depending on the case, a module descriptor can be either _dynamic_ or _resolved_:
+
+
+==== Dynamic descriptor for module development
+
+
+During the module development time, between publications, the descriptor helps in managing all the possibly changing dependencies of the module. For that purpose, development time ivy files can declare dynamic dependencies to allow for a greater flexibility of use. link:ivyfile/dependency.html#revision[Dynamic revision] references like "latest.integration" or "1.0.+" are possible and may resolve to different artifacts at different times. Variables can be used for even more flexibility. Development time ivy files are hence called "dynamic", because they can produce different results over time. The dynamic ivy files are normally considered source files and kept with them (under SCM control).
+
+
+==== Resolved descriptors for publishing
+
+
+At each publication, another kind of a module descriptor is needed to document the dependencies of the particular published revision of the module. For that purpose, the descriptor usually needs to be fixed as its dependencies should no longer change. In doing so, the published module revision gets fixed, explicitly resolved dependencies. No variables are allowed either. Such publication-friendly, static ivy files are called "resolved", because they should always produce the same results. The resolved ivy files are comparable to published artifacts and are kept with them in a repository.
+
+Resolved ivy files are generated from their original dynamic ivy files via the link:use/deliver.html[deliver] task.
+
+Note that although it is technically possible to publish module revisions with dynamic ivy files, it is not a generally recommended practice.
+
+
+== Hierarchical Index
+
+
+[source]
+----
+
+ivy-module
+    link:ivyfile/info.html[info]
+        link:ivyfile/license.html[license]
+        link:ivyfile/ivyauthor.html[ivyauthor]
+        link:ivyfile/repository.html[repository]
+        link:ivyfile/description.html[description]
+    link:ivyfile/configurations.html[configurations]
+        link:ivyfile/conf.html[conf]
+    link:ivyfile/publications.html[publications]
+        link:ivyfile/artifact.html[artifact]
+            link:ivyfile/artifact-conf.html[conf]
+    link:ivyfile/dependencies.html[dependencies]
+        link:ivyfile/dependency.html[dependency]
+            link:ivyfile/dependency-conf.html[conf]
+                link:ivyfile/mapped.html[mapped]
+            link:ivyfile/dependency-artifact.html[artifact]
+                link:ivyfile/dependency-artifact-conf.html[conf]
+            link:ivyfile/dependency-artifact.html[include]
+                link:ivyfile/dependency-artifact-conf.html[conf]
+            link:ivyfile/artifact-exclude.html[exclude]
+                link:ivyfile/artifact-exclude-conf.html[conf]
+        link:ivyfile/exclude.html[exclude]
+        link:ivyfile/override.html[override]
+        link:ivyfile/conflict.html[conflict]
+    link:ivyfile/conflicts.html[conflicts]
+        link:ivyfile/manager.html[manager]
+
+----
+
+
+
+
+== ivy-module
+
+*Tag:* ivy-module
+
+The root tag of any ivy file (module descriptor).
+
+=== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|version|the version of the ivy file specification - should be '2.0' with current version of ivy|Yes
+|=======
+
+
+=== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|info|contains information about the described module|1
+|configurations|container for configuration elements|0..1
+|publications|container for published artifact elements|0..1
+|dependencies|container for dependency elements|0..1
+|conflicts|section to configure the conflict managers to use|0..1
+|=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-conf.adoc b/asciidoc/ivyfile/artifact-conf.adoc
new file mode 100644
index 0000000..2ac2c06
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-conf.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/artifact.html[artifact]
+
+
+
+Indicates a public configuration in which enclosing artifact is published.
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the module public configuration in which this artifact is published. 
+    	'*' wildcard can be used to designate all public configurations of this module|Yes
+|=======
+
+
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-exclude-conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-exclude-conf.adoc b/asciidoc/ivyfile/artifact-exclude-conf.adoc
new file mode 100644
index 0000000..e45cca3
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-exclude-conf.adoc
@@ -0,0 +1,19 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/artifact-exclude.html[artifact]
+
+
+
+Specify a configuration in which the enclosing artifact exclusion should be included.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the master configuration in which the enclosing artifact should be excluded|Yes
+|=======
+
+
+	
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact-exclude.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact-exclude.adoc b/asciidoc/ivyfile/artifact-exclude.adoc
new file mode 100644
index 0000000..760c7ea
--- /dev/null
+++ b/asciidoc/ivyfile/artifact-exclude.adoc
@@ -0,0 +1,49 @@
+
+*Tag:* exclude *Parent:* link:../ivyfile/dependency.html[dependency]
+
+This feature gives you more control on a dependency for which you do not control its ivy file. 
+It enables to restrict the artifacts required, by excluding artifacts being published by the dependency or any of its transitive dependencies, 
+even if configuration does not a good separation of published artifacts
+
+The same principle concerning configuration as for include applies to this exclude feature (see the link:../ivyfile/dependency-include.html[include] feature).
+
+Note that exclusion is always done AFTER inclusion has been done.
+
+*__since 1.3__* This exclude feature can also be used not only to exclude artifacts but also to exclude whole modules. Indeed when you exclude artifacts, it doesn't avoid ivy to search for the module itself, and to resolve the dependencies of the module. But you can also exclude the whole module, which means that the module will not be downloaded at all, and so its own dependencies will not be resolved. For sure, this is usually done to exclude not a direct dependency but an indirect one. To exclude a whole module, you just have to not specify any artifact name, type and ext in your exclude rule. For instance:
+
+[source]
+----
+
+<dependency name="A" rev="1.0">
+  <exclude module="B"/>
+</dependency>
+
+----
+
+*__since 2.0__* A link:../ivyfile/exclude.html[module wide exclude] can also be used to exclude dependencies for the whole module (and not only in the context of one dependency as it is the case here).
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the organisation of the dependency module or artifact to exclude, or a regexp matching this organisation *__since 1.3__*|No, defaults to *
+|module|the name of the dependency module or the artifact to exclude, or a regexp matching this module name *__since 1.3__*|No, defaults to *
+|name|the name of an artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to *
+|type|the type of the artifact of the dependency module to add to the exclude list, or a regexp matching this name|No, defaults to *
+|ext|the extension of the artifact of the dependency module to add to the exclude list, or an expression matching this name (see matcher attribute below)|No, defaults to type
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules to excludes *__since 1.3__*|No, defaults to exactOrRegexp in pre 1.3 ivy files, and exact in 1.3 and superior
+|conf|comma separated list of the master configurations in which this artifact should be excluded.
+    '*' wildcard can be used to designate all configurations of this module|No, defaults to '*', unless nested conf are specified
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/artifact-exclude-conf.html[conf]|configuration in which the artifact should be excluded|0..n
+|=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/artifact.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/artifact.adoc b/asciidoc/ivyfile/artifact.adoc
new file mode 100644
index 0000000..6d74c14
--- /dev/null
+++ b/asciidoc/ivyfile/artifact.adoc
@@ -0,0 +1,94 @@
+
+*Tag:* artifact *Parent:* link:../ivyfile/publications.html[publications]
+
+Declares an artifact published by this module. This is especially useful for other modules dependending on this one. They thus get all published artifacts belonging to the configurations asked. Indeed, each published artifact declares in which public configuration it is published. Thus a module depending on this module only get artifacts marked with the asked configurations, taking into account configurations extension (see link:../ivyfile/conf.html[configuration declaration]).
+
+The configurations in which an artifact is published can be configured in two ways:
+
+
+* conf attribute on artifact element +
+
+* conf subelement +
+
+The two are equivalent, it is only a matter of preference. However, do not mix both for one artifact.
+
+*__since 1.4__* The artifact element has default values for all its attributes, so if you want to declare a default artifact you can just declare it like that:
+[source]
+----
+
+<artifact />
+
+----
+
+If this is the only artifact declared, then it's equivalent to having no publication section at all.
+
+*__since 1.4__* It is possible to give a url at which artifacts can be found. This is not mandatory, and even not recommended. This is only a convenient way to deal with an existing repository with a bad layout, but should not be avoided in an enterprise repository.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+*__since 2.4__* This tag supports the 'packaging' attributes; complete documentation can be found in the link:../concept.html#packaging[concept page].
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the published artifact. This name must not include revision.|No, defaults to the name of the module
+|type|the type of the published artifact. It's usually its extension, but not necessarily. For instance, ivy files are of type 'ivy' but have 'xml' extension|No, defaults to jar
+|ext|the extension of the published artifact|No, defaults to type
+|conf|comma separated list of public configurations in which this artifact is published.
+    	'*' wildcard can be used to designate all public configurations of this module|No, defaults to defaultconf attribute value on parent publications element.
+|url|a url at which this artifact can be found if it isn't located at the standard location in the repository *__since 1.4__*|No, defaults to no url
+|packaging|a comma separated list of link:../concept.html#packaging[packaging] types *__since 2.4__*|No, defaults to no packaging
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/artifact-conf.html[conf]|indicates a public configuration in which this artifact is published|0..n
+|=======
+
+
+== Examples
+
+
+[source]
+----
+
+<artifact />
+
+----
+
+Declares an artifact with the name of the module as name, type and ext jar, and published in all configurations.
+
+
+'''
+
+
+[source]
+----
+
+<artifact name="foo-src" type="source" ext="zip" conf="src" />
+
+----
+
+Declares an artifact foo-src, of type 'source' with extension 'zip', and published in the src configuration.
+
+
+'''
+
+
+[source]
+----
+
+<artifact name="foo" url="http://www.acme.com/repository/barbaz/foo-1.2-bar.jar" />
+
+----
+
+Declares an artifact foo, of type and extension 'jar' located at the url http://www.acme.com/repository/barbaz/foo-1.2-bar.jar. This url will only be used if the artifact cannot be found at its standard location.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conf.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conf.adoc b/asciidoc/ivyfile/conf.adoc
new file mode 100644
index 0000000..2c2c146
--- /dev/null
+++ b/asciidoc/ivyfile/conf.adoc
@@ -0,0 +1,62 @@
+
+*Tag:* conf *Parent:* link:../ivyfile/configurations.html[configurations]
+
+Declares a configuration of this module. As described in the reference page, a configuration is a way to use or construct a module. Some modules may be used in different ways (think about hibernate which can be used inside or outside an application server), and this way may alter the artifacts you need (in the case of hibernate, jta.jar is needed only if it is used outside an application server). Moreover, a module may need some other modules and artifacts only at build time, and some others at runtime. All those differents ways to use or build a module are called in Ivy module configurations.
+
+The conf element in the configurations section declares one configuration. This declaration gives the name of the configuration declared, its visibility and the other configurations of the module it extends.
+
+Visibility is used to indicate whether or not a configuration can be used from other modules depending on this one. Thus a private configuration is only used for internal purpose (maybe at build time), and other modules cannot declare to depend on it. 
+
+A configuration can also extend one or several other ones of the same module. When a configuration extends another one, then all artifacts required in the extended configuration will also be required in the configuration that extends the other one. For instance, if configuration B extends configuration A, and if artifacts art1 and art2 are required in configuration A, then they will be automatically required in configuration B. On the other hand, artifacts required in configuration B are not necessarily required in configuration A.
+
+This notion is very helpful to define configurations which are similar with some differences.
+
+*__since 1.4__* The extends attribute can use the following wildcards:
+[cols="15%,50%"]
+|=======
+|*|all other configurations
+|*(public)|all other public configurations
+|*(private)|all other private configurations
+|=======
+
+
+
+
+*__since 1.4__* A whole configuration can be declared as non transitive, so that all dependencies resolved in this configuration will be resolved with transitivity disabled. Note that the transitivity is disabled for all the configuration dependencies (including those obtained because this conf extends other ones), and only for this configuration (which means that a conf extending this one with transitivityy enabled will get transitive dependencies even for dependencies being part of the non transitive configuration).
+This is very useful to build a compile configuration, for instance, forcing the dependency declaration on each direct dependency, with no risk to forget some because of transitivity.
+
+*__since 1.4__* This tag supports link:../concept.html#extra[extra attributes].
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|name|the name of the declared configuration|Yes
+|description|a description for the declared configuration|No
+|visibility|the visibility of the declared configuration. 
+    'public' means that this configuration can be used by other modules, while 'private' means that this configuration is used only in the module itself, and is not exposed to other modules|No, defaults to public
+|extends|a comma separated list of configurations of this module that the 
+    current configuration extends|No, defaults to none
+|transitive|a boolean to indicate if this conf is transitive or not *__since 1.4__*|No, defaults to true
+|deprecated|indicates that this conf has been deprecated by giving the date of the deprecation. 
+    	It should be given in this format: yyyyMMddHHmmss|No, by default the conf is not deprecated
+|=======
+
+
+
+== Examples
+
+
+[source]
+----
+
+<conf name="core" visibility="private" />
+<conf name="compile" extends="core" transitive="false" visibility="private" />
+<conf name="runtime" extends="compile" description="everything needed to run this module" />
+
+----
+
+Declares three configurations, core compile and runtime, with only the runtime one accessible from other modules, and with the compile one being non transitive.
+Therefore the core configuration will only be composed of dependencies declared in the core configuration itself, the compile configuration will be composed of all dependencies required in either core or compile configuration, but without transivity (neither for core nor compile dependencies), and runtime will be composed of all dependencies, all transitively, including the dependencies declared only in compile.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/configurations.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/configurations.adoc b/asciidoc/ivyfile/configurations.adoc
new file mode 100644
index 0000000..7d4929a
--- /dev/null
+++ b/asciidoc/ivyfile/configurations.adoc
@@ -0,0 +1,190 @@
+
+*Tag:* configurations *Parent:* link:../ivyfile.html[ivy-module]
+
+A container for configuration elements. If this container is not present, it is assumed that the module has one public configuration called 'default'.
+
+*__since 2.2__* You can define the default conf on this container by specifying the defaultconf attribute.  This attribute defines the conf mapping to use when no conf mapping is specified for a dependency in this ivy file.
+
+*__since 1.3__* You can define a default conf mapping on this container by specifying the defaultconfmapping attribute.
+
+This attribute modifies the way ivy interprets conf mapping with no mapped conf. In this case, Ivy will look in the default conf mapping and use the conf mapping defined in the default conf mapping for the conf for which there is no mapped conf.
+
+In order to maintain backwards compatibility with Ivy 2.1.0 and earlier, the defaultconfmapping also provides one additional function.  If no defaultconf is specified (on either the configurations tag or the dependencies tag), the defaultconfmapping becomes the default configuration for dependencies in this ivy file when no configuration is specified.  In other words, in addition to altering the interpretation of individual configurations with no mapping, defaultconfmapping also performs exactly like defaultconf in the absence of a definition for defaultconf.
+
+If several defaultconfmapping or defaultconf attributes are defined (in the configurations tag, one or several in an included configurations file, and/or in the dependency tag, then it's only the last definition of each property which is taken into account.  The others will have no effect at all.
+
+See link:#defaultconfmapping[examples below] to clarify the behavior of these two attributes together.
+
+*__since 1.4__* You can activate a confmappingoverride mode for all configurations, in which case the extending configurations will override the mappings of the configurations they extend from.
+
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|defaultconf|the default conf to use in this ivy file *__since 2.2__*|No, defaults to no default conf
+|defaultconfmapping|the default conf mapping to use in this ivy file *__since 1.3__*|No, defaults to no default conf mapping
+|confmappingoverride|true to activate configuration mapping override, false otherwise *__since 1.4__*|No, defaults to false
+|=======
+
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/conf.html[conf]|declares a configuration of this module|0..n
+|link:../ivyfile/include.html[include]|include configurations from another file|0..n
+|=======
+
+
+
+== Configuration mappings details
+
+When Ivy parses your Ivy file, it will create (internally) modify the configuration mapping of your dependencies.
+For instance, say you have:
+
+[source]
+----
+
+<configurations defaultconfmapping="conf1->other1;conf2->other2">
+   <conf name="conf1" />
+   <conf name="conf2" extends="conf1" />
+</configurations>
+<dependencies>
+   <dependency name="other-module" conf="conf1" />
+</dependencies>
+
+----
+
+When Ivy parses this file, it will construct the following dependency (in-memory only):
+
+[source]
+----
+<dependency name="other-module" conf="conf1->other1" />
+----
+
+So, if you now resolve the conf2 configuration, you will only get the other1 dependencies of your other-module.
+
+But when you set confmappingoverride to true, Ivy will construct the following dependency in memory:
+
+[source]
+----
+<dependency name="other-module" conf="conf1->other1;conf2->other2" />
+----
+
+As you can see, the defaultmappings of the extending configurations are also added (although you didn't explicitly defined them)
+
+When you now resolve the conf2 configuration, you'll get the other2 dependencies of your other-module. 
+
+
+== Examples involving defaultconf and defaultconfmapping
+
+The table below indicates how Ivy interprets the conf attribute according to how link:../ivyfile/configurations.html[defaultconfmapping] and link:../ivyfile/configurations.html[defaultconf] are set:
+[options="header",cols="15%,50%,18%,18%"]
+|=======
+|defaultconf|defaultconfmapping|conf|ivy interpretation
+||||
+[source]
+----
+*->*
+----
+
+
+|||runtime|
+[source]
+----
+runtime->runtime
+----
+
+
+|||test|
+[source]
+----
+test->test
+----
+
+
+|
+[source]
+----
+runtime
+----
+
+|||
+[source]
+----
+runtime->runtime
+----
+
+
+|
+[source]
+----
+runtime
+----
+
+|
+[source]
+----
+runtime->*;test->default
+----
+
+||runtime->*
+|
+[source]
+----
+runtime
+----
+
+|
+[source]
+----
+runtime->*;test->default
+----
+
+|test|test->default
+||
+[source]
+----
+runtime->*;test->default
+----
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+|runtime|
+[source]
+----
+runtime->*
+----
+
+
+||
+[source]
+----
+runtime->*;test->default
+----
+
+|test|
+[source]
+----
+test->default
+----
+
+
+|=======

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conflict.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflict.adoc b/asciidoc/ivyfile/conflict.adoc
new file mode 100644
index 0000000..13fa6e9
--- /dev/null
+++ b/asciidoc/ivyfile/conflict.adoc
@@ -0,0 +1,35 @@
+
+*Tag:* conflict *Parent:* link:../ivyfile/dependencies.html[dependencies]
+
+
+
+*__(since 2.0)__*
+
+Specify a a conflict manager for one or several dependencies.
+The way to specify a conflict manager is by giving indication to which dependencies the conflict manager applies (by giving organisation and module names or name regexp), and then specifying the conflict manager, either by giving its name or by specifying a fixed revision list, in which case a fixed conflicts manager is used.
+
+The list of built-in conflict managers available is listed on the link:../settings/conflict-managers.html[conflict manager configuration page].
+
+Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.
+
+There are two things optimized during conflict resolution: download of artifacts and download of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never be downloaded. The second is not as simple to handle because to know what are the conflicts ivy needs to know the dependency graph, and to know the dependency graph, it has to download ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.
+That's why the order of dependencies is important for download optimization. Indeed ivy traverses the dependency graph in the order in which dependencies are declared in the ivy files, and each time it encounters a dependency on a module, it first check if there is a conflict on this module, and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted, it does not download its ivy file, and the whole branch is not traversed, which can saves a lot of time.
+
+If no specific conflict manager is defined, a default conflict manager is used for all modules.
+ 
+The current default conflict manager is the "latest-revision" conflict manager.
+
+
+== Attributes
+
+
+[options="header",cols="15%,50%,35%"]
+|=======
+|Attribute|Description|Required
+|org|the name, or an expression matching the name of organisation to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|module|the name, or an expression matching the name of module to which this conflict manager should apply (see matcher attribute below)|No, defaults to * (match all)
+|manager|the name of the conflict manager to use|Exactly one of two
+|rev|a comma separated list of revisions this conflict manager should select
+|matcher|the link:../concept.html#matcher[matcher] to use to match the modules for which the conflict manager should be used|No, defaults to exact
+|=======
+

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/22bdffb9/asciidoc/ivyfile/conflicts.adoc
----------------------------------------------------------------------
diff --git a/asciidoc/ivyfile/conflicts.adoc b/asciidoc/ivyfile/conflicts.adoc
new file mode 100644
index 0000000..9c063df
--- /dev/null
+++ b/asciidoc/ivyfile/conflicts.adoc
@@ -0,0 +1,51 @@
+
+*Tag:* conflicts *Parent:* link:../ivyfile.html[ivy-module]
+
+
+
+*__(since 2.0)__* the conflicts section is deprecated.  Use the link:../ivyfile/conflict.html[conflict] instead.
+
+Container for conflict manager elements, used to indicate how conflicts should be resolved
+for this module. 
+
+
+
+The list of built-in conflict managers available is listed on the link:../settings/conflict-managers.html[conflict manager configuration page].
+
+
+
+Conflicts manager are used during the resolve operation, i.e. when ivy analyse the graph of dependencies
+and download corresponding ivy files and artifacts. The fact to manage conflict at resolve time
+enables to minimize downloads: when a module is evicted by a conflict manager, it is not downloaded.
+
+
+
+There are two things optimized during conflict resolution: download of artifacts and download
+of ivy files. The first is always ensured by ivy, i.e. artifacts of a module evicted will never
+be downloaded. The second is not as simple to handle because to know what are the conflicts
+ivy needs to know the dependency graph, and to know the dependency graph, it has to download
+ivy files. But ivy is highly optimized on this too, and it tries to evict modules as soon as possible.
+
+That's why the order of dependencies is important for download optimization. Indeed ivy
+traverses the dependency graph in the order in which dependencies are declared in the ivy files, 
+and each time it encounters a dependency on a module, it first check if there is a conflict on this module, 
+and if this is the case, it asks the conflict manager to resolve the conflict. Then if the module is evicted,
+it does not download its ivy file, and the whole branch is not traversed, which can saves
+a lot of time.
+
+
+
+If this container is not present, a default conflict manager is used for all modules. 
+The current default conflict manager is the "latest-revision" conflict manager.
+
+== Child elements
+
+
+[options="header"]
+|=======
+|Element|Description|Cardinality
+|link:../ivyfile/manager.html[manager]|declares a conflict manager for this module|1..n
+|=======
+
+
+	
\ No newline at end of file