cssoss team mailing list archive
-
cssoss team
-
Mailing list archive
-
Message #00091
[Merge] lp:~annegentle/openstackbook/pomupdates into lp:openstackbook
Anne Gentle has proposed merging lp:~annegentle/openstackbook/pomupdates into lp:openstackbook.
Requested reviews:
CSS OSS Team (cssoss)
For more details, see:
https://code.launchpad.net/~annegentle/openstackbook/pomupdates/+merge/105273
Minor updates for tool chain needs and automation:
- Updated pom file to the latest doc tool snapshot, removing epub output goal for now.
- Validated all XML files.
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~annegentle/openstackbook/pomupdates/+merge/105273
Your team CSS OSS Team is requested to review the proposed merge of lp:~annegentle/openstackbook/pomupdates into lp:openstackbook.
=== modified file 'Commands.xml'
--- Commands.xml 2011-10-19 14:27:25 +0000
+++ Commands.xml 2012-05-09 21:52:21 +0000
@@ -1,265 +1,143 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter xmlns:db="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xml:id="OpenStack_Commands-d1e2584" version="5.0" xml:base="Commands.xml">
<title>OpenStack Commands</title>
-<section xml:id="Nova_Manage_Commands-d1e2589">
-<title>Nova Manage Commands</title>
-<para>OpenStack provides commands for administrative tasks such as user/role management, network management etc. In all the examples we will use username as "novadmin" and project name as "proj". All the nova-manage commands will need to be run as "root". Either run them as root or run them under sudo.</para>
-<section xml:id="User_Role_Management-d1e2597">
-<title>User/Role Management</title>
-<para>Add a new user</para>
-<programlisting>
-nova-manage user create --name=novaadmin
-</programlisting>
-<para>Add a user along with access and secret keys.</para>
-<programlisting>
-nova-manage user create --name=novaadmin --access=myaccess --secret=mysecret
-</programlisting>
-<para>Add a user with admin privileges</para>
-<programlisting>
-nova-manage user admin --name=novaadmin --access=myaccess --secret=mysecret
-</programlisting>
-
-<para>List existing users</para>
-<programlisting>
-nova-manage user list
-</programlisting>
-
-<para>Delete an existing user</para>
-<programlisting>
-nova-manage user delete --name=novaadmin
-</programlisting>
-
-<para>Associate a user to a specific existing project</para>
-<programlisting>
-nova-manage project add --project=proj --user=novaadmin
-</programlisting>
-
-<para>Remove a user from a specific existing project.</para>
-<programlisting>
-nova-manage project remove --project=proj --user=novaadmin
-</programlisting>
-
-<para>View access key and secret keys of particular user.</para>
-<programlisting>
-nova-manage user exports --name=novaadmin
-</programlisting>
-
-<para>Adding a user sitewide role.</para>
-<programlisting>
-nova-manage role add --user=novaadmin --role=netadmin
-</programlisting>
-
-<para>Remove a sitewide role from a particular user</para>
-<programlisting>
-nova-manage role remove --user=novaadmin --role=netadmin
-</programlisting>
-<para>Adding a user project specific role.</para>
-<programlisting>
-nova-manage role add --user=novaadmin --role=netadmin --project=proj
-</programlisting>
-
-<para>Remove a project specific role from a particular user</para>
-<programlisting>
-nova-manage role remove --user=novaadmin --role=netadmin --project=proj
-</programlisting>
-
-<para>With the command below, you can change any or all of access key, secret key and admin role flag for a particular user.</para>
-<programlisting>
-Syntax:
-nova-manage user modify username new_access_key new_secret_key admin_flag <admin flag - T or F>
-
-nova-manage user modify --name=novaadmin --access=mygreatnewaccesskey "" ""
-
-nova-manage user modify --name=novaadmin "" --secret=mygreatsecretkey "" ""
-
-nova-manage user modify --name=novaadmin "" "" --is_admin=T
-</programlisting>
-
-<para>Check if a particular user has a specific role or not. The role can be either local or global. The output of the command will be True or False</para>
-<programlisting>
-nova-manage role has --user=novaadmin --role=cloudadmin
-True
-
-nova-manage role has --role=novaadmin --role=netadmin --project=proj
-False
-</programlisting>
-</section>
-
-<section xml:id="Project_Management-d1e2672">
-<title>Project Management</title>
-
-<para>The following commands help you create and manage projects. "nova-manage account" command is an alias to "nova-manage project" and you can use them interchangeably.</para>
-
-<para>Create a project. It requires you to mention name of the project admin as well. css1 is the name of the project and user5 is the name of the project admin here.</para>
-<programlisting>nova-manage project create --project=css1 --user=user5 --desc="My new project"</programlisting>
-
-<para>List the registered projects.</para>
-<programlisting>
-nova-manage project list
-</programlisting>
-
-<para>Download the credentials and associated file for a specific project. Please refer to the chapter on "Installation & Configuration" for more details.</para>
-<programlisting>
-nova-manage project zipfile --project=csscorp --user=user5 --file=/home/user5/mysec.zip
-</programlisting>
-
-<para>Delete an existing project.</para>
-<programlisting>
-nova-manage project delete --project=css1
-</programlisting>
-
-<para>Check the project wise resource allocation. The output will look like this:</para>
-<programlisting>
-nova-manage project quota --project=css1
- metadata_items: 128
- gigabytes: 1000
- floating_ips: 10
- instances: 10
- volumes: 10
- cores: 20
-</programlisting>
-</section>
-
-<section xml:id="Database_Management-d1e2713"><title>Database Management</title>
-
-<para>Nova stores the data related to the projects, users, resources etc. in a database, by default in a MySQL database.</para>
-
-<para>Print the current database version.</para>
-<programlisting>
-nova-manage db version
-</programlisting>
-
-<para>Sync the DB schema to be in sync with the current configuration.</para>
-<programlisting>
-nova-manage db sync
-</programlisting>
-</section>
-
-<section xml:id="Instance_Type_Management-d1e2734"><title>Instance Type Management</title>
-<para>Nova has the concept of instance types. Each instance type is defined with certain amount of RAM and certain size of the hard disk. When an instance is launched with a particular instance type, Nova resizes the disk image to suit the instance type and allocates the RAM as defined for the instance type chosen. Nova calls instance types as 'flavors' and lets you add to the list of flavors. By default Nova has 5 types - m1.tiny, m1.small, m1.medium, m1.large and m1.xlarge.</para>
-
-<para>List the current instance types</para>
-<programlisting>
-nova-manage flavor list
- m1.medium: Memory: 4096MB, VCPUS: 2, Storage: 40GB, FlavorID: 3, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
- m1.large: Memory: 8192MB, VCPUS: 4, Storage: 80GB, FlavorID: 4, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
- m1.tiny: Memory: 512MB, VCPUS: 1, Storage: 0GB, FlavorID: 1, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
- m1.xlarge: Memory: 16384MB, VCPUS: 8, Storage: 160GB, FlavorID: 5, Swap: 0GB, RXTX Quota: 0GB, RXTX Cap: 0MB
- m1.small: Memory: 2048MB, VCPUS: 1, Storage: 20GB, FlavorID: 2, Swap: 0GB,
-RXTX Quota: 0GB, RXTX Cap: 0MB
-</programlisting>
-
-<para>Define a new instance type</para>
-<programlisting>
-nova-manage flavor create --name=m1.miniscule --memory=128 --cpu=1 --local_gb=20 --flavor=6 --swap=0 --rxtx_quota=0 --rxtx_cap=0
-</programlisting>
-
-<para>Remove an existing instance type.</para>
-<programlisting>
-nova-manage flavor delete --name=m1.miniscule
-m1.miniscule deleted
-</programlisting>
-</section>
-
-<section xml:id="Service_Management-d1e2761"><title>Service Management</title>
-
-<para>Check state of available services.</para>
-<programlisting>
-nova-manage service list
- server1 nova-scheduler enabled :- ) 2011-04-06 17:01:21
- server1 nova-network enabled :- ) 2011-04-06 17:01:30
- server1 nova-compute enabled :- ) 2011-04-06 17:01:22
- server2 nova-compute enabled :- ) 2011-04-06 17:01:28
-</programlisting>
-
-<para>Disable a running service</para>
-<programlisting>
-nova-manage service disable <hostname> <service>
-nova-manage service disable --host=server2 --service=nova-compute
-
-nova-manage service list
- server1 nova-network enabled :- ) 2011-04-06 17:05:11
- server1 nova-compute enabled :- ) 2011-04-06 17:05:13
- server1 nova-scheduler enabled :- ) 2011-04-06 17:05:17
- server2 nova-compute disabled :- ) 2011-04-06 17:05:19
-</programlisting>
-
-<para>Re-enable a service that is currently disabled</para>
-<programlisting>
-Syntax: nova-manage service enable <hostname> <service>
-nova-manage service enable --host=server2 --service=nova-compute
-
-nova-manage service list
- server1 nova-scheduler enabled :- ) 2011-04-06 17:08:23
- server1 nova-network enabled :- ) 2011-04-06 17:08:22
- server1 nova-compute enabled :- ) 2011-04-06 17:08:23
- server2 nova-compute enabled :- ) 2011-04-06 17:08:19
-</programlisting>
-
-<para>Get Information about resource utilization of the OpenStack components</para>
-<programlisting>
-Syntax: nova-manage service describe_resource <hostname>
-
-nova-manage service describe_resource --host=server1
-HOST PROJECT cpu mem(mb) disk(gb)
-server1(total) 2 3961 224
-server1(used) 1 654 30
-server1 proj 2 1024 0
-</programlisting>
-</section>
-
-<section xml:id="Euca2ools_Commands-d1e2791"><title>Euca2ools Commands</title>
-
-<para>euca2ools provide a set of commands to communicate with the cloud. All these commands require you to authenticate and this is done by sourcing novarc file as detailed in the chapter on "Installation & Configuration"</para>
-
-<para>Most of the euca2ools command line utilities work with OpenStack, just as they work with EC2 of AWS. There may be some differences due to some of the functionality that is yet to be implemented in OpenStack. Help is available for each of these commands with the switch --help.</para>
-
-<itemizedlist>
- <listitem><para>euca-add-group</para></listitem>
- <listitem><para>euca-delete-bundle</para></listitem>
- <listitem><para>euca-describe-instances</para></listitem>
- <listitem><para>euca-register</para></listitem>
- <listitem><para>euca-add-keypair</para></listitem>
- <listitem><para>euca-delete-group</para></listitem>
- <listitem><para>euca-describe-keypairs</para></listitem>
- <listitem><para>euca-release-address</para></listitem>
- <listitem><para>euca-allocate-address</para></listitem>
- <listitem><para>euca-delete-keypair</para></listitem>
- <listitem><para>euca-describe-regions</para></listitem>
- <listitem><para>euca-reset-image-attribute</para></listitem>
- <listitem><para>euca-associate-address</para></listitem>
- <listitem><para>euca-delete-snapshot</para></listitem>
- <listitem><para>euca-describe-snapshots</para></listitem>
- <listitem><para>euca-revoke</para></listitem>
- <listitem><para>euca-attach-volume</para></listitem>
- <listitem><para>euca-delete-volume</para></listitem>
- <listitem><para>euca-describe-volumes</para></listitem>
- <listitem><para>euca-run-instances</para></listitem>
- <listitem><para>euca-authorize</para></listitem>
- <listitem><para>euca-deregister</para></listitem>
- <listitem><para>euca-detach-volume</para></listitem>
- <listitem><para>euca-terminate-instances</para></listitem>
- <listitem><para>euca-bundle-image</para></listitem>
- <listitem><para>euca-describe-addresses</para></listitem>
- <listitem><para>euca-disassociate-address</para></listitem>
- <listitem><para>euca-unbundle</para></listitem>
- <listitem><para>euca-bundle-vol</para></listitem>
- <listitem><para>euca-describe-availabity-zones</para></listitem>
- <listitem><para>euca-download-bundle</para></listitem>
- <listitem><para>euca-upload-bundle</para></listitem>
- <listitem><para>euca-confirm-product-instance</para></listitem>
- <listitem><para>euca-describe-groups</para></listitem>
- <listitem><para>euca-get-console-output</para></listitem>
- <listitem><para>euca-version</para></listitem>
- <listitem><para>euca-create-snapshot</para></listitem>
- <listitem><para>euca-describe-image-attribute</para></listitem>
- <listitem><para>euca-modify-image-attribute</para></listitem>
- <listitem><para>euca-create-volume</para></listitem>
- <listitem><para>euca-describe-images</para></listitem>
- <listitem><para>euca-reboot-instances</para></listitem>
-</itemizedlist>
-</section>
-</section>
+
+<section xml:id="Nova_Commands-d1e2589">
+<title>Nova Commands</title>
+<para>nova is the command line interface for OpenStack Compute API.</para>
+<programlisting>
+Usage: nova command [options] [args]
+
+Commands:
+ help Display help about this program or one of its subcommands.
+ actions Retrieve server actions.
+ backup-schedule Show or edit the backup schedule for a server.
+ backup-schedule-delete Delete the backup schedule for a server.
+ boot Boot a new server.
+ delete Immediately shut down and delete a server.
+ diagnostics Retrieve server diagnostics.
+ flavor-list Print a list of available 'flavors' (sizes of servers).
+ image-create Create a new image by taking a snapshot of a running server.
+ image-delete Delete an image.
+ image-list Print a list of available images to boot from.
+ ip-share Share an IP address from the given IP group onto a server.
+ ip-unshare Stop sharing an given address with a server.
+ ipgroup-create Create a new IP group.
+ ipgroup-delete Delete an IP group.
+ ipgroup-list Show IP groups.
+ ipgroup-show Show details about a particular IP group.
+ list List active servers.
+ pause Pause a server.
+ reboot Reboot a server.
+ rebuild Shutdown, re-image, and re-boot a server.
+ rename Rename a server.
+ rescue Rescue a server.
+ resize Resize a server.
+ resize-confirm Confirm a previous resize.
+ resize-revert Revert a previous resize (and return to the previous VM).
+ resume Resume a server.
+ root-password Change the root password for a server.
+ show Show details about the given server.
+ suspend Suspend a server.
+ unpause Unpause a server.
+ unrescue Unrescue a server.
+ zone Show or edit a child zone.
+ zone-add Add a new child zone.
+ zone-delete Delete a zone.
+ zone-info Get this zones name and capabilities.
+ zone-list List the children of a zone.
+</programlisting>
+</section>
+
+<section xml:id="Glance_Commands-d1e2672">
+<title>Glance Commands</title>
+<para>Glance is the command line interface for the OpenStack Imaging service.</para>
+<programlisting>
+Usage: glance command [options] [args]
+
+Commands:
+ help command Output help for one of the commands below
+ add Adds a new image to Glance
+ update Updates an image's metadata in Glance
+ delete Deletes an image from Glance
+ index Return brief information about images in Glance
+ details Return detailed information about images in
+ Glance
+ show Show detailed information about an image in
+ Glance
+ clear Removes all images and metadata from Glance
+
+Member Commands:
+ image-members List members an image is shared with
+ member-images List images shared with a member
+ member-add Grants a member access to an image
+ member-delete Revokes a member's access to an image
+ members-replace Replaces all membership for an image
+</programlisting>
+</section>
+
+<section xml:id="Swift_Commands-d1e2713">
+<title>Swift Commands</title>
+<para>Swift is the command line interface for OpenStack Object Store service.</para>
+<programlisting>
+Usage: swift command [options] [args]
+
+Commands:
+ stat Displays information for the account, container, or object depending
+ on the args given (if any).
+ list Lists the containers for the account or the objects for a container.
+ upload Uploads to the given container the files and directories specified by
+ the remaining args.
+ post Updates meta information for the account, container, or object
+ depending on the args given.
+ download Downloads everything in the account (with --all), or everything in
+ a container, or a list of objects depending on the args given.
+ delete Deletes everything in the account (with --all), or everything in
+ a container, or a list of objects depending on the args given.
+</programlisting>
+</section>
+
+<section xml:id="Keystone_Commands-d1e2734">
+<title>Keystone Commands</title>
+<para>Keystone is the command line interface to the OpenStack Identity service.</para>
+<programlisting>
+Usage: keystone command [options] [args]
+
+Commands:
+ catalog List service catalog, possibly filtered by service.
+ ec2-credentials-create Create EC2-compatibile credentials for user per tenant
+ ec2-credentials-delete Delete EC2-compatibile credentials
+ ec2-credentials-get Display EC2-compatibile credentials
+ ec2-credentials-list List EC2-compatibile credentials for a user
+ endpoint-create Create a new endpoint associated with a service
+ endpoint-delete Delete a service endpoint
+ endpoint-get Find endpoint filtered by a specific attribute or service type
+ endpoint-list List configured service endpoints
+ role-create Create new role
+ role-delete Delete role
+ role-get Display role details
+ role-list List all roles, or only those granted to a user.
+ service-create Add service to Service Catalog
+ service-delete Delete service from Service Catalog
+ service-get Display service from Service Catalog
+ service-list List all services in Service Catalog
+ tenant-create Create new tenant
+ tenant-delete Delete tenant
+ tenant-get Display tenant details
+ tenant-list List all tenants
+ tenant-update Update tenant name, description, enabled status
+ token-get Display the current user token
+ user-create Create new user
+ user-delete Delete user
+ user-get Display user details.
+ user-list List users
+ user-password-update Update user password
+ user-role-add Add role to user
+ user-role-remove Remove role from user
+ user-update Update user's name, email, and enabled status
+ discover Discover Keystone servers and show authentication protocols and
+ help Display help about this program or one of its subcommands.
+</programlisting>
+</section>
+
</chapter>
\ No newline at end of file
=== added file 'Dashboard.xml'
--- Dashboard.xml 1970-01-01 00:00:00 +0000
+++ Dashboard.xml 2012-05-09 21:52:21 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xml:id="Storage_Management-d1e1995" version="5.0" xml:base="Dashboard.xml">
+<title>OpenStack Dashboard (Horizon)</title>
+<para>Using the OpenStack Dashboard, one can manage various OpenStack services. It may be used to manage instances and images, create keypairs, attach volumes to instances, manipulate Swift containers etc. The OpenStack Dashboard is accessible via http://<ip_address></para>
+
+<section xml:id="Login-d1e5000">
+<title>Login</title>
+<para>Login to the dashboard with username "admin" and password "admin".</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/login.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/login.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+
+<section xml:id="User_Overview-d1e5002">
+<title>User Overview</title>
+<para>After logging, depending on the access privileges, the user is allowed access to specific projects. The below is an overview page for a project belonging to the 'admin' user. One can view and download some basic usage metric reports here.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/overview.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/overview.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<section xml:id="Instances-d1e5003">
+<title>Instances</title>
+<para>The page lists currently running instances belonging to the user 'admin'. From this page, one can terminate, pause, reboot any running instances, connect to vnc console of the instance etc.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/instances.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/instances.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Services-d1e5004">
+<title>Services</title>
+<para>The list of services defiend can be viewed on this page.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/services.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/services.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Flavors-d1e5005">
+<title>Flavors</title>
+<para>This page lists the currently available flavors that can be used to launch an instance. One can also create custom flavors on this page.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/flavors.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/flavors.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Images-d1e5006">
+<title>Images</title>
+<para>This page lists the available images for the 'admin' user. One can also delete any images, if they are not required.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/images.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/images.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Projects-d1e5007">
+<title>Projects</title>
+<para>This page lists the available projects (tenants) that have been created. One can also create new projects, assign users to the projects etc.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/projects.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/projects.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Users-d1e5008">
+<title>Users</title>
+<para>This page lists the users that have been created. One can also create new users, disable/delete existing users.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/users.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/users.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Quotas-d1e5008">
+<title>Users</title>
+<para>This page lists the quota of resources allocated to a user; number of CPUs, amount of RAM, diskspace, max. number of instances that can be raised etc.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/quotas.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/quotas.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+</section>
+
+<section xml:id="Project_Overview-d1e5009">
+<title>Project Overview</title>
+<para>This page shows an overview of the project 'admin'. One can view and download some basic usage metric reports here.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/overview2.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/overview2.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<section xml:id="Instances_Volumes-d1e5009">
+<title>Instances & Volumes</title>
+<para>This page lists all the instances belonging to various users of the project, instance properties etc. It also list all the volumes that have been created and their status; whether available or attached to any running instances. One can also create new volumes and attach them to the instances on this page.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/instances_volumes.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/instances_volumes.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Instances_VNC-d1e5016">
+<title>Instances - VNC Console</title>
+<para>For a running instance, one can connect to the instance console via VNC.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/vnc1.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/vnc1.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/vnc2.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/vnc2.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Images_Snapshots-d1e5009">
+<title>Images & Snapshots</title>
+<para>This page lists the custom images that have been uploaded. One can edit the image properties, delete and launch new instances of the images. This page also lists the snapshots taken from instances and volumes.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/images_snapshots.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/images_snapshots.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+<section xml:id="Access_Security-d1e5010">
+<title>Access & Security</title>
+<para>On this page, one can allocate and release floating ip addresses, associate and dissociate them to instances. New security groups can be created and one can modify the rules belonging to each security group.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/access_security.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/access_security.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/edit_security_securitygp.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/edit_security_securitygp.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/create_keypair.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/create_keypair.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+</section>
+<section xml:id="Containers_Objects-d1e5011">
+<title>Containers & Objects</title>
+<para>On this page, one can create/delete containers, lists objects, upload/download objects and delete objects.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/containers.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/containers.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/dashboard/objects.png"
+ format="PNG" scale="50"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/dashboard/objects.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+</section>
+</chapter>
=== modified file 'Image.xml'
--- Image.xml 2011-10-19 14:27:25 +0000
+++ Image.xml 2012-05-09 21:52:21 +0000
@@ -1,55 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xml:id="Image_Management-d1e1252" version="5.0" xml:base="Image.xml">
- <title>Image Management</title>
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter xmlns:db="http://docbook.org/ns/docbook";
+ xmlns="http://docbook.org/ns/docbook";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xml:id="Image_Management-d1e1252" version="5.0"
+ xml:base="Image.xml">
+<title>Image Management</title>
<section xml:id="Introduction-d1e1257">
<title>Introduction</title>
-<para> There are several pre-built images for OpenStack available from various sources. You can download such images and use them to get familiar with OpenStack. You can refer to http://docs.openstack.org/cactus/openstack-compute/admin/content/starting-images.html for details on using such images.</para>
-<para>For any production deployment, you may like to have the ability to bundle custom images, with a custom set of applications or configuration. This chapter will guide you through the process of creating Linux images of Debian and RedHat based distributions from scratch. We have also covered an approach to bundling Windows images.
- </para>
- <para>There are some minor differences in the way you would bundle a Linux image, based on the distribution. Ubuntu makes it very easy by providing cloud-init package, which can be used to take care of the instance configuration at the time of launch. cloud-init handles importing ssh keys for password-less login, setting host name etc. The instance acquires the instance specific configuration from Nova-compute by connecting to a meta data interface running on 169.254.169.254.</para>
- <para>While creating the image of a distro that does not have cloud-init or an equivalent package, you may need to take care of importing the keys etc. by running a set of commands at boot time from rc.local.</para>
- <para>The process used for Ubuntu and Fedora is largely the same with a few minor differences, which are explained below.</para>
- <para>In both cases, the documentation below assumes that you have a working KVM installation to use for creating the images. We are using the machine called 'client1' as explained in the chapter on "Installation and Configuration" for this purpose.</para>
- <para>The approach explained below will give you disk images that represent a disk without any partitions. Nova-compute can resize such disks ( including resizing the file system) based on the instance type chosen at the time of launching the instance. These images cannot have 'bootable' flag and hence it is mandatory to have associated kernel and ramdisk images. These kernel and ramdisk images need to be used by nova-compute at the time of launching the instance.</para>
- <para>However, we have also added a small section towards the end of the chapter about creating bootable images with multiple partitions that can be used by nova to launch an instance without the need for kernel and ramdisk images. The caveat is that while nova-compute can re-size such disks at the time of launching the instance, the file system size is not altered and hence, for all practical purposes, such disks are not re-sizable.</para></section>
-<section xml:id="Creating_a_Linux_Image_-_Ubuntu_Fedora-d1e1287">
-<title>Creating a Linux Image - Ubuntu & Fedora</title>
-<para>The first step would be to create a raw image on Client1. This will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
-
+<para> There are several pre-built images for OpenStack available from various sources. You can download such images and use them to get familiar with OpenStack.</para>
+<para>For any production deployment, you may like to have the ability to bundle custom images, with a custom set of applications or configuration. This chapter will guide you through the process of creating Linux images of popular distributions from scratch. We have also covered an approach to bundling Windows images.</para>
+<para>There are some minor differences in the way you would bundle a Linux image, based on the distribution. Ubuntu makes it very easy by providing cloud-init package, which can be used to take care of the instance configuration at the time of launch. cloud-init handles importing ssh keys for password-less login, setting host name etc. The instance acquires the instance specific configuration from Nova-compute by connecting to a meta data interface running on 169.254.169.254.</para>
+<para>While creating the image of a distro that does not have cloud-init or an equivalent package, you may need to take care of importing the keys etc. by running a set of commands at boot time from rc.local.</para>
+<para>The process used for creating the Linux images of different distributions is largely the same with a few minor differences, which is explained below.</para>
+<para>In all the cases, the documentation below assumes that you have a working KVM installation to use for creating the images. We are using the machine called 'client1' as explained in the chapter on "Installation and Configuration" for this purpose.</para>
+<para>The approach explained below will generate disk images that represent a disk without any partitions.</para>
+</section>
+<section xml:id="Creating_a_Linux_Image-d1e1287">
+<title>Creating a Linux Image</title>
+<para>The first step would be to create an image on Client1. This will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
<programlisting>
-kvm-img create -f raw server.img 5G
+kvm-img create -f qcow2 server.img 5G
</programlisting>
-
<section xml:id="OS_Installation-d1e1298">
<title>OS Installation</title>
-
-<para>Download the iso file of the Linux distribution you want installed in the image. The instructions below are tested on Ubuntu 11.10 Oneiric Ocelot 64-bit server and Fedora 14 64-bit. Most of the instructions refer to Ubuntu. The points of difference between Ubuntu and Fedora are mentioned wherever required.</para>
-<programlisting>
-wget http://releases.ubuntu.com/oneiric/ubuntu-11.10-server-amd64.iso
- </programlisting>
-
+ <para>Download the iso file of the Linux distribution you want to install in the image. For Ubuntu, you can download the iso from <link xlink:href="http://releases.ubuntu.com";>http://releases.ubuntu.com</link> using 'wget' or with the help of a browser</para>
<para>Boot a KVM instance with the OS installer ISO in the virtual CD-ROM. This will start the installation process. The command below also sets up a VNC display at port 0</para>
<programlisting>
-sudo kvm -m 256 -cdrom ubuntu-11.10-server-amd64.iso -drive file=server.img,if=scsi,index=0 -boot d -net nic -net user -nographic -vnc :0
+sudo kvm -m 256 -cdrom ubuntu-12.04-server-amd64.iso -drive file=server.img,if=virtio,index=0 -boot d -net nic -net user -nographic -vnc :0
</programlisting>
-
<para>Connect to the VM through VNC (use display number :0) and finish the installation.</para>
<para>For Example, where 10.10.10.4 is the IP address of client1:</para>
-
<programlisting>
vncviewer 10.10.10.4 :0
</programlisting>
-<para>During the installation of Ubuntu, create a single ext4 partition mounted on '/'. Do not create a swap partition.</para>
-<para>In the case of Fedora 14, the installation will not progress unless you create a swap partition. Please go ahead and create a swap partition.</para>
+<para>During creation of Linux images , create a single ext4 partition mounted on a swap partition.</para>
<para>After finishing the installation, relaunch the VM by executing the following command.</para>
-
<programlisting>
-sudo kvm -m 256 -drive file=server.img,if=scsi,index=0,boot=on -boot c -net nic -net user -nographic -vnc :0
+sudo kvm -m 256 -drive file=server.img,if=virtio,index=0 -boot c -net nic -net user -nographic -vnc :0
</programlisting>
-
-
<para>At this point, you can add all the packages you want to have installed, update the installation, add users and make any configuration changes you want in your image.</para>
-<para>At the minimum, for Ubuntu you may run the following commands</para>
+<section xml:id="Ubuntu-d1e1386">
+<title>Ubuntu</title>
<programlisting>
sudo apt-get update
</programlisting>
@@ -58,8 +51,14 @@
</programlisting>
<programlisting>
sudo apt-get install openssh-server cloud-init
-</programlisting>
-<para>For Fedora run the following commands as root</para>
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>
+sudo rm -rf /etc/udev/rules.d/70-persistent-net.rules
+</programlisting>
+</section>
+<section xml:id="Fedora-d1e1585">
+<title>Fedora</title>
<programlisting>
yum update
</programlisting>
@@ -68,105 +67,21 @@
</programlisting>
<programlisting>
chkconfig sshd on
-</programlisting>
-
-<section xml:id="Tweaking_etc_fstab-d1e1463">
-<title>Tweaking /etc/fstab</title>
-<para>You will need to tweak /etc/fstab to make it suitable for a cloud instance. Nova-compute may resize the disk at the time of launching instances based on the instance type chosen. This can make the UUID of the disk invalid. Hence we have to use file system label as the identifier for the partition instead of the UUID. Edit /etc/fstab and change the following line from</para>
-<programlisting>
-UUID=e7f5af8d-5d96-45cc-a0fc-d0d1bde8f31c / ext4 errors=remount-ro 0 1
-</programlisting>
-<para>to</para>
-<programlisting>
-LABEL=uec-rootfs / ext4 defaults 0 0
-</programlisting>
-</section>
-<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
-
+</programlisting>
+<para>Edit the file /etc/sysconfig/network-scripts/ifcfg-eth0 to look like this</para>
+<programlisting>
+DEVICE="eth0"
+BOOTPROTO=dhcp
+NM_CONTROLLED="yes"
+ONBOOT="yes"
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
<programlisting>
sudo rm -rf /etc/udev/rules.d/70-persistent-net.rules
</programlisting>
-<para>Shutdown the virtual machine and proceed with the next steps.</para>
-</section>
-<section xml:id="Extracting_the_EXT4_partition-d1e1377">
-<title>Extracting the EXT4 partition</title>
-<para>The image that needs to be uploaded to OpenStack needs to be an ext4 filesystem image. Here are the steps to create a ext4 filesystem image from the raw image i.e server.img</para>
-<programlisting>
-sudo losetup -f server.img
-</programlisting>
-<programlisting>
-sudo losetup -a
-</programlisting>
-<para>You should see an output like this:</para>
-
-<programlisting>
-/dev/loop0: [0801]:16908388 ($filepath)
-</programlisting>
-
-<para>Observe the name of the loop device ( /dev/loop0 in our setup) when $filepath is the path to the mounted .raw file.</para>
-
- <para>Now we need to find out the starting sector of the partition. Run:</para>
-
-<programlisting>
-sudo fdisk -cul /dev/loop0
-</programlisting>
-<para>You should see an output like this:</para>
-<programlisting>
-Disk /dev/loop0: 5368 MB, 5368709120 bytes
-</programlisting>
-
-<programlisting>
-149 heads, 8 sectors/track, 8796 cylinders, total 10485760 sectors
-Units = sectors of 1 * 512 = 512 bytes
-Sector size (logical/physical): 512 bytes / 512 bytes
-I/O size (minimum/optimal): 512 bytes / 512 bytes
-Disk identifier: 0x00072bd4
-Device Boot Start End Blocks Id System
-/dev/loop0p1 * 2048 10483711 5240832 83 Linux
-</programlisting>
-
-
-<para>Make a note of the starting sector of the /dev/loop0p1 partition i.e the partition whose ID is 83. This number should be multiplied by 512 to obtain the correct value. In this case: 2048 x 512 = 1048576</para>
-<para>Unmount the loop0 device:</para>
-
-<programlisting>
-sudo losetup -d /dev/loop0
-</programlisting>
-
-<para>Now mount only the partition(/dev/loop0p1) of server.img which we had previously noted down, by adding the -o parameter with value previously calculated value</para>
-
-<programlisting>
-sudo losetup -f -o 1048576 server.img
-</programlisting>
-
-<programlisting>
-sudo losetup -a
-</programlisting>
-<para>You'll see a message like this:</para>
-<programlisting>
-/dev/loop0: [0801]:16908388 ($filepath) offset 1048576
-</programlisting>
-<para>Make a note of the mount point of our device(/dev/loop0 in our setup) when $filepath is the path to the mounted .raw file.</para>
-
-<para>Copy the entire partition to a new .raw file</para>
-<programlisting>
-sudo dd if=/dev/loop0 of=serverfinal.img
-</programlisting>
-
-<para>Now we have our ext4 filesystem image i.e serverfinal.img</para>
-
-<para>Unmount the loop0 device</para>
-
-<programlisting>
-sudo losetup -d /dev/loop0
-</programlisting>
-</section>
-<section xml:id="Fetching_Metadata_in_Fedora-d1e1488">
-<title>Fetching Metadata in Fedora</title>
-
+<para>Shutdown the virtual machine.</para>
<para>Since, Fedora does not ship with cloud-init or an equivalent, you will need to take a few steps to have the instance fetch the meta data like ssh keys etc.</para>
- <para>Edit the /etc/rc.local file and add the following lines before the line "touch /var/lock/subsys/local"</para>
-
+<para>Edit the /etc/rc.local file and add the following lines before the line "touch /var/lock/subsys/local"</para>
<programlisting>
depmod -a
modprobe acpiphp
@@ -180,88 +95,99 @@
echo "************************"
</programlisting>
</section>
-<para>Unmount the Loop partition</para>
-
-<programlisting>
-sudo umount /mnt
-</programlisting>
-<para>Change the filesystem label of serverfinal.img to 'uec-rootfs'</para>
-<programlisting>
-sudo tune2fs -L uec-rootfs serverfinal.img
-</programlisting>
-
-<para>Now, we have all the components of the image ready to be uploaded to OpenStack imaging server.</para>
-</section>
-<section xml:id="Uploading_to_OpenStack-d1e1534">
-<title>Uploading to OpenStack</title>
-<para>The last step would be to upload the images to OpenStack Imaging Server glance. The files that need to be uploaded for the above sample setup of Ubuntu are: vmlinuz-2.6.38-7-server, initrd.img-2.6.38-7-server, serverfinal.img</para>
-<para>Run the following command</para>
-
-<programlisting>
-uec-publish-image amd64 serverfinal.img bucket1
-</programlisting>
-
-<para>For Fedora, the process will be similar. Make sure that you use the right kernel and initrd files extracted above.</para>
-<para>uec-publish-image, like several other commands from euca2ools, returns the prompt back immediately. However, the upload process takes some time and the images will be usable only after the process is complete. You can keep checking the status using the command 'euca-describe-images' as mentioned below.</para>
-
-<para>You can upload bootable disk images without associating kernel and ramdisk images. When you do not want the flexibility of using the same disk image with different kernel/ramdisk images, you can go for bootable disk images. This greatly simplifies the process of bundling and uploading the images. However, the caveats mentioned in the introduction to this chapter apply. Please note that the instructions below use server.img and you can skip all the cumbersome steps related to extracting the single ext4 partition.</para>
-
-<programlisting>
-euca-bundle-image -i server.img
-</programlisting>
-<programlisting>
-euca-upload-bundle -b mybucket -m /tmp/server.img.manifest.xml
-</programlisting>
-<programlisting>
-euca-register mybucket/server.img.manifest.xml
-</programlisting>
-</section>
-<section xml:id="Image_Listing-d1e1568">
-<title>Image Listing</title>
-
-<para>The status of the images that have been uploaded can be viewed by using euca-describe-images command. The output should like this:</para>
-
-<programlisting>
-localadmin@client1:~$ euca-describe-images
-</programlisting>
-<programlisting>
-IMAGE ami-00000003 mybucket9/Fedora14Nova.img.manifest.xml available private x86_64 machine instance-store
-</programlisting>
-</section>
+<section xml:id="OpenSUSE-de1590">
+<title>OpenSUSE</title>
+<para>Select ssh server, curl and other packages needed.</para>
+<para>Install ssh server.</para>
+<programlisting>zypper install openssh</programlisting>
+<para>Install curl.</para>
+<programlisting>zypper install curl</programlisting>
+<para>For ssh key injection into the instance use the following steps:</para>
+<para>Create a file /etc/init.d/sshkey and add the following lines</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Change the permissions for the file.</para>
+<programlisting>chmod 755 /etc/init.d/sshkey</programlisting>
+<para>Configure the service to start automatically while booting.</para>
+<programlisting>chkconfig sshkey on</programlisting>
+<para>Configure the firewall (not iptables) using the following command and allow ssh service</para>
+<programlisting>yast2</programlisting>
+<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+<section xml:id="Debian-de1591">
+<title>Debian</title>
+<para>Select SSH server, Curl and other packages needed.</para>
+<para>Do the necessary changes needed for the image. For key injection add the following lines in the file /etc/rc.local.</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Also remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+<section xml:id="CentOS-de1592">
+<title>CentOS 6 and RHEL 6</title>
+<para>Select SSH server, Curl and other packages needed.</para>
+<para>Do the necessary changes needed for the image. For key injection add the following lines in the file /etc/rc.local.</para>
+<programlisting>
+echo >> /root/.ssh/authorized_keys
+curl -m 10 -s http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key | grep 'ssh-rsa' >> /root/.ssh/authorized_keys
+echo "AUTHORIZED_KEYS:"
+echo "************************"
+cat /root/.ssh/authorized_keys
+echo "************************"
+</programlisting>
+<para>Edit the file /etc/sysconfig/network-scripts/ifcfg-eth0 to look like this</para>
+<programlisting>
+DEVICE="eth0"
+BOOTPROTO=dhcp
+NM_CONTROLLED="yes"
+ONBOOT="yes"
+</programlisting>
+<para>Remove the network persistence rules from /etc/udev/rules.d as their presence will result in the network interface in the instance coming up as an interface other than eth0.</para>
+<programlisting>rm -rf /etc/udev/rules.d/70-persistent-net.rules</programlisting>
+</section>
+</section>
+<section xml:id="Uploading_the_Linux_Image-de1593">
+<title>Uploading the Linux image</title>
+<para>Upload the image</para>
+<programlisting>glance add name="<Image name>" is_public=true container_format=ovf disk_format=qcow2 < <filename>.img</programlisting>
+</section>
+</section>
+
<section xml:id="Creating_a_Windows_Image-d1e1594">
<title>Creating a Windows Image</title>
-<para>The first step would be to create a raw image on Client1, this will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
-
-<programlisting>
-kvm-img create -f raw windowsserver.img 20G
-</programlisting>
-
-<para>OpenStack presents the disk using aVIRTIO interface while launching the instance. Hence the OS needs to have drivers for VIRTIO. By default, the Windows Server 2008 ISO does not have the drivers for VIRTIO. Download the virtual floppy drive containing VIRTIO drivers from the following location</para>
- <para>
- http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin/
- </para>
- <para>and attach it during the installation</para>
- <para>Start the installation by running</para>
-
-<programlisting>
-sudo kvm -m 1024 -cdrom win2k8_dvd.iso -drive file=windowsserver.img,if=virtio,boot=on -fda virtio-win-1.1.16.vfd -boot d -nographic -vnc :0
-</programlisting>
-
-<para>When the installation prompts you to choose a hard disk device you won't see any devices available. Click on "Load drivers" at the bottom left and load the drivers from A:\i386\Win2008</para>
- <para>After the Installation is over, boot into it once and install any additional applications you need to install and make any configuration changes you need to make. Also ensure that RDP is enabled as that would be the only way you can connect to a running instance of Windows. Windows firewall needs to be configured to allow incoming ICMP and RDP connections.</para>
- <para>For OpenStack to allow incoming RDP Connections, use euca-authorize command to open up port 3389 as described in the chapter on "Security".</para>
+<para>The first step would be to create an image on Client1, this will represent the main HDD of the virtual machine, so make sure to give it as much space as you will need.</para>
+<programlisting>
+kvm-img create -f qcow2 windowsserver.img 20G
+</programlisting>
+<section xml:id="OS_Installation-d1e1596">
+<title>OS Installation</title>
+ <para>OpenStack presents the disk using a virtio interface while launching the instance. Hence the OS needs to have drivers for virtio. By default, the Windows Server 2008 ISO does not have the drivers for virtio. Download the iso image containing virtio drivers from the following location <link xlink:href="http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin";>http://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin</link> and attach it during the installation</para>
+<para>Start the installation by executing:</para>
+<programlisting>
+sudo kvm -m 1024 -cdrom windows2008.iso -drive file=windowsserver1.img,if=virtio -boot d -drive file=virtio-win-0.1-22.iso,index=3,media=cdrom -device virtio-net-pci -net nic -net user -nographic -vnc :5
+</programlisting>
+<para>When the installation prompts you to choose a hard disk device you won't see any devices available. Click on "Load drivers" at the bottom left and load the drivers by browsing the secondary CDROM in which the virtio driver disk is loaded</para>
+<para>After the installation is over, boot into it once and install any additional applications you need to install and make any configuration changes you need to make. Also ensure that RDP is enabled as that would be the only way you can connect to a running instance of Windows. Windows firewall needs to be configured to allow incoming ICMP and RDP connections.</para>
+<section xml:id="Uploading_the_Windows_Image-de1599">
+<title>Uploading the Windows image</title>
<para>Shut-down the VM and upload the image to OpenStack</para>
-
-<programlisting>
-euca-bundle-image -i windowsserver.img
-</programlisting>
-
-<programlisting>
-euca-upload-bundle -b mybucket -m /tmp/windowsserver.img.manifest.xml
-</programlisting>
-
-<programlisting>
-euca-register mybucket/windowsserver.img.manifest.xml
+<programlisting>
+glance add name="windows" is_public=true container_format=ovf disk_format=qcow2 < windowsserver.img
</programlisting>
</section>
-</chapter>
\ No newline at end of file
+</section>
+</section>
+</chapter>
=== modified file 'Installation.xml'
--- Installation.xml 2011-10-19 14:27:25 +0000
+++ Installation.xml 2012-05-09 21:52:21 +0000
@@ -2,95 +2,94 @@
<title>Installation and Configuration</title>
<section xml:id="Introduction-d1e390">
<title>Introduction</title>
-<para>The following section describes how to set up a minimal cloud infrastructure based on OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as Server1 and Server2 and Client1. Server1 runs all the components of Nova as well as Glance and Swift. Server2 runs only nova-compute. Since OpenStack components follow a shared-nothing policy, each component or any group of components can be installed on any server.</para>
-<para>Client1 is not a required component. In our sample setup, it is used for bundling images, as a client to the web interface, and to run euca commands to manage the infrastructure. Having this client ensures that you do not need to meddle with the servers for tasks such as bundling. Also, bundling of Desktop Systems including Windows will require a GUI and it is better to have a dedicated machine for this purpose. We would recommend this machine to be VT-Enabled so that KVM can be run which allows for Windows VMs during image creation for bundling.</para>
+<para>The following section describes how to set up a minimal cloud infrastructure based on OpenStack using 3 machines. These machines are referred to in this and subsequent chapters as Server1, Server2 and Client1. Server1 runs all the components of Nova, Glance, Swift, Keystone and Horizon (OpenStack Dashboard). Server2 runs only nova-compute. Since OpenStack components follow a shared-nothing policy, each component or any group of components can be installed on any server.</para>
+<para>Client1 is not a required component. In our sample setup, it is used for bundling images, as a client to the web interface and to run OpenStack commands to manage the infrastructure. Having this client ensures that you do not need to meddle with the servers for tasks such as bundling. Also, bundling of desktop Systems including Windows will require a GUI and it is better to have a dedicated machine for this purpose. We would recommend this machine to be VT-Enabled so that KVM can be run which allows launching of VMs during image creation for bundling.</para>
<para>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/openstackv5.png"
- format="PNG" scale="60"/>
+ <imagedata fileref="images/setup.png"
+ format="PNG" scale="15"/>
</imageobject>
<imageobject role="html">
- <imagedata fileref="images/openstackv5html.png"
+ <imagedata fileref="images/setuphtml.png"
format="PNG" />
</imageobject>
</mediaobject>
</para>
<para>The installation steps use certain specifics such as host names/IP addresses etc. Modify them to suit your environment before using them. The following table summarizes these specifics.</para>
-<table xmlns:xi="http://www.w3.org/2001/XInclude"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:html="http://www.w3.org/1999/xhtml"; frame="all">
-<title>Configuration</title>
-<tgroup cols="4">
+<table rules="all">
+<caption>Configuration</caption>
+
<thead>
-<row>
-<entry/>
-<entry>Server1</entry>
-<entry>Server2</entry>
-<entry>Client1</entry>
-</row>
+<tr>
+<td>Server1</td>
+<td>Server2</td>
+<td>Client1</td>
+</tr>
</thead>
<tbody>
-<row>
-<entry>Functionality</entry>
-<entry>All components of OpenStack including nova-compute</entry>
-<entry>nova-compute</entry>
-<entry>Client</entry>
-</row>
-<row>
-<entry>Network Interfaces</entry>
-<entry>eth0 - Public N/W, eth1 - Private N/W</entry>
-<entry>eth0 - Public N/W, eth1 - Private N/W</entry>
-<entry>eth0 - Public N/W</entry>
-</row>
-<row>
-<entry>IP addresses</entry>
-<entry>eth0 - 10.10.10.2, eth1 - 192.168.3.1</entry>
-<entry>eth0 - 10.10.10.3, eth1 - 192.168.3.2</entry>
-<entry>eth0 - 10.10.10.4</entry>
-</row>
-<row>
-<entry>Hostname</entry>
-<entry>server1.example.com</entry>
-<entry>server2.example.com</entry>
-<entry>client.example.com</entry>
-</row>
-<row>
-<entry>DNS servers</entry>
-<entry>10.10.10.3</entry>
-<entry>10.10.10.3</entry>
-<entry>10.10.10.3</entry>
-</row>
-<row>
-<entry>Gateway IP</entry>
-<entry>10.10.10.1</entry>
-<entry>10.10.10.1</entry>
-<entry>10.10.10.1</entry>
-</row>
+<tr>
+<td>Functionality</td>
+<td>All components of OpenStack including nova-compute</td>
+<td>nova-compute</td>
+<td>Client</td>
+</tr>
+<tr>
+<td>Network Interfaces</td>
+<td>eth0 - Public N/W, eth1 - Private N/W</td>
+<td>eth0 - Public N/W, eth1 - Private N/W</td>
+<td>eth0 - Public N/W</td>
+</tr>
+<tr>
+<td>IP addresses</td>
+<td>eth0 - 10.10.10.2, eth1 - 192.168.3.1</td>
+<td>eth0 - 10.10.10.3, eth1 - 192.168.3.2</td>
+<td>eth0 - 10.10.10.4</td>
+</tr>
+<tr>
+<td>Hostname</td>
+<td>server1.example.com</td>
+<td>server2.example.com</td>
+<td>client.example.com</td>
+</tr>
+<tr>
+<td>DNS servers</td>
+<td>10.10.8.3</td>
+<td>10.10.8.3</td>
+<td>10.10.8.3</td>
+</tr>
+<tr>
+<td>Gateway IP</td>
+<td>10.10.10.1</td>
+<td>10.10.10.1</td>
+<td>10.10.10.1</td>
+</tr>
</tbody>
-</tgroup>
+
</table>
</section>
<section xml:id="Server1-d1e537">
<title>Server1</title>
- <para>As shown in the figure above, Server1 contains all nova- services including nova-compute, nova-api, nova-volume, nova-network, as well as the Image Service Glance and Swift. It contains two Network Interface Cards (NICs).</para>
+ <para>As shown in the figure above, Server1 contains all nova- services including nova-compute, nova-api, nova-volume, nova-network, Glance, Swift, Keystone and Horizon. It contains two network interface cards (NICs).</para>
<section xml:id="Base_OS-d1e542">
<title>Base OS</title>
-<para>Install 64 bit version of Ubuntu server 11.10 keeping the following configurations in mind.</para>
+<para>Install 64 bit version of Ubuntu server 12.04 keeping the following configurations in mind.</para>
<itemizedlist>
<listitem><para>Create the first user with the name 'localadmin' .</para></listitem>
<listitem><para>Installation lets you setup the IP address for the first interface i.e. eth0. Set the IP address details.</para></listitem>
<listitem><para>During installation select only Openssh-server in the packages menu.</para></listitem>
</itemizedlist>
-<para>We will also be running nova-volume on this server and it is ideal to have a dedicated partition for the use of nova-volume. So, ensure that you choose manual partitioning scheme while installing Ubuntu Server and create a dedicated partition with adequate amount of space for this purpose. We have referred to this partition in the rest of the chapter as /dev/sda6. You can substitute the correct device name of this dedicated partition based on your local setup while following the instructions. Also ensure that the partition type is set as Linux LVM (8e) using fdisk either during install or immediately after installation is over.</para>
+<para>We will also be running nova-volume on this server and it is ideal to have a dedicated partition for the use of nova-volume. So, ensure that you choose manual partitioning scheme while installing Ubuntu Server and create a dedicated partition with adequate amount of space for this purpose. We have referred to this partition in the rest of the chapter as /dev/sda6. You can substitute the correct device name of this dedicated partition based on your local setup while following the instructions. Also ensure that the partition type is set as Linux LVM (8e) using fdisk either during install or immediately after installation is over. If you also plan to use a dedicated partition as Swift backend, create another partition for this purpose and follow the instructions in "Swift Installation" section below.</para>
<para>Update the machine using the following commands.</para>
-<programlisting>sudo apt-get update</programlisting>
-<programlisting>sudo apt-get upgrade</programlisting>
+<programlisting>sudo apt-get update
+sudo apt-get upgrade
+</programlisting>
<para>Install bridge-utils:</para>
-<programlisting>sudo apt-get install -y bridge-utils</programlisting>
-<para>Reboot the server and login as the admin user(localadmin) created during the OS installation.</para>
+<programlisting>sudo apt-get install bridge-utils</programlisting>
</section>
-<section xml:id="Networking_Configuration-d1e591">
-<title>Networking Configuration</title>
+<section xml:id="Network_Configuration-d1e591">
+<title>Network Configuration</title>
<para>Edit the /etc/network/interfaces file so as to looks like this:</para>
<programlisting>
auto lo
@@ -102,7 +101,7 @@
netmask 255.255.255.0
broadcast 10.10.10.255
gateway 10.10.10.1
- dns-nameservers 10.10.10.100
+ dns-nameservers 10.10.8.3
auto eth1
iface eth1 inet static
@@ -116,142 +115,299 @@
</section>
<section xml:id="NTP_Server-d1e609">
<title>NTP Server</title>
-<para>Install NTP package. This server is going to act as an NTP server for the nodes. The time on all components of OpenStack will have to be in sync. We can run NTP server on this and have other components sync to it.</para>
-<programlisting>sudo apt-get install -y ntp</programlisting>
-<para>Open the file /etc/ntp.conf and add the following lines to make sure that the time of the server is in sync with an external server and in case Internet connectivity is down, NTP server uses its own hardware clock as the fallback.</para>
+<para>Install NTP package. This server shall act as the NTP server for the nodes. The time on all components of OpenStack will have to be in sync. We can run NTP server on server1 and have other servers/nodes sync to it.</para>
+<programlisting>sudo apt-get install ntp</programlisting>
+<para>Open the file /etc/ntp.conf and add the following lines to make sure that the time on the server stays in sync with an external server. If the Internet connectivity is down, the NTP server uses its own hardware clock as the fallback.</para>
<programlisting>
server ntp.ubuntu.com
server 127.127.1.0
fudge 127.127.1.0 stratum 10
</programlisting>
-<para>Restart NTP service to make the changes effective</para>
-<programlisting>sudo /etc/init.d/ntp restart</programlisting>
+<para>Restart the NTP server</para>
+<programlisting>sudo service ntp restart</programlisting>
+<para>Ensure that, IP addresses of the servers are resolvable by the DNS. If not, include the hostnames in /etc/hosts file.</para>
</section>
<section xml:id="Database_Server-d1e657"><title>Databases</title>
<para>You can use MySQL, PostgreSQL or SQLite for Nova and Glance. Depending upon your choice of database, you will need to install the necessary packages and configure the database server.</para>
<section xml:id="MySQL-d1e856">
<title>MySQL</title>
-<para>Install mysql-server package</para>
-<programlisting>sudo apt-get install -y mysql-server
+<para>Install mysql-server and python-mysqldb package</para>
+<programlisting>sudo apt-get install mysql-server python-mysqldb
</programlisting>
-<para>Create the root password for mysql. The password here is "mygreatsecret"</para>
-<para>Change the bind address from 127.0.0.1 to 0.0.0.0 in /etc/mysql/my.cnf and it will look like this:</para>
+<para>Create the root password for mysql. The password used in this guide is "mygreatsecret"</para>
+<para>Change the bind address from 127.0.0.1 to 0.0.0.0 in /etc/mysql/my.cnf. It should be identical to this:</para>
<programlisting>bind-address = 0.0.0.0
</programlisting>
<para>Restart MySQL server to ensure that it starts listening on all interfaces.</para>
<programlisting>sudo restart mysql
</programlisting>
</section>
-<section xml:id="PostgreSQL-dle678">
-<title>PostgreSQL</title>
-<para>Install PostgreSQL and the python driver for PostgreSQL</para>
-<programlisting>sudo apt-get install -y postgresql python-psycopg2</programlisting>
-<para>Setup PostgreSQL to listen on all interfaces by editing /etc/postgresql/9.1/main/postgresql.conf and uncommenting and modifying the relevant line. Look for the right file if you have a different version of PostgreSQL</para>
-<programlisting>listen_addresses = '*'</programlisting>
-<para>Restart PostgreSQL server to ensure that it starts listening on all interfaces.</para>
-<programlisting>sudo /etc/init.d/postgresql restart</programlisting>
-</section>
-<section xml:id="SQLite-dle899">
-<title>SQLite</title>
-<para>Install SQLite</para>
-<programlisting>sudo apt-get install -y sqlite</programlisting>
-</section>
-</section>
-
-<section xml:id="Glance-d1e634">
-<title>Glance</title>
-<para>Nova can use Glance service to manage Operating System images that it needs for bringing up instances. Glance can use several types of storage backends such as filestore, s3 etc.</para>
-<programlisting>sudo apt-get install -y glance
-</programlisting>
-<para>The default config file at /etc/glance/glance.conf is good to use for a simple file store as the storage backend. Glance can be configured to use other storage backends such as Swift.</para>
-<para>Glance uses sqlite as the default database backend. While sqlite offers a quick and easy way to get started, for production use, you may consider a database such as MySQL or PostgreSQL.</para>
-<para>Glance has two components - glance-api and glance-registry. These can be controlled using the concerned upstart jobs.</para>
-<section xml:id="Glancedb-d1a734">
-<title>Database Configuration</title>
-<para>Glance uses SQLite by default. MySQL and PostgreSQL can also be configured to work with Glance.</para>
-<section xml:id="GlanceMS-d2s21">
-<title>MySQL</title>
-<para>Create a database named glance</para>
+<section xml:id="Creating_Databases-d1e921">
+<title>Creating Databases</title>
+<para>Create MySQL databases to be used with nova, glance and keystone.</para>
+<para>Create a database named nova.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE nova;'</programlisting>
+<para>Create a user named novadbadmin.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER novadbadmin;'</programlisting>
+<para>Grant all privileges for novadbadmin on the database "nova".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON nova.* TO 'novadbadmin'@'%';"</programlisting>
+<para>Create a password for the user "novadbadmin".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'novadbadmin'@'%' = PASSWORD('novasecret');"</programlisting>
+<para>Create a database named glance.</para>
<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE glance;'</programlisting>
-<para>Create a user named glancedbadmin</para>
+<para>Create a user named glancedbadmin.</para>
<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER glancedbadmin;'</programlisting>
-<para>Grant all privileges for glancedbadmin on the Database "glance".</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON glance.* TO 'glancedbadmin'@'%' ;"</programlisting>
-<para>Create a password for the user "glanceadmin"</para>
+<para>Grant all privileges for glancedbadmin on the database "glance".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON glance.* TO 'glancedbadmin'@'%';"</programlisting>
+<para>Create a password for the user "glancedbadmin".</para>
<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'glancedbadmin'@'%' = PASSWORD('glancesecret');"</programlisting>
-<para>Edit the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
+<para>Create a database named keystone.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE keystone;'</programlisting>
+<para>Create a user named keystonedbadmin.</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER keystonedbadmin;'</programlisting>
+<para>Grant all privileges for keystonedbadmin on the database "keystone".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystonedbadmin'@'%';"</programlisting>
+<para>Create a password for the user "keystonedbadmin".</para>
+<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'keystonedbadmin'@'%' = PASSWORD('keystonesecret');"</programlisting>
+</section>
+</section>
+
+<section xml:id="Keystone-d1e456">
+<title>Keystone</title>
+<para>Keystone is the identity service used by OpenStack. Install Keystone using the following command.</para>
+<programlisting>sudo apt-get install keystone python-keystone python-keystoneclient
+</programlisting>
+<para>Open /etc/keystone/keystone.conf and change the line</para>
+<programlisting>admin_token = ADMIN</programlisting>
+<para>so that it looks like the following:</para>
+<programlisting>admin_token = admin</programlisting>
+<para>(We have used 'admin' as the token in this book.)</para>
+<para>Since MySQL database is used to store keystone configuration, replace the following line in /etc/keystone/keystone.conf </para>
+<programlisting>connection = sqlite:////var/lib/keystone/keystone.db</programlisting>
+<para>with</para>
+<programlisting>connection = mysql://keystonedbadmin:keystonesecret@10.10.10.2/keystone</programlisting>
+<para>Restart Keystone:</para>
+<programlisting>sudo service keystone restart</programlisting>
+<para>Run the following command to synchronise the database:</para>
+<programlisting>sudo keystone-manage db_sync</programlisting>
+<para>Export environment variables which are required while working with OpenStack.</para>
+<programlisting>
+export SERVICE_ENDPOINT="http://localhost:35357/v2.0";
+export SERVICE_TOKEN=admin
+</programlisting>
+<para>You can also add these variables to ~/.bashrc, so that you need not have to export them everytime.</para>
+<section xml:id="Creating_Keystone_Tenants-d1e458">
+<title>Creating Tenants</title>
+<para>Create the tenants by executing the following commands. In this case, we are creating two tenants - admin and service.</para>
+<programlisting>
+keystone tenant-create --name admin
+keystone tenant-create --name service
+</programlisting>
+</section>
+<section xml:id="Creating_Keystone_Users-d1e459">
+<title>Creating Users</title>
+<para>Create the users by executing the following commands. In this case, we are creating four users - admin, nova, glance and swift</para>
+<programlisting>
+keystone user-create --name admin --pass admin --email admin@xxxxxxxxxx
+keystone user-create --name nova --pass nova --email nova@xxxxxxxxxx
+keystone user-create --name glance --pass glance --email glance@xxxxxxxxxx
+keystone user-create --name swift --pass swift --email swift@xxxxxxxxxx
+</programlisting>
+</section>
+<section xml:id="Creating_Keystone_Roles-d1e460">
+<title>Creating Roles</title>
+<para>Create the roles by executing the following commands. In this case, we are creating two roles - admin and Member.</para>
+<programlisting>
+keystone role-create --name admin
+keystone role-create --name Member
+</programlisting>
+</section>
+<section xml:id="Listing_Tenants_Users_Roles-d1e462">
+<title>Listing Tenants, Users and Roles</title>
+<para>The tenants, users and roles that have been created above can be listed by following commands:</para>
+<para>List Tenants:</para>
+<programlisting>
+keystone tenant-list
++----------------------------------+--------------------+---------+
+| id | name | enabled |
++----------------------------------+--------------------+---------+
+| 7f95ae9617cd496888bc412efdceabfd | admin | True |
+| c7970080576646c6959ee35970cf3199 | service | True |
++----------------------------------+--------------------+---------+
+</programlisting>
+<para>List Users:</para>
+<programlisting>
+keystone user-list
++----------------------------------+---------+-------------------+--------+
+| id | enabled | email | name |
++----------------------------------+---------+-------------------+--------+
+| 1b986cca67e242f38cd6aa4bdec587ca | True | swift@xxxxxxxxxx | swift |
+| 518b51ea133c4facadae42c328d6b77b | True | glance@xxxxxxxxxx | glance |
+| b3de3aeec2544f0f90b9cbfe8b8b7acd | True | admin@xxxxxxxxxx | admin |
+| ce8cd56ca8824f5d845ba6ed015e9494 | True | nova@xxxxxxxxxx | nova |
++----------------------------------+---------+-------------------+--------+
+</programlisting>
+<para>List Roles:</para>
+<programlisting>
+keystone role-list
++----------------------------------+----------------------+
+| id | name |
++----------------------------------+----------------------+
+| 2bbe305ad531434991d4281aaaebb700 | admin |
+| d983800dd6d54ee3a1b1eb9f2ae3291f | Member |
++----------------------------------+----------------------+
+</programlisting>
+<para>Please note that the values of the 'id' column, would be required later when we associate a role to a user in a particular tenant.</para>
+</section>
+<section xml:id="Adding_Roles_to_Users-d1e465">
+<title>Adding Roles to Users in Tenants</title>
+<para>Now we add roles to the users that have been created. A role to a specific user in a specific tenant can be assigned with the following command:</para>
+<programlisting>keystone user-role-add --user $USER_ID --role $ROLE_ID --tenant_id $TENANT_ID
+</programlisting>
+<para>The required 'id' can be obtained from the commands - keystone user-list, keystone tenant-list, keystone role-list.</para>
+<para>To add a role of 'admin' to the user 'admin' of the tenant 'admin'.</para>
+<programlisting>
+keystone user-role-add --user b3de3aeec2544f0f90b9cbfe8b8b7acd --role 2bbe305ad531434991d4281aaaebb700 --tenant_id 7f95ae9617cd496888bc412efdceabfd
+</programlisting>
+<para>The following commands will add a role of 'admin' to the users 'nova', 'glance' and 'swift' of the tenant 'service'.</para>
+<programlisting>
+keystone user-role-add --user ce8cd56ca8824f5d845ba6ed015e9494 --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+keystone user-role-add --user 518b51ea133c4facadae42c328d6b77b --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+keystone user-role-add --user 1b986cca67e242f38cd6aa4bdec587ca --role 2bbe305ad531434991d4281aaaebb700 --tenant_id c7970080576646c6959ee35970cf3199
+</programlisting>
+<para>The 'Member' role is used by Horizon and Swift. So add the 'Member' role accordingly.</para>
+<programlisting>
+keystone user-role-add --user b3de3aeec2544f0f90b9cbfe8b8b7acd --role d983800dd6d54ee3a1b1eb9f2ae3291f --tenant_id 7f95ae9617cd496888bc412efdceabfd
+</programlisting>
+<para>Replace the id appropriately as listed by keystone user-list, keystone role-list, keystone tenant-list.</para>
+</section>
+<section xml:id="Creating_Services-d1e467">
+<title>Creating Services</title>
+<para>Now we need to create the required services which the users can authenticate with. nova-compute, nova-volume, glance, swift, keystone and ec2 are some of the services that we create.</para>
+<programlisting>keystone service-create --name service_name --type service_type --description 'Description of the service'</programlisting>
+<programlisting>
+keystone service-create --name nova --type compute --description 'OpenStack Compute Service'
+keystone service-create --name volume --type volume --description 'OpenStack Volume Service'
+keystone service-create --name glance --type image --description 'OpenStack Image Service'
+keystone service-create --name swift --type object-store --description 'OpenStack Storage Service'
+keystone service-create --name keystone --type identity --description 'OpenStack Identity Service'
+keystone service-create --name ec2 --type ec2 --description 'EC2 Service'
+</programlisting>
+<para>Each of the services that have been created above will be identified with a unique id which can be obtained from the following command:</para>
+<programlisting>
+keystone service-list
++----------------------------------+----------+--------------+----------------------------+
+| id | name | type | description |
++----------------------------------+----------+--------------+----------------------------+
+| 1e93ee6c70f8468c88a5cb1b106753f3 | nova | compute | OpenStack Compute Service |
+| 28fd92ffe3824004996a3e04e059d875 | ec2 | ec2 | EC2 Service |
+| 7d4ec192dfa1456996f0f4c47415c7a7 | keystone | identity | OpenStack Identity Service |
+| 96f35e1112b143e59d5cd5d0e6a8b22d | swift | object-store | OpenStack Storage Service |
+| f38f4564ff7b4e43a52b2f5c1b75e5fa | volume | volume | OpenStack Volume Service |
+| fbafab6edcab467bb734380ce6be3561 | glance | image | OpenStack Image Service |
++----------------------------------+----------+--------------+----------------------------+
+</programlisting>
+<para>The 'id' will be used in defining the endpoint for that service.</para>
+</section>
+<section xml:id="Creating_Endpoints-d1e469">
+<title>Creating Endpoints</title>
+<para>Create endpoints for each of the services that have been created above.</para>
+<programlisting>
+keystone endpoint-create --region region_name --service_id service_id --publicurl public_url --adminurl admin_url --internalurl internal_url
+</programlisting>
+<para>For creating an endpoint for nova-compute, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 1e93ee6c70f8468c88a5cb1b106753f3 --publicurl 'http://10.10.10.2:8774/v2/$(tenant_id)s' --adminurl 'http://10.10.10.2:8774/v2/$(tenant_id)s' --internalurl 'http://10.10.10.2:8774/v2/$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for nova-volume, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id f38f4564ff7b4e43a52b2f5c1b75e5fa --publicurl 'http://10.10.10.2:8776/v1/$(tenant_id)s' --adminurl 'http://10.10.10.2:8776/v1/$(tenant_id)s' --internalurl 'http://10.10.10.2:8776/v1/$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for glance, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id fbafab6edcab467bb734380ce6be3561 --publicurl 'http://10.10.10.2:9292/v1' --adminurl 'http://10.10.10.2:9292/v1' --internalurl 'http://10.10.10.2:9292/v1'
+</programlisting>
+<para>For creating an endpoint for swift, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 96f35e1112b143e59d5cd5d0e6a8b22d --publicurl 'http://10.10.10.2:8080/v1/AUTH_$(tenant_id)s' --adminurl 'http://10.10.10.2:8080/v1' --internalurl 'http://10.10.10.2:8080/v1/AUTH_$(tenant_id)s'
+</programlisting>
+<para>For creating an endpoint for keystone, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 7d4ec192dfa1456996f0f4c47415c7a7 --publicurl http://10.10.10.2:5000/v2.0 --adminurl http://10.10.10.2:35357/v2.0 --internalurl http://10.10.10.2:5000/v2.0
+</programlisting>
+<para>For creating an endpoint for ec2, execute the following command:</para>
+<programlisting>
+keystone endpoint-create --region myregion --service_id 28fd92ffe3824004996a3e04e059d875 --publicurl http://10.10.10.2:8773/services/Cloud --adminurl http://10.10.10.2:8773/services/Admin --internalurl http://10.10.10.2:8773/services/Cloud
+</programlisting>
+</section>
+</section>
+
+<section xml:id="Glance-d1a732">
+<title>Glance</title>
+<para>Install glance using the following command:</para>
+<programlisting>
+sudo apt-get install glance glance-api glance-client glance-common glance-registry python-glance
+</programlisting>
+<section xml:id="Glance_Config-d1a734">
+<title>Glance Configuration</title>
+<para>Glance uses SQLite by default. MySQL and PostgreSQL can also be configured to work with Glance.</para>
+<para>Open /etc/glance/glance-api-paste.ini and at the end of the file, edit the following lines:</para>
+<programlisting>
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+</programlisting>
+<para>These values have to be modified as per the configurations made earlier. The admin_tenant_name will be 'service', admin_user will be 'glance' and admin_password is 'glance'.</para>
+<para>After editing, the lines should be as follows:</para>
+<programlisting>
+admin_tenant_name = service
+admin_user = glance
+admin_password = glance
+</programlisting>
+<para>Now open /etc/glance/glance-registry-paste.ini and make similar changes at the end of the file.</para>
+<para>Open the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
<programlisting>sql_connection = mysql://glancedbadmin:glancesecret@10.10.10.2/glance</programlisting>
-<para>Restart glance-registry after making changes to /etc/glance/glance-registry.conf</para>
-<programlisting>sudo restart glance-registry</programlisting>
-</section>
-<section xml:id="GlancePS-d1f234">
-<title>PostgreSQL</title>
-<para>Create a user called 'glancedbadmin' with password 'glancesecret', create the database 'glance' and give 'glancedbadmin' all privileges on that database.</para>
-<programlisting>
-sudo su - postgres
-psql
-CREATE user glancedbadmin;
-ALTER user glancedbadmin with password 'glancesecret';
-CREATE DATABASE glance;
-GRANT ALL PRIVILEGES ON database glance TO glancedbadmin;
-\q
-exit
-</programlisting>
-<para>Edit the file /etc/glance/glance-registry.conf and edit the line which contains the option "sql_connection =" to this:</para>
-<programlisting>sql_connection = postgresql://glancedbadmin:glancesecret@10.10.10.2/glance</programlisting>
-<para>Restart glance-registry after making changes to /etc/glance/glance-registry.conf</para>
-<programlisting>sudo restart glance-registry</programlisting>
-</section>
-</section>
-</section>
-<section xml:id="Nova-d1e718">
+<para>In order to tell glance to use keystone for authentication, add the following lines at the end of the file.</para>
+<programlisting>
+[paste_deploy]
+flavor = keystone
+</programlisting>
+<para>Open /etc/glance/glance-api.conf and add the following lines at the end of the document.</para>
+<programlisting>
+[paste_deploy]
+flavor = keystone
+</programlisting>
+<para>Create glance schema in the MySQL database.:</para>
+<programlisting>
+sudo glance-manage version_control 0
+sudo glance-manage db_sync
+</programlisting>
+<para>Restart glance-api and glance-registry after making the above changes.</para>
+<programlisting>sudo restart glance-api</programlisting>
+<programlisting>sudo restart glance-registry</programlisting>
+<para>Export the following environment variables.</para>
+<programlisting>
+export SERVICE_TOKEN=admin
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://localhost:5000/v2.0/";
+export SERVICE_ENDPOINT=http://localhost:35357/v2.0
+</programlisting>
+<para>Alternatively, you can add these variables to ~/.bashrc.</para>
+<para>To test if glance is setup correectly execute the following command.</para>
+<programlisting>glance index</programlisting>
+<para>The above command will not return any output. The output of the last command executed can be known from its return code - echo $?. If the return code is zero, then glance is setup properly and connects with Keystone.</para>
+<para>With glance configured properly and using keystone as the authentication mechanism, now we can upload images to glance. This has been explained in detail in "Image Management" chapter.</para>
+</section>
+</section>
+
+<section xml:id="Nova-d1a736">
<title>Nova</title>
-<para>Install the messaging queue server, RabbitMQ and various nova components.</para>
-<programlisting>sudo apt-get install -y rabbitmq-server nova-common nova-doc python-nova nova-api nova-network nova-volume nova-objectstore nova-scheduler nova-compute</programlisting>
-<para>Install euca2ools package for command line tools to interact with nova.</para>
-<programlisting>sudo apt-get install -y euca2ools
-</programlisting>
-<para>Install unzip for extracting archives.</para>
-<programlisting>sudo apt-get install -y unzip
-</programlisting>
-<section xml:id="NovaDB-d2s241">
-<title>Database Configuration</title>
-<para>Nova can use MySQL or PostgreSQL for storing its data. For non-production use, sqlite is also an option.</para>
-<section xml:id="MySQL_Server-d1e657"><title>MySQL</title>
-<para>Create a database named nova.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE DATABASE nova;'
-</programlisting>
-<para>Create a user named novadbadmin which has access to nova related databases.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e 'CREATE USER novadbadmin;'</programlisting>
-<para>Grant all privileges for novadbadmin on the Database "nova".</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "GRANT ALL PRIVILEGES ON nova.* TO 'novadbadmin'@'%' ;"</programlisting>
-<para>Set password for novadbadmin.</para>
-<programlisting>sudo mysql -uroot -pmygreatsecret -e "SET PASSWORD FOR 'novadbadmin'@'%' = PASSWORD('novasecret');"</programlisting>
-</section>
-<section xml:id="PostgreSQL-d2s315">
-<title>PostgreSQL</title>
-<para>Create a user called 'novadbadmin' with password 'novasecret', create the database 'nova' and give 'novadbadmin' all privileges on that database.</para>
-<programlisting>
-sudo su - postgres
-psql
-CREATE user novadbadmin;
-ALTER user novadbadmin with password 'novasecret';
-CREATE DATABASE nova;
-GRANT ALL PRIVILEGES ON database nova TO novadbadmin;
-\q
-exit
-</programlisting>
-<para>Configure Postgresql to accept connections from users from any machine on 10.10.10.0/24 and 192.168.3.0/24 by adding the following line to /etc/postgresql/9.1/main/pg_hba.conf.</para>
-<programlisting>
-host all all 10.10.10.0/24 md5
-host all all 192.168.3.0/24 md5
-</programlisting>
-<para>Restart PostgreSQL.</para>
-<programlisting>/etc/init.d/postgresql restart</programlisting>
-</section>
-</section>
-<section xml:id="Nova_conf-d2s367">
+<para>Install nova using the following commands:</para>
+<programlisting>sudo apt-get install nova-api nova-cert nova-compute nova-compute-kvm nova-doc nova-network nova-objectstore nova-scheduler nova-volume rabbitmq-server novnc nova-consoleauth</programlisting>
+<section xml:id="Nova_Conf-d2s738">
<title>Nova Configuration</title>
<para>Edit the /etc/nova/nova.conf file to look like this.</para>
<programlisting>
@@ -259,319 +415,419 @@
--dhcpbridge=/usr/bin/nova-dhcpbridge
--logdir=/var/log/nova
--state_path=/var/lib/nova
---lock_path=/var/lock/nova
---state_path=/var/lib/nova
---verbose
+--lock_path=/run/lock/nova
+--allow_admin_api=true
+--use_deprecated_auth=false
+--auth_strategy=keystone
+--scheduler_driver=nova.scheduler.simple.SimpleScheduler
--s3_host=10.10.10.2
+--ec2_host=10.10.10.2
--rabbit_host=10.10.10.2
--cc_host=10.10.10.2
---ec2_url=http://10.10.10.2:8773/services/Cloud
--nova_url=http://10.10.10.2:8774/v1.1/
---fixed_range=192.168.0.0/16
---network_size=8
---FAKE_subdomain=ec2
--routing_source_ip=10.10.10.2
+--glance_api_servers=10.10.10.2:9292
+--image_service=nova.image.glance.GlanceImageService
+--iscsi_ip_prefix=192.168.4
--sql_connection=mysql://novadbadmin:novasecret@10.10.10.2/nova
---glance_api_servers=192.168.3.2:9292
---image_service=nova.image.glance.GlanceImageService
---iscsi_ip_prefix=192.168.
---vlan_interface=eth1
+--ec2_url=http://10.10.10.2:8773/services/Cloud
+--keystone_ec2_url=http://10.10.10.2:5000/v2.0/ec2tokens
+--api_paste_config=/etc/nova/api-paste.ini
+--libvirt_type=kvm
+--libvirt_use_virtio_for_bridges=true
+--start_guests_on_host_boot=true
+--resume_guests_state_on_host_boot=true
+# vnc specific configuration
+--novnc_enabled=true
+--novncproxy_base_url=http://10.10.10.2:6080/vnc_auto.html
+--vncserver_proxyclient_address=10.10.10.2
+--vncserver_listen=10.10.10.2
+# network specific settings
+--network_manager=nova.network.manager.FlatDHCPManager
--public_interface=eth0
+--flat_interface=eth1
+--flat_network_bridge=br100
+--fixed_range=192.168.4.1/27
+--floating_range=10.10.10.2/27
+--network_size=32
+--flat_network_dhcp_start=192.168.4.33
+--flat_injected=False
+--force_dhcp_release
+--iscsi_helper=tgtadm
+--connection_type=libvirt
+--root_helper=sudo nova-rootwrap
+--verbose
</programlisting>
-<para>For configuring with PostgreSQL change the line with --sql_connection to:</para>
-<programlisting>--sql_connection=postgresql://novadbadmin:novasecret@10.10.10.2/nova</programlisting>
-<para>For configuring with SQLite change the line with --sql_connection to:</para>
-<programlisting>--sql_connection=sqlite:////var/lib/nova/nova.sqlite</programlisting>
-<para>Install iscsitarget</para>
-<programlisting>sudo apt-get -y install iscsitarget iscsitarget-dkms</programlisting>
-<para>Enable iscsitarget.</para>
-<programlisting>sudo sed -i 's/false/true/g' /etc/default/iscsitarget</programlisting>
-<para>Restart the iscsitarget service</para>
-<programlisting>sudo service iscsitarget restart</programlisting>
<para>Create a Physical Volume.</para>
-<programlisting>sudo pvcreate /dev/sda6
+<programlisting>
+sudo pvcreate /dev/sda6
</programlisting>
<para>Create a Volume Group named nova-volumes.</para>
-<programlisting>sudo vgcreate nova-volumes /dev/sda6
+<programlisting>
+sudo vgcreate nova-volumes /dev/sda6
</programlisting>
<para>Change the ownership of the /etc/nova folder and permissions for /etc/nova/nova.conf:</para>
<programlisting>
-sudo chown -R root:nova /etc/nova
+sudo chown -R nova:nova /etc/nova
sudo chmod 644 /etc/nova/nova.conf
</programlisting>
-<para>Restart all the nova related services.</para>
-<programlisting>sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart glance-api; sudo restart glance-registry</programlisting>
-<para>Create nova schema in the MySQL Database.</para>
+<para>Open /etc/nova/api-paste.ini and at the end of the file, edit the following lines:</para>
+<programlisting>
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = %SERVICE_USER%
+admin_password = %SERVICE_PASSWORD%
+</programlisting>
+<para>These values have to be modified conforming to configurations made earlier. The admin_tenant_name will be 'service', admin_user will be 'nova' and admin_password is 'nova'.</para>
+<para>After editing, the lines should be as follows:</para>
+<programlisting>
+admin_tenant_name = service
+admin_user = nova
+admin_password = nova
+</programlisting>
+<para>Create nova schema in the MySQL database.</para>
<programlisting>sudo nova-manage db sync</programlisting>
-<para>Provide a range of IPs to be attached to the instances.</para>
-<programlisting>sudo nova-manage network create private 192.168.4.0/24 1 256
-</programlisting>
-<para>Allocate 32 pubic IP addresses for use with the instances starting from 10.10.10.225.</para>
-<programlisting>sudo nova-manage floating create --ip_range=10.10.10.224/27
-</programlisting>
-<para>Create a user with admin rights on nova.</para>
-<programlisting>sudo nova-manage user admin novaadmin
-</programlisting>
-<para>Create a project named proj.</para>
-<programlisting>sudo nova-manage project create proj novaadmin
-</programlisting>
-<para>Restart all the nova related services.</para>
-<programlisting>sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart glance-api; sudo restart glance-registry</programlisting>
-<para>Create a directory to download nova credentials and download the zip file.</para>
-<programlisting>mkdir /home/localadmin/creds
-</programlisting>
-<para>Generate and save credentials for accessing/managing the nova cloud.</para>
-<programlisting>sudo nova-manage project zipfile proj novaadmin /home/localadmin/creds/novacreds.zip
-</programlisting>
-<para>Contents of novacreds.zip are required to use euca2ools to manage the cloud infrastructure and you will need to transfer this zip file to any machine from where you want to run the commands from euca2ools. We will be using these credentials from client1 as well.
-</para>
-<para>Navigate in to the folder created and extract the files and change their ownership.</para>
-<programlisting>
-cd /home/localadmin/creds
-unzip novacreds.zip
-sudo chown localadmin:localadmin /home/localadmin/creds/ -R
-</programlisting>
-<para>Here are the files extracted:</para>
-<para>cacert.pem, cert.pem, novarc, pk.pem</para>
-<para>novarc contains several environmental variables including your nova credentials to be set before you can use the commands from euca2ools such euca-describe-images, euca-describe-instances etc. these variables can be set by sourcing novarc file.</para>
-<para>In Diablo, by default novarc file contains EC2_ACCESS_KEY in a format that is not usable by euca-* commands. To fix this:</para>
-<programlisting>sudo nova-manage user exports novaadmin</programlisting>
-<para>The output will be something like:</para>
-<programlisting>
-export EC2_ACCESS_KEY=c043916c-9a0c-4f91-ad6c-4b30908b6c77
-export EC2_SECRET_KEY=d0ac688e-02f3-48f3-b758-96d886461ace
-</programlisting>
-<para>Open the novarc file and replace the line</para>
-<programlisting>export EC2_ACCESS_KEY="novaadmin:proj"</programlisting>
-<para>with</para>
-<programlisting>export EC2_ACCESS_KEY="c043916c-9a0c-4f91-ad6c-4b30908b6c77:proj"</programlisting>
-<programlisting>source /home/localadmin/creds/novarc
-</programlisting>
-<para>Check if the credentials are working and if nova has been setup properly by running:</para>
-<programlisting>euca-describe-availability-zones verbose
-</programlisting>
-<para>If you see something like the following with all components happy, it means that the set up is ready to be used.</para>
-<programlisting>
-AVAILABILITYZONE nova available
-AVAILABILITYZONE |- server1
-AVAILABILITYZONE | |- nova-compute enabled :-) 2011-09-29 07:26:04
-AVAILABILITYZONE | |- nova-scheduler enabled :-) 2011-09-29 07:26:04
-AVAILABILITYZONE | |- nova-network enabled :-) 2011-09-29 07:26:07
-AVAILABILITYZONE | |- nova-volume enabled :-) 2011-09-29 07:26:06
-</programlisting>
-</section>
-</section>
-<section xml:id="Swift_install">
+<para>Provide a range of IPs to be associated to the instances.</para>
+<programlisting>
+nova-manage network create private --fixed_range_v4=192.168.4.32/27 --num_networks=1 --bridge=br100 --bridge_interface=eth1 --network_size=32
+</programlisting>
+<para>Export the following environment variables.</para>
+<programlisting>
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://localhost:5000/v2.0/";
+</programlisting>
+<para>Restart nova services.</para>
+<programlisting>
+sudo restart libvirt-bin; sudo restart nova-network; sudo restart nova-compute; sudo restart nova-api; sudo restart nova-objectstore; sudo restart nova-scheduler; sudo restart nova-volume; sudo restart nova-consoleauth;
+</programlisting>
+<para>To test if nova is setup correctly run the following command.</para>
+<programlisting>
+sudo nova-manage service list
+Binary Host Zone Status State Updated_At
+nova-network server1 nova enabled :-) 2012-04-20 08:58:43
+nova-scheduler server1 nova enabled :-) 2012-04-20 08:58:44
+nova-volume server1 nova enabled :-) 2012-04-20 08:58:44
+nova-compute server1 nova enabled :-) 2012-04-20 08:58:45
+nova-cert server1 nova enabled :-) 2012-04-20 08:58:43
+</programlisting>
+<para>If the output is similar to the above with all components happy, your setup is ready to be used.</para>
+</section>
+
+<section xml:id="Openstack_Dashboard-d2s740">
+<title>OpenStack Dashboard</title>
+<para>Install OpenStack Dashboard by executing the following command:</para>
+<programlisting>
+sudo apt-get install openstack-dashboard
+</programlisting>
+<para>Restart apache with the following command:</para>
+<programlisting>service apache2 restart</programlisting>
+<para>Open a browser and enter IP address of the server1. You should see the OpenStack Dashboard login prompt. Login with username 'admin' and password 'admin'. From the dashboard, you can create keypairs, create/edit security groups, raise new instances, attach volumes etc. which are explained in "OpenStack Dashboard" chapter.</para>
+</section>
+
+<section xml:id="Swift-d2s742">
<title>Swift</title>
-<para>Install Swift via apt-get:</para>
-<programlisting>
-sudo apt-get install swift swift-proxy memcached swift-account swift-container swift-object
-</programlisting>
-<para>Install Swift via apt-get:</para>
-<programlisting>sudo apt-get install xfsprogs curl</programlisting>
-<section xml:id="Swift_configuration">
-<title>Swift Configuration</title>
-<para>There are two methods to configure the storage backend for use by Swift.</para>
-<section xml:id="Physical_device_as_storage">
-<title>Physical Device (Partition) as a storage</title>
-<para>A physical device is partitioned and used as storage. Assuming there is a secondary disk /dev/sdb :</para>
+<section xml:id="Swift_Installation-d2s744">
+<title>Swift Installation</title>
+<para>The primary components are the proxy, account, container and object servers.</para>
+<programlisting>
+sudo apt-get install swift swift-proxy swift-account swift-container swift-object
+</programlisting>
+<para>Other components that might be xfsprogs (for dealing with XFS filesystem), python.pastedeploy (for keystone access), curl (to test swift).</para>
+<programlisting>
+sudo apt-get install xfsprogs curl python-pastedeploy
+</programlisting>
+</section>
+<section xml:id="Swift_Storage_Backends-d2s746">
+<title>Swift Storage Backends</title>
+<para>There are two methods one can try to create/prepare the storage backend. One is to use an existing partition/volume as the storage device. The other is to create a loopback file and use it as the storage device. Use the appropriate method as per your setup.</para>
+<section xml:id="Partition_as_Storage-d2s748">
+<title>Partition as a storage device</title>
+<para>If you had set aside a partition for Swift during the installation of the OS, you can use it directly. If you have an unused/unpartitioned physical partition (e.g. /dev/sdb3), you have to format it to xfs filesystem using parted or fdisk and use it as the backend. You need to specify the mount point in /etc/fstab.</para>
+<programlisting>
+CAUTION: Replace /dev/sdb to your appropriate device. I'm assuming that there is an unused/un-formatted partition section in /dev/sdb
+</programlisting>
<programlisting>
sudo fdisk /dev/sdb
-</programlisting>
-<para>Press m for help; n for new partition; p to view the partition table; w to write changes to disk once you are done. You should now have a partiton /dev/sda1.</para>
+
+ Type n for new partition
+ Type e for extended partion
+ Choose appropriate partition number ( or go with the default )
+ Choose first and last sectors to set the hard disk size (or go with defaults)
+ Note that 83 is the partition type number for Linux
+ Type w to write changes to the disk
+</programlisting>
+<para>This would have created a partition (something like /dev/sdb3) that we can now format to XFS filesystem. Do 'sudo fdisk -l' in the terminal to view and verify the partion table. Find the partition Make sure that the one that you want to use is listed there. This would work only if you have xfsprogs installed.</para>
+<programlisting>
+sudo mkfs.xfs -i size=1024 /dev/sdb3
+sudo tune2fs -l /dev/sdb3 |grep -i inode
+</programlisting>
+<para>Create a directory /mnt/swift_backend that can be used as a mount point to the partion tha we created.</para>
+<programlisting>
+sudo mkdir /mnt/swift_backend
+</programlisting>
+<para>Now edit /etc/fstab and append the following line to mount the partition automatically everytime the system restarts.</para>
+<programlisting>
+/dev/sdb3 /mnt/swift_backend xfs noatime,nodiratime,nobarrier,logbufs=8 0 0
+</programlisting>
</section>
-<section xml:id="Loopback_device_as_storage">
-<title>Loopback Device (File) as storage</title>
-<para>We create a zero filled file for use as a loopback device for the Swift storage backend. Here we use the disk copy command to create a file named swift-disk and allocate a million 1KiB blocks (976.56 MiB) to it. So we have a loopback disk of approximately 1GiB. We can increase this size by modifying the seek value.</para>
+<section xml:id="Loopback_File_as_Storage-d2s748">
+<title>Loopback File as a storage device</title>
+<para>We create a zero filled file for use as a loopback device for the Swift storage backend. Here we use the disk copy command to create a file named swift-disk and allocate a million 1KiB blocks (976.56 MiB) to it. So we have a loopback disk of approximately 1GiB. We can increase this size by modifying the seek value. The disk is then formated to XFS filesystem. The file command can be used to verify if it worked.</para>
<programlisting>
sudo dd if=/dev/zero of=/srv/swift-disk bs=1024 count=0 seek=1000000
-</programlisting>
-</section>
-<para>We now create an xfs filesystem out of the partition or the loopback device we just created. For the loopback file, doing "file swift-disk" will give the details of the device. For the partition details, tune2fs utility can be used with "l" parameter.</para>
-<para>For the physical partition:</para>
-<programlisting>
-sudo mkfs.xfs -i size=1024 /dev/sdb1
-sudo tune2fs -l /dev/sdb1 |grep -i inode
-</programlisting>
-<para> For the loopback file:</para>
-<programlisting>
sudo mkfs.xfs -i size=1024 /srv/swift-disk
file /srv/swift-disk
swift-disk1: SGI XFS filesystem data (blksz 4096, inosz 1024, v2 dirs)
</programlisting>
-
-<para>The storage device we created has to be mounted automatically everytime the system starts. Lets create an arbitrary mountpoint /mnt/sdb1.
-</para>
-<programlisting>
-sudo mkdir /mnt/sdb1
-</programlisting>
-<para>Edit /etc/fstab and append the following line:</para>
-<para>For the physical partiton</para>
-<programlisting>
-/dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0
-</programlisting>
-<para>If you have a loopback file</para>
-<programlisting>
-/srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0
-</programlisting>
-<para>Let's now mount the storage device and create directories (which would act as storage nodes) and provide appropriate permissions and ownerships (user:group format) for them. I have set the ownership to swift:swift for all relevant files.</para>
-<programlisting>
-sudo mount /mnt/sdb1
-sudo mkdir /mnt/sdb1/1 /mnt/sdb1/2 /mnt/sdb1/3 /mnt/sdb1/4
-sudo chown swift:swift /mnt/sdb1/*
-sudo ln -s /mnt/sdb1/1 /srv/1
-sudo ln -s /mnt/sdb1/2 /srv/2
-sudo ln -s /mnt/sdb1/3 /srv/3
-sudo ln -s /mnt/sdb1/4 /srv/4
-sudo mkdir -p /etc/swift/object-server /etc/swift/container-server /etc/swift/account-server /srv/1/node/sdb1 /srv/2/node/sdb2 /srv/3/node/sdb3 /srv/4/node/sdb4 /var/run/swift
-sudo chown -R swift:swift /etc/swift /srv/[1-4]/
-</programlisting>
-<para>Append the following lines to /etc/rc.local just before the "exit 0":</para>
-<programlisting>
-mkdir /var/run/swift
-chown swift:swift /var/run/swift
-</programlisting>
-</section>
-<section xml:id="Configuring_rsync">
-<title>Configuring Rsync</title>
-<para>Rsync is responsible for maintaining object replicas. It is used by various swift services to maintain consistency of objects and perform updation operations. It is configured for all the storage nodes.</para>
-<para>Create /etc/rsyncd.conf file and add the following lines to it:</para>
-<programlisting>
+<para>Create a directory /mnt/swift_backend that can be used as a mount point to the partion tha we created.</para>
+<programlisting>
+sudo mkdir /mnt/swift_backend
+</programlisting>
+<para>Make it mount on boot by appending this to /etc/fstab.</para>
+<programlisting>
+/srv/swift-disk /mnt/swift_backend xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0
+</programlisting>
+</section>
+<section xml:id="Using_the_backend-d2s750">
+<title>Using the backend</title>
+<para>Now before mounting the backend that will be used, create some nodes to be used as storage devices and set ownership to 'swift' user and group.</para>
+<programlisting>
+sudo mount /mnt/swift_backend
+pushd /mnt/swift_backend
+sudo mkdir node1 node2 node3 node4
+popd
+</programlisting>
+<programlisting>
+sudo chown swift.swift /mnt/swift_backend/*
+</programlisting>
+<programlisting>
+for i in {1..4}; do sudo ln -s /mnt/swift_backend/node$i /srv/node$i; done;
+</programlisting>
+<programlisting>
+sudo mkdir -p /etc/swift/account-server /etc/swift/container-server /etc/swift/object-server /srv/node1/device /srv/node2/device /srv/node3/device /srv/node4/device
+sudo mkdir /run/swift
+sudo chown -L -R swift.swift /etc/swift /srv/node[1-4]/ /run/swift
+</programlisting>
+<para>Append the following lines in /etc/rc.local just before "exit 0";. This will be run everytime the system starts.</para>
+<programlisting>
+mkdir /run/swift
+chown swift.swift /run/swift
+</programlisting>
+</section>
+</section>
+<section xml:id="Configure_Rsync-d2s750">
+<title>Configure Rsync</title>
+<para>Rsync is responsible for maintaining object replicas. It is used by various swift services to maintain consistency of objects and perform updation operations. It is configured for all the storage nodes.</para>
+<para>Set RSYNC_ENABLE=true in /etc/default/rsync.</para>
+<para>Modify /etc/rsyncd.conf as follows:</para>
+<programlisting>
+# General stuff
uid = swift
gid = swift
log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
+pid file = /run/rsyncd.pid
address = 127.0.0.1
+# Account Server replication settings
+
[account6012]
max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
read only = false
-lock file = /var/lock/account6012.lock
+lock file = /run/lock/account6012.lock
[account6022]
max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
read only = false
-lock file = /var/lock/account6022.lock
+lock file = /run/lock/account6022.lock
[account6032]
max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
read only = false
-lock file = /var/lock/account6032.lock
+lock file = /run/lock/account6032.lock
[account6042]
max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
read only = false
-lock file = /var/lock/account6042.lock
+lock file = /run/lock/account6042.lock
+# Container server replication settings
[container6011]
max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
read only = false
-lock file = /var/lock/container6011.lock
+lock file = /run/lock/container6011.lock
[container6021]
max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
read only = false
-lock file = /var/lock/container6021.lock
+lock file = /run/lock/container6021.lock
[container6031]
max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
read only = false
-lock file = /var/lock/container6031.lock
+lock file = /run/lock/container6031.lock
[container6041]
max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
read only = false
-lock file = /var/lock/container6041.lock
+lock file = /run/lock/container6041.lock
+# Object Server replication settings
[object6010]
max connections = 25
-path = /srv/1/node/
+path = /srv/node1/
read only = false
-lock file = /var/lock/object6010.lock
+lock file = /run/lock/object6010.lock
[object6020]
max connections = 25
-path = /srv/2/node/
+path = /srv/node2/
read only = false
-lock file = /var/lock/object6020.lock
+lock file = /run/lock/object6020.lock
[object6030]
max connections = 25
-path = /srv/3/node/
+path = /srv/node3/
read only = false
-lock file = /var/lock/object6030.lock
+lock file = /run/lock/object6030.lock
[object6040]
max connections = 25
-path = /srv/4/node/
+path = /srv/node4/
read only = false
-lock file = /var/lock/object6040.lock
+lock file = /run/lock/object6040.lock
</programlisting>
-<para>Set RSYNC_ENABLE=true in /etc/default/rsync and then restart the rsync service.</para>
+<para>Restart rsync.</para>
<programlisting>
-service rsync restart
+sudo service rsync restart
</programlisting>
</section>
-<section xml:id="Swift_hash_configuration">
-<title>Swift Configuration</title>
+<section xml:id="Configure_Swift_Components-d2s752">
+<title>Configure Swift Components</title>
+<para>General server configuration options can be found in http://swift.openstack.org/deployment_guide.html. If the swift-doc package is installed it can also be viewed in the /usr/share/doc/swift-doc/html directory. Python uses paste.deploy to manage configuration. Default configuration options are set in the [DEFAULT] section, and any options specified there can be overridden in any of the other sections BUT ONLY BY USING THE SYNTAX set option_name = value.</para>
+<para>Here is a sample paste.deploy configuration for reference:</para>
+<programlisting>
+[DEFAULT]
+name1 = globalvalue
+name2 = globalvalue
+name3 = globalvalue
+set name4 = globalvalue
+
+[pipeline:main]
+pipeline = myapp
+
+[app:myapp]
+use = egg:mypkg#myapp
+name2 = localvalue
+set name3 = localvalue
+set name5 = localvalue
+name6 = localvalue
+</programlisting>
<para>Create and edit /etc/swift/swift.conf and add the following lines to it:</para>
<programlisting>
[swift-hash]
-# random unique (preferably alphanumeric) string that can never change (DO NOT LOSE)
-swift_hash_path_suffix = {place_random_unique_string_here}
+# random unique string that can never change (DO NOT LOSE). I'm using 03c9f48da2229770.
+# od -t x8 -N 8 -A n < /dev/random
+# The above command can be used to generate random a string.
+swift_hash_path_suffix = 03c9f48da2229770
</programlisting>
-<para>You will need the random string when you add more nodes to the setup. So never loose the string.</para>
+<para>You will need the random string when you add more nodes to the setup. So never lose the string.</para>
<para>You can generate a random string by running the following command:</para>
<programlisting>
od -t x8 -N 8 -A n < /dev/random
</programlisting>
-</section>
-<section xml:id="Proxy_server_configuration">
-<title>Proxy Server Configuration</title>
-<para>Create and edit /etc/swift/proxy-server.conf and add the following lines to the file:</para>
+<section xml:id="Configure_Swift_Proxy_Server-d2s752">
+<title>Configure Swift Proxy Server</title>
+<para>Proxy server acts as the gatekeeper to swift. It takes the responsibility of authenticating the user. Authentication verifies that a request actually comes from who it says it does. Authorization verifies the ‘who’ has access to the resource(s) the request wants. Authorization is done by identity services like keystone. Create and edit /etc/swift/proxy-server.conf and add the following lines.</para>
<programlisting>
[DEFAULT]
bind_port = 8080
user = swift
-log_facility = LOG_LOCAL1
+swift_dir = /etc/swift
[pipeline:main]
-pipeline = healthcheck cache tempauth proxy-server
+# Order of execution of modules defined below
+pipeline = catch_errors healthcheck cache authtoken keystone proxy-server
[app:proxy-server]
use = egg:swift#proxy
allow_account_management = true
account_autocreate = true
-
-[filter:tempauth]
-use = egg:swift#tempauth
-user_admin_admin = admin .admin .reseller_admin
-user_test_tester = testing .admin
+set log_name = swift-proxy
+set log_facility = LOG_LOCAL0
+set log_level = INFO
+set access_log_name = swift-proxy
+set access_log_facility = SYSLOG
+set access_log_level = INFO
+set log_headers = True
+account_autocreate = True
[filter:healthcheck]
use = egg:swift#healthcheck
+[filter:catch_errors]
+use = egg:swift#catch_errors
+
[filter:cache]
use = egg:swift#memcache
+set log_name = cache
+
+[filter:authtoken]
+paste.filter_factory = keystone.middleware.auth_token:filter_factory
+auth_protocol = http
+auth_host = 127.0.0.1
+auth_port = 35357
+auth_token = admin
+service_protocol = http
+service_host = 127.0.0.1
+service_port = 5000
+admin_token = admin
+admin_tenant_name = service
+admin_user = swift
+admin_password = swift
+delay_auth_decision = 0
+
+[filter:keystone]
+paste.filter_factory = keystone.middleware.swift_auth:filter_factory
+operator_roles = admin, swiftoperator
+is_admin = true
</programlisting>
-<para>Note: You can find sample configuration files at the "etc" directory in the source. If you used apt-get to install swift, the configuration samples can be found at "/usr/share/doc/swift/"</para>
+<para>Note: You can find sample configuration files at the "etc" directory in the source. Some documentation can be found under "/usr/share/doc/swift-doc/html" if you had installed the swift-doc package using apt-get.</para>
</section>
-<section xml:id="Account_server_configuration">
-<title>Account Server Configuration</title>
-<para>Create an account server configuration file for node #1: /etc/swift/account-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Account_Server-d2s752">
+<title>Configure Swift Account Server</title>
+<para>The default swift account server configuration is /etc/swift/account-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = account-server
+
+[app:account-server]
+use = egg:swift#account
+
+[account-replicator]
+
+[account-auditor]
+
+[account-reaper]
+</programlisting>
+<para>Account server configuration files are also looked up under /etc/swift/account-server.conf. Here we can create several account server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/account-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
mount_check = false
bind_port = 6012
user = swift
@@ -584,26 +840,46 @@
use = egg:swift#account
[account-replicator]
-vm_test_mode = yes
+vm_test_mode = no
[account-auditor]
[account-reaper]
</programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6022. 6032 and 6042) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6022, 6032 and 6042) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
<programlisting>
sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/2.conf
sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/3.conf
sudo cp /etc/swift/account-server/1.conf /etc/swift/account-server/4.conf
+sudo sed -i 's/6012/6022/g;s/LOCAL2/LOCAL3/g;s/node1/node2/g' /etc/swift/account-server/2.conf
+sudo sed -i 's/6012/6032/g;s/LOCAL2/LOCAL4/g;s/node1/node3/g' /etc/swift/account-server/3.conf
+sudo sed -i 's/6012/6042/g;s/LOCAL2/LOCAL5/g;s/node1/node4/g' /etc/swift/account-server/4.conf
</programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
</section>
-<section xml:id="Container_server_configuration">
-<title>Container Server Configuration</title>
-<para>Create a container server configuration file for node #1: /etc/swift/container-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Container_Server-d2s754">
+<title>Configure Swift Container Server</title>
+<para>The default swift container server configuration is /etc/swift/container-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = container-server
+
+[app:container-server]
+use = egg:swift#container
+
+[container-replicator]
+
+[container-updater]
+
+[container-auditor]
+</programlisting>
+<para>Container server configuration files are also looked up under /etc/swift/container-server.conf. Here we can create several container server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/container-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
mount_check = false
bind_port = 6011
user = swift
@@ -616,28 +892,39 @@
use = egg:swift#container
[container-replicator]
-vm_test_mode = yes
+vm_test_mode = no
[container-updater]
[container-auditor]
-
[container-sync]
</programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6021, 6031 and 6041) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
-<programlisting>
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/2.conf
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/3.conf
-sudo cp /etc/swift/container-server/1.conf /etc/swift/container-server/4.conf
-</programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6021, 6031 and 6041) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
</section>
-<section xml:id="Object_server_configuration">
-<title>Object Server Configuration</title>
-<para>Create an object server configuration file for node #1: /etc/swift/object-server/1.conf and add the following lines to the file</para>
-<programlisting>
-[DEFAULT]
-devices = /srv/1/node
+<section xml:id="Configure_Swift_Object_Server-d2s756">
+<title>Configure Swift Object Server</title>
+<para>The default swift object server configuration is /etc/swift/object-server.conf.</para>
+<programlisting>
+[DEFAULT]
+bind_ip = 0.0.0.0
+workers = 2
+
+[pipeline:main]
+pipeline = object-server
+
+[app:object-server]
+use = egg:swift#object
+
+[object-replicator]
+
+[object-updater]
+
+[object-auditor]
+</programlisting>
+<para>Object server configuration files are also looked up under /etc/swift/object-server.conf. Here we can create several object server configuration files each of which would correspond to a device under /srv. The files can be named 1.conf, 2.conf and so on. Here are the contents of /etc/swift/object-server/1.conf:</para>
+<programlisting>
+[DEFAULT]
+devices = /srv/node1
mount_check = false
bind_port = 6010
user = swift
@@ -650,123 +937,90 @@
use = egg:swift#object
[object-replicator]
-vm_test_mode = yes
+vm_test_mode = no
[object-updater]
[object-auditor]
</programlisting>
-<para>We need to create the configuration for the rest of the three virtual nodes (/srv/2/node, /srv/3/node, /srv/4/node ) as well. So we simply make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6020, 6030 and 6040) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
-<programlisting>
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/2.conf
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/3.conf
-sudo cp /etc/swift/object-server/1.conf /etc/swift/object-server/4.conf
-</programlisting>
-<para>Now we need to edit the files 2.conf, etc. created by the above command and edit the bind port number and local log values.</para>
+<para>For the other devices, (/srv/node2, /srv/node3, /srv/node4), we create 2.conf, 3.conf and 4.conf. So we make three more copies of 1.conf and set unique bind ports for the rest of the nodes (6020, 6030 and 6040) and different local log values (LOG_LOCAL3, LOG_LOCAL4, LOG_LOCAL5).</para>
</section>
-<section xml:id="Building_the_rings">
-<title>Building the rings</title>
-<para>Rings are important components of Swift. Run the following commands in the same order for building the rings:</para>
+<section xml:id="Configure_Swift_Rings-d2s758">
+<title>Configure Swift Rings</title>
+<para>Ring is an important component of swift. It maintains the information about the physical location of objects, their replicas and devices. We now create the ring builder files corresponding to object service, container service and account service.</para>
+<para>NOTE: We need to be in the /etc/swift directory when executing the following commands.</para>
<programlisting>
pushd /etc/swift
sudo swift-ring-builder object.builder create 18 3 1
-sudo swift-ring-builder object.builder add z1-127.0.0.1:6010/sdb1 1
-sudo swift-ring-builder object.builder add z2-127.0.0.1:6020/sdb2 1
-sudo swift-ring-builder object.builder add z3-127.0.0.1:6030/sdb3 1
-sudo swift-ring-builder object.builder add z4-127.0.0.1:6040/sdb4 1
+sudo swift-ring-builder container.builder create 18 3 1
+sudo swift-ring-builder account.builder create 18 3 1
+</programlisting>
+<para>The numbers indicate the desired number of partitions, replicas and the time in hours to restrict moving a partition more than once. See the man page for swift-ring-builder for more information.</para>
+<para>Now we add zones and balance the rings. The syntax is as follows:</para>
+<programlisting>
+swift-ring-builder <builder_file> add <zone>-<ip_address>:<port>/<device> <weight>
+</programlisting>
+<para>Execute the following commands to add the zones and rebalance the ring.</para>
+<programlisting>
+sudo swift-ring-builder object.builder add z1-127.0.0.1:6010/device 1
+sudo swift-ring-builder object.builder add z2-127.0.0.1:6020/device 1
+sudo swift-ring-builder object.builder add z3-127.0.0.1:6030/device 1
+sudo swift-ring-builder object.builder add z4-127.0.0.1:6040/device 1
sudo swift-ring-builder object.builder rebalance
-sudo swift-ring-builder container.builder create 18 3 1
-sudo swift-ring-builder container.builder add z1-127.0.0.1:6011/sdb1 1
-sudo swift-ring-builder container.builder add z2-127.0.0.1:6021/sdb2 1
-sudo swift-ring-builder container.builder add z3-127.0.0.1:6031/sdb3 1
-sudo swift-ring-builder container.builder add z4-127.0.0.1:6041/sdb4 1
+sudo swift-ring-builder container.builder add z1-127.0.0.1:6011/device 1
+sudo swift-ring-builder container.builder add z2-127.0.0.1:6021/device 1
+sudo swift-ring-builder container.builder add z3-127.0.0.1:6031/device 1
+sudo swift-ring-builder container.builder add z4-127.0.0.1:6041/device 1
sudo swift-ring-builder container.builder rebalance
-sudo swift-ring-builder account.builder create 18 3 1
-sudo swift-ring-builder account.builder add z1-127.0.0.1:6012/sdb1 1
-sudo swift-ring-builder account.builder add z2-127.0.0.1:6022/sdb2 1
-sudo swift-ring-builder account.builder add z3-127.0.0.1:6032/sdb3 1
-sudo swift-ring-builder account.builder add z4-127.0.0.1:6042/sdb4 1
+sudo swift-ring-builder account.builder add z1-127.0.0.1:6012/device 1
+sudo swift-ring-builder account.builder add z2-127.0.0.1:6022/device 1
+sudo swift-ring-builder account.builder add z3-127.0.0.1:6032/device 1
+sudo swift-ring-builder account.builder add z4-127.0.0.1:6042/device 1
sudo swift-ring-builder account.builder rebalance
</programlisting>
</section>
-<section xml:id="Running_Swift_services">
-<title>Running_Swift_Services</title>
+</section>
+<section xml:id="Starting_Swift_services-d2s760">
+<title>Starting Swift services</title>
+<para>To start swift and the REST API, run the following commands.</para>
<programlisting>
sudo swift-init main start
-</programlisting>
-<para>To start the REST API do the following:</para>
-<programlisting>
sudo swift-init rest start
</programlisting>
</section>
-<section xml:id="Testing_Swift">
+<section xml:id="Testing_Swift-d2s762">
<title>Testing Swift</title>
-<para>As normal user, execute the following command</para>
-<programlisting>
-curl -v -H 'X-Storage-User: admin:admin' -H 'X-Storage-Pass: admin' http://127.0.0.1:8080/auth/v1.0
-</programlisting>
-<para>The output should look like:</para>
-<programlisting>
-* About to connect() to 127.0.0.1 port 8080 (#0)
-* Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 8080 (#0)
-> GET /auth/v1.0 HTTP/1.1
-> User-Agent: curl/7.21.6 (i686-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3
-> Host: 127.0.0.1:8080
-> Accept: */*
-> X-Storage-User: admin:admin
-> X-Storage-Pass: admin
->
-< HTTP/1.1 200 OK
-< X-Storage-Url: http://127.0.0.1:8080/v1/AUTH_admin
-< X-Storage-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
-< X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
-< Content-Length: 0
-< Date: Fri, 14 Oct 2011 15:25:15 GMT
-<
-* Connection #0 to host 127.0.0.1 left intact
-* Closing connection #0
-</programlisting>
-<para>If the above command did not throw any error and gave you an output similar to the one above, then the user accounts are being authenticated fine. Make note of the X-Auth-Token and the X-Storage-Url. Then give the following command to check if you can perform a GET operation successfully:</para>
-<programlisting>
-curl -v -H 'X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900' http://127.0.0.1:8080/v1/AUTH_admin
-</programlisting>
-<para>The output should be similar as follows:</para>
-<programlisting>
-* About to connect() to 127.0.0.1 port 8080 (#0)
-* Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 8080 (#0)
-> GET /v1/AUTH_admin HTTP/1.1
-> User-Agent: curl/7.21.6 (i686-pc-linux-gnu) libcurl/7.21.6 OpenSSL/1.0.0e zlib/1.2.3.4 libidn/1.22 librtmp/2.3
-> Host: 127.0.0.1:8080
-> Accept: */*
-> X-Auth-Token: AUTH_tk441617bc550f4bb7bf51b4dc16800900
->
-< HTTP/1.1 204 No Content
-< X-Account-Object-Count: 0
-< X-Account-Bytes-Used: 0
-< X-Account-Container-Count: 0
-< Accept-Ranges: bytes
-< Content-Length: 0
-< Date: Fri, 14 Oct 2011 15:28:15 GMT
-<
-* Connection #0 to host 127.0.0.1 left intact
-* Closing connection #0
-</programlisting>
-</section>
-</section>
-</section>
-<section xml:id="Server_2-d1e1059">
+<para>Swift can be tested using the swift command or the dashboard web interface (Horizon). Firstly, make sure that the ownership for /etc/swift directory is set to swift.swift.</para>
+<programlisting>
+sudo chown -R swift.swift /etc/swift
+</programlisting>
+<para>Then run the following command and verify if you get the appropriate account information. The number of containers and objects stored within are displayed as well.</para>
+<programlisting>
+swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swift -K swift stat
+StorageURL: http://127.0.0.1:8080/v1/AUTH_c7970080576646c6959ee35970cf3199
+Auth Token: ba9df200a92d4a5088dcd6b7dcc19c0d
+ Account: AUTH_c7970080576646c6959ee35970cf3199
+Containers: 1
+ Objects: 1
+ Bytes: 77
+Accept-Ranges: bytes
+X-Trans-Id: tx11c64e218f984749bc3ec37ea46280ee
+</programlisting>
+</section>
+</section>
+</section>
+
+<section xml:id="Server_2-d2s762">
<title>Server2</title>
- <para>This server runs nova-compute and all the virtual machines and hypervisor. You can also bundle images on Server2.</para>
+<para>This server runs only nova-compute service.</para>
<section xml:id="BaseOS-d1e1064">
<title>BaseOS</title>
-<para>Install 64-bit version of Oneiric Server</para>
+<para>Install 64 bit version of Ubuntu server 12.04</para>
</section>
-<section xml:id="Networking_Configuration-d1e1073">
-<title>Networking Configuration</title>
+<section xml:id="Network_Configuration-d1e1073">
+<title>Network Configuration</title>
<para>Install bridge-utils:</para>
-<programlisting>sudo apt-get install -y bridge-utils</programlisting>
+<programlisting>sudo apt-get install bridge-utils</programlisting>
<para>Edit the /etc/network/interfaces file so as to looks like this:</para>
<programlisting>
auto lo
@@ -778,7 +1032,7 @@
netmask 255.255.255.0
broadcast 10.10.10.255
gateway 10.10.10.1
- dns-nameservers 10.10.10.100
+ dns-nameservers 10.10.8.3
auto eth1
iface eth1 inet static
@@ -787,129 +1041,182 @@
network 192.168.3.0
broadcast 192.168.3.255
</programlisting>
-<para>Restart the network now</para>
+<para>Restart the network.</para>
<programlisting>sudo /etc/init.d/networking restart</programlisting>
</section>
<section xml:id="NTP_Client-d1e1098">
<title>NTP Client</title>
<para>Install NTP package.</para>
-<programlisting>sudo apt-get install -y ntp</programlisting>
+<programlisting>sudo apt-get install ntp</programlisting>
<para>Open the file /etc/ntp.conf and add the following line to sync to server1.</para>
<programlisting>server 10.10.10.2</programlisting>
<para>Restart NTP service to make the changes effective</para>
-<programlisting>sudo /etc/init.d/ntp restart</programlisting>
+<programlisting>sudo service ntp restart</programlisting>
</section>
<section xml:id="Nova_Components_nova-compute_alone_-d1e1123">
<title>Nova Components (nova-compute alone)</title>
<para>Install the nova-components and dependencies.</para>
<programlisting>
-sudo apt-get install -y nova-common python-nova nova-compute vlan
-</programlisting>
-<para>Install euca tools, for command line tools</para>
-<programlisting>sudo apt-get install -y euca2ools</programlisting>
-<para>Install unzip for extracting archives</para>
-<programlisting>
-sudo apt-get install -y unzip
-</programlisting>
-<para>Edit the /etc/nova/nova.conf file to look like this. This file is essentially similar to the configuration file (/etc/nova/nova.conf) of Server1</para>
+sudo apt-get install nova-compute
+</programlisting>
+<para>Edit the /etc/nova/nova.conf file to look like this. This file is identical to the configuration file (/etc/nova/nova.conf) of Server1</para>
<programlisting>
--dhcpbridge_flagfile=/etc/nova/nova.conf
--dhcpbridge=/usr/bin/nova-dhcpbridge
--logdir=/var/log/nova
--state_path=/var/lib/nova
---lock_path=/var/lock/nova
---state_path=/var/lib/nova
---verbose
+--lock_path=/run/lock/nova
+--allow_admin_api=true
+--use_deprecated_auth=false
+--auth_strategy=keystone
+--scheduler_driver=nova.scheduler.simple.SimpleScheduler
--s3_host=10.10.10.2
+--ec2_host=10.10.10.2
--rabbit_host=10.10.10.2
--cc_host=10.10.10.2
---ec2_url=http://10.10.10.2:8773/services/Cloud
---network_size=8
---FAKE_subdomain=ec2
+--nova_url=http://10.10.10.2:8774/v1.1/
--routing_source_ip=10.10.10.2
+--glance_api_servers=10.10.10.2:9292
+--image_service=nova.image.glance.GlanceImageService
+--iscsi_ip_prefix=192.168.4
--sql_connection=mysql://novadbadmin:novasecret@10.10.10.2/nova
---glance_api_servers=192.168.3.1:9292
---image_service=nova.image.glance.GlanceImageService
---iscsi_ip_prefix=192.168.
---vlan_interface=eth1
+--ec2_url=http://10.10.10.2:8773/services/Cloud
+--keystone_ec2_url=http://10.10.10.2:5000/v2.0/ec2tokens
+--api_paste_config=/etc/nova/api-paste.ini
+--libvirt_type=kvm
+--libvirt_use_virtio_for_bridges=true
+--start_guests_on_host_boot=true
+--resume_guests_state_on_host_boot=true
+# vnc specific configuration
+--novnc_enabled=true
+--novncproxy_base_url=http://10.10.10.2:6080/vnc_auto.html
+--vncserver_proxyclient_address=10.10.10.2
+--vncserver_listen=10.10.10.2
+# network specific settings
+--network_manager=nova.network.manager.FlatDHCPManager
+--public_interface=eth0
+--flat_interface=eth1
+--flat_network_bridge=br100
+--fixed_range=192.168.4.1/27
+--floating_range=10.10.10.2/27
+--network_size=32
+--flat_network_dhcp_start=192.168.4.33
+--flat_injected=False
+--force_dhcp_release
+--iscsi_helper=tgtadm
+--connection_type=libvirt
+--root_helper=sudo nova-rootwrap
+--verbose
</programlisting>
<para>Restart nova-compute on Server2.</para>
<programlisting>sudo service restart nova-compute</programlisting>
-<para>On Server1, check if the second compute node (Server2) is detected by running:</para>
-<programlisting>euca-describe-availability-zones verbose</programlisting>
-<para>If you see something like the following with all components happy, it means that the set up is ready to be used.</para>
+<para>Check if the second compute node (Server2) is detected by running:</para>
+<programlisting>sudo nova-manage service list</programlisting>
+<para>If you see an output similar to the following, it means that the set up is ready to be used.</para>
<programlisting>
-AVAILABILITYZONE nova available
-AVAILABILITYZONE |- server1
-AVAILABILITYZONE | |- nova-compute enabled :-) 2011-09-30 09:26:04
-AVAILABILITYZONE | |- nova-scheduler enabled :-) 2011-09-30 09:26:04
-AVAILABILITYZONE | |- nova-network enabled :-) 2011-09-30 09:26:07
-AVAILABILITYZONE | |- nova-volume enabled :-) 2011-09-30 09:26:06
-AVAILABILITYZONE |- server2
-AVAILABILITYZONE | |- nova-compute enabled :-) 2011-09-30 09:26:05
+sudo nova-manage service list
+Binary Host Zone Status State Updated_At
+nova-network server1 nova enabled :-) 2012-04-20 08:58:43
+nova-scheduler server1 nova enabled :-) 2012-04-20 08:58:44
+nova-volume server1 nova enabled :-) 2012-04-20 08:58:44
+nova-compute server1 nova enabled :-) 2012-04-20 08:58:45
+nova-cert server1 nova enabled :-) 2012-04-20 08:58:43
+nova-compute server2 nova enabled :-) 2012-04-21 10:22:27
</programlisting>
-<para>Sometimes you may have XXX instead of the smiley. The XXX are displayed when the components are not time-synced. Ensure time synchronization across all components of your OpenStack deployment.</para>
-</section>
-</section>
-<section xml:id="Client1-d1e1155">
-<title>Client1</title>
-<section xml:id="BaseOS-d1e1160">
-<title>BaseOS</title>
-<para>Install 64-bit version of Oneiric Desktop</para>
-</section>
-<section xml:id="Networking_Configuration-d1e1169">
-<title>Networking Configuration</title>
-<para>Edit the /etc/network/interfaces file so as to looks like this:</para>
-<programlisting>
+</section>
+</section>
+
+ <section xml:id="Client1-d1e1155">
+ <title>Client1</title>
+ <section xml:id="BaseOS-d1e1160">
+ <title>BaseOS</title>
+ <para>Install 64-bit version of Ubuntu 12.04 Desktop</para>
+ </section>
+ <section xml:id="Networking_Configuration-d1e1169">
+ <title>Networking Configuration</title>
+ <para>Edit the /etc/network/interfaces file so as to looks
+ like this:</para>
+ <programlisting>
auto lo
- iface lo inet loopback
+ iface lo inet loopback
auto eth0
- iface eth0 inet static
- address 10.10.10.4
- netmask 255.255.255.0
- broadcast 10.10.10.255
- gateway 10.10.10.1
- dns-nameservers 10.10.10.100
-</programlisting>
-</section>
-<section xml:id="NTP_Client-d1e1181">
-<title>NTP Client</title>
-<para>Install NTP package.</para>
-<programlisting>sudo apt-get install -y ntp
-</programlisting>
-<para>Open the file /etc/ntp.conf and add the following line to sync to server1.</para>
-<programlisting>
+ iface eth0 inet static
+ address 10.10.10.4
+ netmask 255.255.255.0
+ broadcast 10.10.10.255
+ gateway 10.10.10.1
+ dns-nameservers 10.10.8.3
+</programlisting>
+ </section>
+
+ <section xml:id="NTP_Client-d1e1181">
+ <title>NTP Client</title>
+ <para>Install NTP package.</para>
+ <programlisting>sudo apt-get install -y ntp
+</programlisting>
+ <para>Open the file /etc/ntp.conf and add the following line
+ to sync to server1.</para>
+ <programlisting>
server 10.10.10.2
</programlisting>
-<para>Restart NTP service to make the changes effective</para>
-<programlisting>
-sudo /etc/init.d/ntp restart
-</programlisting>
-</section>
-<section xml:id="Client_Tools-d1e1206">
-<title>Client Tools</title>
-<para>As mentioned above, this is a desktop installation of Oneiric to be used for tasks such as bundling of images. It will also be used for managing the cloud infrastructure using euca2ools.</para>
-<para>Install euca tools, for command line tools</para>
-<programlisting>sudo apt-get install -y euca2ools</programlisting>
-<para>Install qemu-kvm</para>
-<programlisting>sudo apt-get install -y qemu-kvm</programlisting>
-<para>Download the credentials we created for localadmin to this machine:</para>
-<programlisting>
-mkdir /home/localadmin/creds
-cd /home/localadmin/creds
-scp localadmin@10.10.10.2:/home/localadmin/creds/novacreds.zip .
-unzip creds.zip
-</programlisting>
-<para>Source novarc file and see if connectivity to api server is working correctly:</para>
-<programlisting>
-source novarc
-euca-describe-availability-zones verbose
-</programlisting>
-<para>The output should be similar to what is shown above in the configuration section for Server1.</para>
-<para>Note: If you want to avoid manually sourcing the novarc file every time, the user can add the following line to the .profile file in his home directory:</para>
-<programlisting>
-source /home/localadmin/creds/novarc
-</programlisting>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+ <para>Restart NTP service to make the changes effective</para>
+ <programlisting>
+sudo service ntp restart
+</programlisting>
+ </section>
+ <section xml:id="Client_Tools-d1e1206">
+ <title>Client Tools</title>
+ <para>As mentioned above, this is a desktop installation of
+ Ubuntu 12.04 to be used for tasks such as bundling of
+ images. It will also be used for managing the cloud
+ infrastructure using nova, glance and swift commandline
+ tools.</para>
+ <para>Install the required command line tools with the
+ following command:</para>
+ <programlisting>sudo apt-get install python-novaclient glance-client swift</programlisting>
+ <para>Install qemu-kvm</para>
+ <programlisting>sudo apt-get install qemu-kvm</programlisting>
+ <para>Export the following environment variables or add them
+ to your ~/.bashrc.</para>
+ <programlisting>
+export SERVICE_TOKEN=admin
+export OS_TENANT_NAME=admin
+export OS_USERNAME=admin
+export OS_PASSWORD=admin
+export OS_AUTH_URL="http://10.10.10.2:5000/v2.0/";
+export SERVICE_ENDPOINT=http://10.10.10.2:35357/v2.0
+</programlisting>
+ <para>Execute nova and glance commands to check the
+ connectivity to OpenStack setup.</para>
+ <programlisting>
+nova list
++--------------------------------------+------------+--------+----------------------+
+| ID | Name | Status | Networks |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | ACTIVE | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.36 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+ <programlisting>
+glance index
+ID Name Disk Container Size
+ Format Format
+------------------------------------ ------------------------------ ----------------
+65b9f8e1-cde8-40e7-93e3-0866becfb9d4 windows qcow2 ovf 7580745728
+f147e666-990c-47e2-9caa-a5a21470cc4e debian qcow2 ovf 932904960
+f3a8e689-02ed-460f-a587-dc868576228f opensuse qcow2 ovf 1072300032
+aa362fd9-7c28-480b-845c-85a5c38ccd86 centoscli qcow2 ovf 1611530240
+49f0ec2b-26dd-4644-adcc-2ce047e281c5 ubuntuimage qcow2 ovf 1471807488
+</programlisting>
+ </section>
+ <section xml:id="Dashboard-d1e1208">
+ <title>OpenStack Dashboard</title>
+ <para>Start a browser and type the ip address of Server1 i.e,
+ http://10.10.10.2. You should see the dashboard login
+ screen. Login with the credentials username - admin and
+ password - admin to manage the OpenStack setup.</para>
+ </section>
+ </section>
+</section>
+</chapter>
+
=== modified file 'Instance.xml'
--- Instance.xml 2011-10-19 14:27:25 +0000
+++ Instance.xml 2012-05-09 21:52:21 +0000
@@ -3,14 +3,14 @@
<section xml:id="Introduction-d1e1651">
<title>Introduction</title>
<para>An instance is a virtual machine provisioned by OpenStack on one of the nova-compute servers.
-When you launch an instance, a series of steps are triggered on various components of the OpenStack.
+When you launch an instance, a series of actions is triggered on various components of the OpenStack.
During the life cycles of an instance, it moves through various stages as shown in the diagram below:
</para>
<para>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="images/lifecycle.png"
- format="PNG" scale="60"/>
+ format="PNG" scale="15"/>
</imageobject>
<imageobject role="html">
<imagedata fileref="images/lifecyclehtml.png"
@@ -19,93 +19,120 @@
</mediaobject></para>
<para>The following interfaces can be used for managing instances in nova.</para>
<itemizedlist>
-<listitem><para>Command line tools like euca2ools</para></listitem>
+<listitem><para>Nova commands</para></listitem>
+<listitem><para>Custom applications developed using Nova APIs</para></listitem>
<listitem><para>Custom applications developed using EC2 APIs</para></listitem>
</itemizedlist>
</section>
-<section xml:id="Euca2ools-Command_Line_Tools-d1e1828">
-<title>Euca2ools-Command Line Tools</title>
-<para>Euca2ools from Eucalyptus provide a bunch of command line tools to manage the eucalyptus setup. These commands help you manage images, instances, storage, networking etc. A few commands related to managing the instances are given below.</para>
-<para>For a complete list of commands, see Appendix.</para>
-<section xml:id="Installation-d1e1839">
-
-<title>Installation</title>
-
-<programlisting>
-sudo apt-get install euca2ools
-</programlisting>
-</section>
+<section xml:id="OpenStack-Command_Line_Tools-d1e1828">
+<title>Openstack Command Line Tools</title>
+<para>Nova has a bunch of command line tools to manage the OpenStack setup. These commands help you manage images, instances, storage, networking etc. A few commands related to managing the instances are given below.</para>
+
<section xml:id="Creation_of_Key_Pairs-d1e1848">
<title>Creation of Key Pairs</title>
-<para>OpenStack expects the client tools to use 2 kinds of credentials. One set of credentials are called Access Key and Secret Key that all clients would need to use to make any requests to the Cloud Controller. Each user registered on the web interface has this set created for him. You can download it from the web interface as mentioned in the chapter on "Web Interface".</para>
+<para>OpenStack services are authenticated and authorized against keystone identity server. Keystone provides a token and a service catolog containing information about the endpoints of services to which a user is authorized. Each user has a token and service catalog created for them. This can be downloaded from the OpenStack Dashboard.</para>
-<para>You will also need to generate a keypair consisting of private key/public key to be able to launch instances on Eucalyptus. These keys are injected into the instances to make password-less SSH access to the instance possible. This depends on the way the necessary tools are bundled into the images. Please refer to the chapter on Image Management for more details. </para>
+<para>You will also need to generate a keypair consisting of private key/public key to be able to launch instances on OpenStack. These keys are injected into the instances to make password-less SSH access to the instance. This depends on the way the necessary tools are bundled into the images. Please refer to the chapter on "Image Management" for more details. </para>
<para>Keypairs can also be generated using the following commands.</para>
<programlisting>
-cd ~/creds
-euca-add-keypair mykey > mykey.priv
-chmod 600 mykey.priv
+ssh-keygen
+cd .ssh
+nova keypair-add --pub_key id_rsa.pub mykey
</programlisting>
-<para>This creates a new keypair called mykey. The private key mykey.priv is saved locally which can be used to connect to an instance launched with mykey as the keypair. euca-describe-keypairs command to list the available keypairs.</para><para>The output should like this:
-</para>
+<para>This creates a new keypair called mykey. The private key id_rsa is saved locally in ~/.ssh which can be used to connect to an instance launched using mykey as the keypair. You can see the available keypairs with nova keypair-list command.</para>
<programlisting>
-uecadmin@client1:~$ euca-describe-keypairs
-KEYPAIR mykey f7:ac:8e:f5:05:19:2b:31:28:8c:9b:d7:b8:07:0c:3c:b6:34:8f:79
-KEYPAIR helloworld 12:96:b3:21:34:8d:6a:3f:92:2e:2b:70:23:ff:7f:51:b5:b7:ad:37
-KEYPAIR ubuntu f6:af:9a:59:65:35:32:c4:3a:c4:62:0e:e1:44:0f:71:29:03:2d:91
-KEYPAIR lucid 74:04:70:33:ed:57:7a:30:36:1f:ca:c6:ec:d5:4f:10:34:1a:52:51
-KEYPAIR karmic 01:f9:aa:5f:4d:20:e2:53:d1:29:d0:0f:e2:f3:8c:21:91:70:7e:c8
+nova keypair-list
++-------+-------------------------------------------------+
+| Name | Fingerprint |
++-------+-------------------------------------------------+
+| mykey | b0:18:32:fa:4e:d4:3c:1b:c4:6c:dd:cb:53:29:13:82 |
+| mykey2 | b0:18:32:fa:4e:d4:3c:1b:c4:6c:dd:cb:53:29:13:82 |
++-------+-------------------------------------------------+
</programlisting>
+<para>Also while executing 'ssh-keygen' you can specify a custom location and custom file names for the keypairs that you want to create.</para>
<para>To delete an existing keypair:</para>
<programlisting>
-euca-delete-keypair helloworld
+nova keypair-delete mykey2
</programlisting>
-<para>The above tasks can be achieved using Hybridfox from the "Keypairs" tab.</para>
</section>
<section xml:id="Launch_and_manage_instances-d1e1885">
<title>Launch and manage instances</title>
<para>There are several commands that help in managing the instances. Here are a few examples:</para>
<programlisting>
-$ euca-run-instances ami-00000003 -k mykey -t m1.tiny
-
-RESERVATION r-f1ek1ojb proj default
-INSTANCE i-00000005 ami-00000003 pending mykey (proj, None) 0 m1.tiny 2011-10-19T12:48:04Z unknown zone ami-00000000 ami-00000000
-</programlisting>
-<programlisting>
-$ euca-describe-instances
-
-RESERVATION r-f1ek1ojb proj default
-INSTANCE i-00000005 ami-00000003 192.168.4.3 192.168.4.3 running mykey (proj, Openstackvalidationserver1) 0 m1.tiny 2011-10-19T12:48:04Z nova ami-00000000 ami-00000000
-</programlisting>
-<programlisting>
-$ euca-reboot-instances i-00000005
-</programlisting>
-<programlisting>
-$ euca-terminate-instances i-00000005
-</programlisting>
-<programlisting>
-$ euca-run-instances ami-XXXXXXXX -k mykey
-</programlisting>
-<programlisting>
-$ euca-get-console-output i-00000005
-
-i-00000005
-2011-10-07T07:22:40.795Z
-[ 0.000000] Initializing cgroup subsys cpuset
-[ 0.000000] Initializing cgroup subsys cpu
-[ 0.000000] Linux version 2.6.32-21-server (buildd@yellow) (gcc version 4.
-4.3 (Ubuntu 4.4.3-4ubuntu5) ) #32-Ubuntu SMP Fri Oct 07 09:17:34 UTC 2011 (Ub
-untu 2.6.32-21.32-server 2.6.32.11+drm33.2)
-.............
-</programlisting>
-<para>You can make password less ssh access to the instance as follows:</para>
-<programlisting>
-ssh -i mykey.priv user@192.168.4.3
+$ nova boot --flavor 1 --image 9bab7ce7-7523-4d37-831f-c18fbc5cb543 --key_name mykey myinstance
++-------------------------------------+--------------------------------------+
+| Property | Value |
++-------------------------------------+--------------------------------------+
+| OS-DCF:diskConfig | MANUAL |
+| OS-EXT-SRV-ATTR:host | None |
+| OS-EXT-SRV-ATTR:hypervisor_hostname | None |
+| OS-EXT-SRV-ATTR:instance_name | instance-00000002 |
+| OS-EXT-STS:power_state | 0 |
+| OS-EXT-STS:task_state | scheduling |
+| OS-EXT-STS:vm_state | building |
+| accessIPv4 | |
+| accessIPv6 | |
+| adminPass | FaUPM6EEBT8F |
+| config_drive | |
+| created | 2012-05-02T19:29:59Z |
+| flavor | m1.tiny |
+| hostId | |
+| id | 25ee9230-6bb5-4eca-8808-e6b4e0348362 |
+| image | ubuntu |
+| key_name | mykey |
+| metadata | {} |
+| name | myinstance |
+| progress | 0 |
+| status | BUILD |
+| tenant_id | 24da687e5d844657996bd5e93d06cb89 |
+| updated | 2012-05-02T19:29:59Z |
+| user_id | 2b64e5ed949145ce92e1fb47224740fe |
++-------------------------------------+--------------------------------------+
+</programlisting>
+<programlisting>
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+| ID | Name | Status | Networks |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | ACTIVE | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.36 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+<programlisting>
+$ nova reboot 25ee9230-6bb5-4eca-8808-e6b4e0348362
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+| ID | Name | Status | Networks |
++--------------------------------------+------------+--------+----------------------+
+| 25ee9230-6bb5-4eca-8808-e6b4e0348362 | myinstance | REBOOT | private=192.168.4.35 |
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.34 |
++--------------------------------------+------------+--------+----------------------+
+</programlisting>
+<programlisting>
+$ nova delete 25ee9230-6bb5-4eca-8808-e6b4e0348362
+$ nova list
++--------------------------------------+------------+--------+----------------------+
+| ID | Name | Status | Networks |
++--------------------------------------+------------+--------+----------------------+
+| c939cb2c-e662-46e5-bc31-453007442cf9 | myinstance1| ACTIVE | private=192.168.4.34 |
++--------------------------------------+------------+--------+----------------------+
+
+</programlisting>
+<programlisting>
+$ nova console-log myinstance
+</programlisting>
+<para>For passwordless ssh access to the instance:</para>
+<programlisting>
+ssh -i <private_key> username@<ip_address>
</programlisting>
<para>VM type has implications for harddisk size, amount of RAM and number of CPUs allocated to the instance. Check the VM types available.</para>
-<programlisting>sudo nova-manage instance_type list</programlisting>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+<programlisting>nova flavor-list</programlisting>
+<para>New flavours can be created with the command.</para>
+<programlisting>sudo nova-manage flavor create <args> [options]</programlisting>
+<para>A flavour can be deleted with the command.</para>
+<programlisting>sudo nova-manage flavor delete <args> [options]</programlisting>
+</section>
+</section>
+</chapter>
=== modified file 'Introduction.xml'
--- Introduction.xml 2011-10-19 14:27:25 +0000
+++ Introduction.xml 2012-05-09 21:52:21 +0000
@@ -9,21 +9,47 @@
<listitem><para>Platform as a Service (PaaS)</para></listitem>
<listitem><para>Software as a Service (SaaS)</para></listitem>
</itemizedlist>
- <para>Amazon Web Services (AWS) is one of the major players providing IAAS. They have two popular services - Elastic Compute Cloud (EC2) and Simple Storage Service (S3). These services are available through web services.</para>
</section>
<section xml:id="OpenStack-d1e94">
<title>OpenStack</title>
- <para>OpenStack is a collection of open source software projects that enterprises/service providers can use to setup and run their cloud compute and storage infrastructure. Rackspace and NASA are the key initial contributors to the stack. Rackspace contributed their "Cloud Files" platform to power the Object Storage part of the OpenStack, while NASA contributed their "Nebula" code to power the Compute part. OpenStack consortium has managed to have more than 100 members including Canonical, Dell, Citrix etc. in less than a year.</para>
- <para>OpenStack makes its services available through Amazon EC2/S3 compatible APIs and hence the client tools written for AWS can be used with OpenStack as well.</para>
- <para>There are 3 main service families under OpenStack</para>
+ <para>OpenStack is a collection of open source software projects that enterprises/service providers can use to setup and run their cloud compute and storage infrastructure. Rackspace and NASA are the key initial contributors to the stack. Rackspace contributed their "Cloud Files" platform (code) to power the Object Storage part of the OpenStack, while NASA contributed their "Nebula" platform (code) to power the Compute part. OpenStack consortium has managed to have more than 150 members including Canonical, Dell, Citrix etc.</para>
+ <para>There are 5 main service families under OpenStack</para>
<itemizedlist>
- <listitem><para>Compute Infrastructure (Nova)</para></listitem>
- <listitem><para>Storage Infrastructure (Swift)</para></listitem>
- <listitem><para>Imaging Service (Glance)</para></listitem>
- </itemizedlist>
+ <listitem><para>Nova - Compute Service</para></listitem>
+ <listitem><para>Swift - Storage Service</para></listitem>
+ <listitem><para>Glance - Imaging Service</para></listitem>
+ <listitem><para>Keystone - Identity Service</para></listitem>
+ <listitem><para>Horizon - UI Service</para></listitem>
+ </itemizedlist>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/architecture.png"
+ format="PNG" scale="12"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/architecturehtml.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+<para>The below diagram shows a simple representation of interaction between keystone and dashboard with the remaining OpenStack components.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/keystone_dashboard.png"
+ format="PNG" scale="9"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/keystone_dashboardhtml.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+
<section xml:id="Open_Stack_Compute_Infrastructure_Nova_-d1e124">
- <title>Open Stack Compute Infrastructure ( Nova )</title>
- <para>Nova is the underlying cloud computing fabric controller for the OpenStack cloud. All activities needed to support the life cycle of instances within the OpenStack cloud are handled by Nova. It manages all the compute resources, networking, authorization, and scalability needs of the OpenStack cloud. Nova is a management platform and does not provide any virtualization capabilities by itself; instead, it uses libvirt APIs to interact with the supported hypervisors. Nova exposes its capabilities through a web services API that is compatible with that of EC2 of Amazon Web Services.</para>
+ <title>Open Stack Compute Infrastructure (Nova)</title>
+ <para>Nova is the Computing Fabric controller for the OpenStack Cloud. All activities needed to support the life cycle of instances within the OpenStack cloud are handled by Nova. This makes Nova a Management Platform that manages compute resources, networking, authorization, and scalability needs of the OpenStack cloud. But, Nova does not provide any virtualization capabilities by itself; instead, it uses libvirt API to interact with supported hypervisors. Nova exposes all its capabilities through a web services API that is compatible with the EC2 API of Amazon Web Services.</para>
<section xml:id="Functions_and_Features-d1e132">
<title>Functions and Features:</title>
<itemizedlist>
@@ -39,49 +65,37 @@
<title>Components of OpenStack Compute</title>
<para>Nova Cloud Fabric is composed of the following major components:</para>
<itemizedlist>
- <listitem><para>API Server ( nova-api )</para></listitem>
- <listitem><para>Message Queue ( rabbit-mq server )</para></listitem>
- <listitem><para>Compute Workers ( nova-compute )</para></listitem>
- <listitem><para>Network Controller ( nova-network )</para></listitem>
- <listitem><para>Volume Worker ( nova-volume )</para></listitem>
- <listitem><para>Scheduler ( nova-scheduler )</para></listitem>
+ <listitem><para>API Server (nova-api)</para></listitem>
+ <listitem><para>Message Queue (rabbit-mq server)</para></listitem>
+ <listitem><para>Compute Workers (nova-compute)</para></listitem>
+ <listitem><para>Network Controller (nova-network)</para></listitem>
+ <listitem><para>Volume Worker (nova-volume)</para></listitem>
+ <listitem><para>Scheduler (nova-scheduler)</para></listitem>
</itemizedlist>
-<para>
-<mediaobject>
- <imageobject role="fo">
- <imagedata fileref="images/Arch.png"
- format="PNG" scale="60"/>
- </imageobject>
- <imageobject role="html">
- <imagedata fileref="images/Archhtml.png"
- format="PNG" />
- </imageobject>
-</mediaobject>
-</para>
<section xml:id="API_Server_nova-api_-d1e213">
- <title>API Server ( nova-api )</title>
- <para>The API Server provides an interface to the outside world to interact with the cloud infrastructure. API server is the only component that the outside world uses to manage the infrastructure. The management is done through web services calls using EC2 API. The API Server then, in turn, communicates with the relevant components of the cloud infrastructure through the Message Queue. Also there is an OpenStack API as well now, as an alternative to the EC2 API.</para>
+ <title>API Server (nova-api)</title>
+ <para>The API Server provides an interface for the outside world to interact with the cloud infrastructure. API server is the only component that the outside world uses to manage the infrastructure. The management is done through web services calls using EC2 API. The API Server then, in turn, communicates with the relevant components of the cloud infrastructure through the Message Queue. As an alternative to EC2 API, OpenStack also provides a native API called "OpenStack API".</para>
</section>
<section xml:id="Message_Queue_Rabbit_MQ_Server_-d1e223">
- <title>Message Queue ( Rabbit MQ Server )</title>
- <para>The OpenStack Cloud Controller communicates with other nova components such as the Scheduler, Network Controller, and Volume Controller via AMQP(Advanced Message Queue Protocol). Nova uses asynchronous calls for request response, with a call-back that gets triggered once a response is received. Since asynchronous communication is used, none of the end points get stuck for long in a waiting state. This is especially true since many actions expected by the API calls such as launching an instance or uploading an image are time consuming.</para>
+ <title>Message Queue (Rabbit MQ Server)</title>
+ <para>OpenStack communicates among themselves using the message queue via AMQP(Advanced Message Queue Protocol). Nova uses asynchronous calls for request response, with a call-back that gets triggered once a response is received. Since asynchronous communication is used, none of the user actions get stuck for long in a waiting state. This is effective since many actions expected by the API calls such as launching an instance or uploading an image are time consuming.</para>
</section>
<section xml:id="Compute_Worker_nova-compute_-d1e232">
- <title>Compute Worker ( nova-compute )</title>
- <para>Compute workers deal with instance management life cycle. they receive the requests for life cycle management via the Message Queue and carry out operations. There are several Compute Workers in a typical production cloud deployment. An instance is deployed on any of the available compute worker based on the scheduling algorithm used.</para>
+ <title>Compute Worker (nova-compute)</title>
+ <para>Compute workers deal with instance management life cycle. They receive the requests for instance life cycle management via the Message Queue and carry out operations. There are several compute workers in a typical production cloud deployment. An instance is deployed on any of the available compute worker based on the scheduling algorithm used.</para>
</section>
<section xml:id="Network_Controller_nova-network_-d1e241">
- <title>Network Controller ( nova-network )</title>
+ <title>Network Controller (nova-network)</title>
<para>The Network Controller deals with the network configuration of host machines. It does operations like allocating IP addresses, configuring VLANs for projects, implementing security groups and configuring networks for compute nodes.</para>
</section>
<section xml:id="Volume_Workers_nova-volume_-d1e250">
- <title>Volume Workers ( nova-volume )</title>
- <para>Volume workers are used for the management of LVM-based instance volumes. Volume Workers perform volume related functions such as creation, deletion, attaching a volume to an instance, and detaching a volume from an instance. Volumes provide a way of providing persistent storage for use by instances, as the main disk attached to an instance is non-persistent and any changes made to it are lost when the volume is detached or the instance is terminated. When a volume is detached from an instance or when an instance, to which the volume is attached, is terminated, it retains the data that was stored on it when it was attached to an instance earlier. This data can be accessed by reattaching the volume to the same instance or by attaching it to another instances.</para>
- <para>Any valuable data that gets accumulated during the life cycle of an instance should be written to a volume, so that it can be accessed later. This typically applies to the storage needs of database servers etc.</para>
+ <title>Volume Workers (nova-volume)</title>
+ <para>Volume workers are used for management of LVM-based instance volumes. Volume Workers perform volume related functions such as creation, deletion, attaching a volume to an instance, and detaching a volume from an instance. Volumes provide a way of providing persistent storage for the instances, as the root partition is non-persistent and any changes made to it are lost when an instance is terminated. When a volume is detached from an instance or when an instance, to which the volume is attached, is terminated, it retains the data that was stored on it. This data can be accessed by re-attaching the volume to the same instance or by attaching it to other instances.</para>
+ <para>Critical data in an instance must always be written to a volume, so that it can be accessed later. This typically applies to the storage needs of database servers etc.</para>
</section>
<section xml:id="Scheduler_nova-scheduler_-d1e262">
<title>Scheduler (nova-scheduler)</title>
- <para>The scheduler maps the nova-API calls to the appropriate openstack components. It runs as a daemon named nova-schedule and picks up a compute/network/volume server from a pool of available resources depending upon the scheduling algorithm in place. A scheduler can base its decisions on various factors such as load, memory, physical distance of the availability zone, CPU architecture, etc. The nova scheduler implements a pluggable architecture.</para>
+ <para>The scheduler maps the nova-API calls to the appropriate OpenStack components. It runs as a daemon named nova-schedule and picks up a compute server from a pool of available resources depending on the scheduling algorithm in place. A scheduler can base its decisions on various factors such as load, memory, physical distance of the availability zone, CPU architecture, etc. The nova scheduler implements a pluggable architecture.</para>
<para>Currently the nova-scheduler implements a few basic scheduling algorithms:</para>
<itemizedlist>
<listitem><para>chance: In this method, a compute host is chosen randomly across availability zones.</para></listitem>
@@ -91,9 +105,35 @@
</section>
</section>
</section>
+
+<section xml:id="OpenStack_Imaging_Service_Glance_-d1e329">
+ <title>OpenStack Imaging Service (Glance)</title>
+ <para>OpenStack Imaging Service is a lookup and retrieval system for virtual machine images. It can be configured to use any one of the following storage backends:</para>
+ <itemizedlist>
+ <listitem><para>Local filesystem (default)</para></listitem>
+ <listitem><para>OpenStack Object Store to store images</para></listitem>
+ <listitem><para>S3 storage directly</para></listitem>
+ <listitem><para>S3 storage with Object Store as the intermediate for S3 access.</para></listitem>
+ <listitem><para>HTTP (read-only)</para></listitem>
+ </itemizedlist>
+ <section xml:id="Functions_and_Features_Glance_-d1e352">
+ <title>Functions and Features</title>
+ <itemizedlist>
+ <listitem><para>Provides imaging service</para></listitem>
+ </itemizedlist>
+ </section>
+ <section xml:id="Components_of_OpenStack_Imaging_Service_Glance_-d1e365">
+ <title>Components of Glance</title>
+ <itemizedlist>
+ <listitem><para>Glance-control</para></listitem>
+ <listitem><para>Glance-registry</para></listitem>
+ </itemizedlist>
+ </section>
+</section>
+
<section xml:id="OpenStack_Storage_Infrastructure_Swift_-d1e271">
<title>OpenStack Storage Infrastructure (Swift)</title>
- <para>Swift provides a distributed, eventually consistent virtual object store for OpenStack. It is analogous to Amazon Web Services - Simple Storage Service (S3). Swift is capable of storing billions of objects distributed across nodes. Swift has built-in redundancy and failover management and is capable of archiving and media streaming. It is extremely scalable in terms of both size (Several petabytes) and capacity (Number of objects).</para>
+ <para>Swift provides a distributed, eventually consistent virtual object store for OpenStack. It is analogous to Amazon Web Services - Simple Storage Service (S3). Swift is capable of storing billions of objects distributed across nodes. Swift has built-in redundancy and failover management and is capable of archiving and media streaming. It is extremely scalable in terms of both size (several petabytes) and capacity (number of objects).</para>
<section xml:id="Functions_and_Features-d1e279">
<title>Functions and Features</title>
<itemizedlist>
@@ -101,7 +141,7 @@
<listitem><para>Storage of large sized objects</para></listitem>
<listitem><para>Data Redundancy</para></listitem>
<listitem><para>Archival capabilities - Work with large datasets</para></listitem>
- <listitem><para>Data container for virtial machines and cloud apps</para></listitem>
+ <listitem><para>Data container for virtual machines and cloud apps</para></listitem>
<listitem><para>Media Streaming capabilities</para></listitem>
<listitem><para>Secure storage of objects</para></listitem>
<listitem><para>Backup and archival</para></listitem>
@@ -125,7 +165,7 @@
<para>The proxy server also handles failures of entities by rerouting requests to failover entities (handoff entities)</para>
</section>
- <section xml:id="Swift_Object_Server-d1e291">
+<section xml:id="Swift_Object_Server-d1e291">
<title>Swift Object Server</title>
<para>The Object server is a blob store. It's responsibility is to handle storage, retrieval and deletion of objects stored in the local storage. Objects are typically binary files stored in the filesystem with metadata contained as extended file attributes (xattr).</para>
@@ -143,28 +183,58 @@
<title>The Ring</title>
<para>The ring contains information about the physical location of the objects stored inside Swift. It is a virtual representation of mapping of names of entities to their real physical location. It is analogous to an indexing service that various processes use to lookup and locate the real physical location of entities within the cluster. Entities like Accounts, Containers, Objects have their own seperate rings.</para>
</section>
- </section>
- <section xml:id="OpenStack_Imaging_Service_Glance_-d1e329">
- <title>OpenStack Imaging Service ( Glance )</title>
- <para>OpenStack Imaging Service is a lookup and retrieval system for virtual machine images. It can be configured to use any one of the following 3 storage backends:</para>
- <itemizedlist>
- <listitem><para>OpenStack Object Store to store images</para></listitem>
- <listitem><para>S3 storage directly</para></listitem>
- <listitem><para>S3 storage with Object Store as the intermediate for S3 access.</para></listitem>
- </itemizedlist>
- <section xml:id="Functions_and_Features_Glance_-d1e352">
- <title>Functions and Features ( Glance )</title>
- <itemizedlist>
- <listitem><para>Provides imaging service</para></listitem>
- </itemizedlist>
- </section>
- <section xml:id="Components_of_OpenStack_Imaging_Service_Glance_-d1e365">
- <title>Components of OpenStack Imaging Service ( Glance )</title>
- <itemizedlist>
- <listitem><para>Glance-control</para></listitem>
- <listitem><para>Glance-registry</para></listitem>
- </itemizedlist>
- </section>
- </section>
-</section>
-</chapter>
\ No newline at end of file
+</section>
+
+<section xml:id="Openstack_Identity_server-d1e325">
+ <title>OpenStack Identity Service (Keystone)</title>
+ <para>Keystone provides identity and access policy services for all components in the OpenStack family. It implements it's own REST based API (Identity API). It provides authentication and authorization for all components of OpenStack including (but not limited to) Swift, Glance, Nova. Authentication verifies that a request actually comes from who it says it does. Authorization is verifying whether the authenticated user has access to the services he/she is requesting for.</para>
+<para>
+<mediaobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/keystone.png"
+ format="PNG" scale="15"/>
+ </imageobject>
+ <imageobject role="html">
+ <imagedata fileref="images/keystonehtml.png"
+ format="PNG" />
+ </imageobject>
+</mediaobject>
+</para>
+ <para>Keystone provides two ways of authentication. One is username/password based and the other is token based. Apart from that, keystone provides the following services:</para>
+ <itemizedlist>
+ <listitem><para>Token Service (that carries authorization information about an authenticated user)</para></listitem>
+ <listitem><para>Catalog Service (that contains a list of available services at the users' disposal)</para></listitem>
+ <listitem><para>Policy Service (that let's keystone manage access to specific services by specific users or groups).</para></listitem>
+ </itemizedlist>
+ <section xml:id="OpenStack_Identity_server_components-d1e328">
+ <title>Components of Identity Service</title>
+ <itemizedlist>
+ <listitem><para>Endpoints - Every OpenStack service (Nova, Swift, Glance) runs on a dedicated port and on a dedicated URL(host), we call them endpoints.</para></listitem>
+ <listitem><para>Regions - A region defines a dedicated physical location inside a data centre. In a typical cloud setup, most if not all services are distributed across data centers/servers which are also called regions</para></listitem>
+ <listitem><para>User - A keystone authenticated user.</para></listitem>
+ <listitem><para>Services - Each component that is being connected to or being administered via keystone can be called a service. For example, we can call Glance a keystone service.</para></listitem>
+ <listitem><para>Role - In order to maintain restrictions as to what a particular user can do inside cloud infrastructure it is important to have a role associated.</para></listitem>
+ <listitem><para>Tenant - A tenant is a project with all the service endpoint and a role associated to user who is member of that particular tenant.</para></listitem>
+ </itemizedlist>
+ </section>
+</section>
+
+<section xml:id="Openstack_Web_Interface-d1e340">
+ <title>Openstack Administrative Web-Interface (Horizon)</title>
+ <para>Horizon the web based dashboard can be used to manage /administer OpenStack services. It can be used to manage instances and images, create keypairs, attach volumes to instances, manipulate Swift containers etc. Apart from this, dashboard even gives the user access to instance console and can connect to an instance through VNC. Overall, Horizon features the following:</para>
+ <itemizedlist>
+ <listitem><para>Instance Management - Create or terminate instance, view console logs and connect through VNC, Attaching volumes, etc.</para></listitem>
+ <listitem><para>Access and Security Management - Create security groups, manage keypairs, assign floating IPs, etc.</para></listitem>
+ <listitem><para>Flavor Management - Manage different flavors or instance virtual hardware templates.</para></listitem>
+ <listitem><para>Image Management - Edit or delete images.</para></listitem>
+ <listitem><para>View service catalog.</para></listitem>
+ <listitem><para>Manage users, quotas and usage for projects.</para></listitem>
+ <listitem><para>User Management - Create user, etc.</para></listitem>
+ <listitem><para>Volume Management - Creating Volumes and snapshots.</para></listitem>
+ <listitem><para>Object Store Manipulation - Create, delete containers and objects.</para></listitem>
+ <listitem><para>Downloading environment variables for a project.</para></listitem>
+ </itemizedlist>
+</section>
+
+</section>
+</chapter>
=== modified file 'Network.xml'
--- Network.xml 2011-10-19 14:27:25 +0000
+++ Network.xml 2012-05-09 21:52:21 +0000
@@ -3,15 +3,15 @@
<title>Network Management</title>
<section xml:id="Introduction-d1e2084">
<title>Introduction</title>
- <para>In OpenStack, the networking is managed by a component called "nova-network". This interacts with nova-compute to ensure that the instances have the right kind of networking setup for them to communicate among themselves as well as with the outside world. Just as in Eucalyptus or AWS, each OpenStack instance can have 2 IP addresses attached to it. One is the private IP address and the other called Public IP address. The private IP address is typically used for communication between instances and the public IP is used for communication of instances with the outside world. The so called public IP address need not be a public IP address route-able on the Internet ; it can even be an address on the corporate LAN.</para>
- <para>The network configuration inside the instance is done with the private IP address in view. The association between the private IP and the public IP and necessary routing is handled by nova-network and the instances need not be aware of it.</para>
+ <para>In OpenStack, the networking is managed by a component called "nova-network". This interacts with nova-compute to ensure that the instances have the right kind of networking setup for them to communicate among themselves as well as with the outside world. OpenStack instances can have 2 types of IP addresses associated to it: Private IP address (fixed) and Public IP address (floating). Private IP addresses are typically used for communication between instances (internal) and public IP addresses are used for communication of instances with the outside world (external or Internet). The so-called public IP addresses need not necessarily be IP addresses route-able on the Internet ; they can even be addresses on a corporate LAN.</para>
+ <para>The network configurations inside the instances are done with private IP addresses in view. The association between the private IP and the public IP addresses and necessary routing are handled by nova-network and the instances need not be aware of them.</para>
<para>nova-network provides 3 different network management options. Currently you can only choose one of these 3 options for your network management.</para>
<itemizedlist>
<listitem><para>Flat Network</para></listitem>
<listitem><para>Flat DHCP Network</para></listitem>
<listitem><para>VLAN Network</para></listitem>
</itemizedlist>
- <para>VLAN Network is the most feature rich and is the idea choice for a production deployment, while the other modes can be used while getting familiar with OpenStack and when you do not have VLAN Enabled switches to connect different components of the OpenStack infrastructure.</para>
+ <para>VLAN Network is the most feature rich and is the ideal choice for a production deployment, while the other modes can be used while getting familiar with OpenStack and when you do not have VLAN Enabled switches to connect different components of the OpenStack infrastructure.</para>
<para>The network type is chosen by using one of the following configuration options in nova.conf file. If no network manager is specified explicitly, the default network manager, VLANManager is used.</para>
<programlisting>
--network_manager = nova.network.manager.FlatManager
@@ -20,17 +20,21 @@
</programlisting>
<para>In each of these cases, run the following commands to set up private and public IP addresses for use by the instances:</para>
<programlisting>
- sudo nova-manage network create private 192.168.4.0/24 1 256
+ sudo nova-manage network create private --fixed_range_v4=192.168.4.3/27 --num_networks=1 --bridge=br100 --bridge_interface=eth1 --network_size=32
sudo nova-manage floating create --ip_range=10.10.10.224/27
</programlisting>
- <para>The public IP which you are going to associate with an instance needs to be allocated first by using "euca-allocate-address" command:</para>
- <programlisting>
- euca-allocate-address 10.10.2.225
- </programlisting>
- <para>You can then associate a public IP to a running instance by using "euca-associate-address" command:</para>
- <programlisting>
- euca-associate-address -i i-0000008 10.10.2.225
- </programlisting>
- <para>Please refer to http://docs.openstack.org/openstack-compute/admin/content/ch04.html for more details about each of the networking types.</para>
+ <para>The public IP which you are going to associate with an instance needs to be allocated first by using the command:</para>
+ <programlisting>
+ nova floating-ip-create
+ +----------------+-------------+----------+------+
+ | Ip | Instance Id | Fixed Ip | Pool |
+ +----------------+-------------+----------+------+
+ | 10.10.10.225 | None | None | nova |
+ +----------------+-------------+----------+------+
+ </programlisting>
+ <para>You can then associate a public IP to a running instance by using the command:</para>
+ <programlisting>
+ nova add-floating-ip <instance-name> 10.10.2.225
+ </programlisting>
</section>
</chapter>
=== modified file 'Openstackbook.xml'
--- Openstackbook.xml 2011-10-19 14:27:25 +0000
+++ Openstackbook.xml 2012-05-09 21:52:21 +0000
@@ -3,9 +3,8 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:svg="http://www.w3.org/2000/svg";
- xmlns:html="http://www.w3.org/1999/xhtml";
- version="5.0"
- >
+ xmlns:html="http://www.w3.org/1999/xhtml"; version="5.0"
+ xml:id="book_ygy_znp_2g">
<title>OpenStack Compute Starter Guide</title>
<info>
<author>
@@ -18,29 +17,33 @@
</affiliation>
</author>
<copyright>
- <year>2011</year>
- <holder>CSS Corp Private Limited ( http://www.csscorp.com/ )</holder>
+ <year>2012</year>
+ <holder>CSS Corp Private Limited
+ (http://www.csscorp.com/)</holder>
</copyright>
- <releaseinfo>diablo</releaseinfo>
+ <releaseinfo>essex</releaseinfo>
<productname>OpenStack Compute</productname>
- <pubdate>2011-10-19</pubdate>
+ <pubdate>2012-05-04</pubdate>
<legalnotice role="cc-by-nc-sa">
<annotation>
- <remark>Remaining licensing details are filled in by the template.</remark>
+ <remark>Rest of the licensing details are filled in by the
+ template.</remark>
</annotation>
</legalnotice>
<abstract>
- <para>This is a tutorial style beginner's guide for OpenStack™ on Ubuntu 11.10, Oneiric Ocelot.
- The aim is to help the reader in setting up a minimal installation of OpenStack. </para>
+ <para>This is a tutorial style beginner's guide for OpenStack™
+ on Ubuntu 12.04, Precise Pangolin. The aim is to help the
+ reader in setting up a minimal installation of OpenStack.
+ </para>
</abstract>
</info>
-<xi:include href="Introduction.xml" />
-<xi:include href="Installation.xml"/>
-<xi:include href="Image.xml"/>
-<xi:include href="Instance.xml"/>
-<xi:include href="Storage.xml"/>
-<xi:include href="Network.xml"/>
-<xi:include href="Security.xml"/>
-<xi:include href="Commands.xml"/>
-
+ <xi:include href="Introduction.xml"/>
+ <xi:include href="Installation.xml"/>
+ <xi:include href="Image.xml"/>
+ <xi:include href="Instance.xml"/>
+ <xi:include href="Dashboard.xml"/>
+ <xi:include href="Storage.xml"/>
+ <xi:include href="Network.xml"/>
+ <xi:include href="Security.xml"/>
+ <xi:include href="Commands.xml"/>
</book>
=== modified file 'README'
--- README 2011-09-27 13:32:13 +0000
+++ README 2012-05-09 21:52:21 +0000
@@ -1,9 +1,9 @@
-OpenStack Beginner's Guide for Ubuntu 11.10, Oneiric Ocelot
-===========================================================
-
-Copy Right: CSS Corp Private Limited ( http://www.csscorp.com/ ), 2011
-
-This is a tutorial style Beginner's guide for OpenStack on Ubuntu 11.04.
+OpenStack Beginner's Guide for Ubuntu 12.04, Precise Pangolin
+=============================================================
+
+Copy Right: CSS Corp Private Limited ( http://www.csscorp.com/ ), 2012
+
+This is a tutorial style Beginner's guide for OpenStack on Ubuntu 12.04.
The aim is to help the reader in setting up a minimal installation of OpenStack.
The content is released under Creative Commons - Share Alike Attribution License.
=== modified file 'Security.xml'
--- Security.xml 2011-10-19 14:27:25 +0000
+++ Security.xml 2012-05-09 21:52:21 +0000
@@ -2,51 +2,55 @@
<title>Security</title>
<section xml:id="Security_Overview-d1e2505">
<title>Security Overview</title>
-<para>OpenStack provides ingress filtering for the instances based on the concept of security groups. OpenStack accomplishes ingress filtering by creating suitable IP Tables rules. A Security Group is a named set of rules that get applied to the incoming packets for the instances. You can specify a security group while launching an instance. Each security group can have multiple rules associated with it. Each rule specifies the source IP/network, protocol type, destination ports etc. Any packet matching these parameters specified in a rule is allowed in. Rest of the packets are blocked.</para>
-<para>A security group that does not have any rules associated with it causes blocking of all incoming traffic. The mechanism only provides ingress filtering and does not provide any egress filtering. As a result all outbound traffic is allowed. If you need to implement egress filtering, you will need to implement that inside the instance using a firewall.</para>
-<para>Tools like Hybridfox let you manage security groups and also let you specify a security group while launching an instance. You can also use command line tools from euca2ools package such as euca-authorize for this purpose.</para>
-<para>Here are a few euca commands to manage security groups. Like in our earlier chapters, the project name is "proj"</para>
+<para>OpenStack provides ingress filtering for the instances based on the concept of security groups. OpenStack accomplishes ingress filtering by creating suitable iptables rules. A Security Group is a named set of rules that get applied to the incoming packets for the instances. You can specify a security group while launching an instance. Each security group can have multiple rules associated with it. Each rule specifies the source IP/network, protocol type, destination ports etc. Any packet matching these parameters specified in a rule is allowed in. Rest of the packets are blocked.</para>
+<para>A security group that does not have any rules associated with it causes blocking of all incoming traffic. The mechanism only provides ingress filtering and does not provide any egress filtering. As a result all outbound traffic is allowed. If you need to implement egress filtering, you will need to implement that inside the instance (during bundling process) using a firewall.</para>
+<para>The OpenStack Dashboard lets you manage security groups and also let you specify a security group while launching an instance. You can also use commands like 'nova secgroup-add-rule' etc. for this purpose.</para>
+<para>Here are a few nova commands to manage security groups.</para>
<para>Create a security group named "myservers".</para>
<programlisting>
-euca-add-group -d "My Servers" myservers
+nova secgroup-create <name> <description>
+nova secgroup-create myservers my-default-server-group
</programlisting>
<para>Add a rule to the security group "myservers" allowing icmp and tcp traffic from 192.168.1.1.</para>
<programlisting>
-euca-authorize -P tcp -s 192.168.1.1 -p 22 myservers
-euca-authorize -P icmp -s 192.168.1.1 -t -1:-1 myservers
+nova secgroup-add-rule myservers tcp 22 22 192.168.1.1/0
+nova secgroup-add-rule myservers icmp -1 -1 192.168.1.1/0
</programlisting>
<para>For a Windows instance, add a rule to accept incoming RDP connections</para>
<programlisting>
-euca-authorize -P tcp -s 192.168.1.1 -p 3389 myservers
+nova secgroup-add-rule myservers tcp 3389 3389 192.168.1.1/0
</programlisting>
-<para>Rules can be viewed with euca-describe-groups command.</para>
+<para>Rules can be viewed with the command.</para>
<programlisting>
-$ euca-describe-groups
-GROUP proj myservers my servers
-PERMISSION proj myservers ALLOWS tcp 22 22 FROM CIDR 192.168.1.1
-PERMISSION proj myservers ALLOWS icmp -1 -1 FROM CIDR 192.168.1.1
-PERMISSION proj myservers ALLOWS tcp 3389 3389 FROM CIDR 192.168.1.1
+$ nova secgroup-list-rules myservers
++-------------+-----------+---------+--------------+--------------+
+| IP Protocol | From Port | To Port | IP Range | Source Group |
++-------------+-----------+---------+--------------+--------------+
+| | | | | |
+| icmp | -1 | -1 |192.168.1.1/0 | myservers |
+| tcp | 22 | 22 |192.168.1.1/0 | myservers |
++-------------+-----------+---------+--------------+--------------+
</programlisting>
<para>Remove the rule for ssh traffic from the source ip 192.168.1.1 from the security group "myservers"</para>
<programlisting>
-euca-revoke -P tcp -s 192.168.1.1 -p 22 myservers
+nova secgroup-delete-rule myservers ssh 22 22 192.168.1.1
</programlisting>
<para>Delete the security group "myservers"</para>
<programlisting>
-euca-delete-group myservers
+nova secgroup-delete myservers
</programlisting>
<para>Launch an instance associated with the security group "myservers".</para>
<programlisting>
-euca-run-instances ami-XXXXXXXX -k mykey -g myservers
+nova boot --flavor 1 --image 9bab7ce7-7523-4d37-831f-c18fbc5cb543 --key_name mykey myinstance --security_groups myservers
</programlisting>
-<para>When you do not specify a security group, the instance gets associated with an inbuilt security group called "default". The rules for this security group can also be modified using euca-add, euca-revoke commands.</para>
+<para>When you do not specify a security group, the instance gets associated with an inbuilt security group called "default". The rules for this security group can also be modified using nova secgroup-add-rule , nova secgroup-delete-rule commands.</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
=== modified file 'Storage.xml'
--- Storage.xml 2011-10-19 14:27:25 +0000
+++ Storage.xml 2012-05-09 21:52:21 +0000
@@ -1,91 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?><chapter xmlns:db="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xml:id="Storage_Management-d1e1995" version="5.0" xml:base="Storage.xml">
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter xmlns:db="http://docbook.org/ns/docbook"; xmlns="http://docbook.org/ns/docbook"; xml:id="Storage_Management-chapter" version="5.0" xml:base="Storage.xml">
<title>Storage Management</title>
<section xml:id="Nova-volume-d1e2000">
<title>Nova-volume</title>
-<para>Nova-volume provides persistent block storage compatible with Amazon's Elastic Block Store. The storage on the instances is non persistent in nature and hence any data that you generate and store on the file system on the first disk of the instance gets lost when the instance is terminated. You will need to use persistent volumes provided by nova-volume if you want any data generated during the life of the instance to persist after the instance is terminated.</para>
-<para>Commands from euca2ools package can be used to manage these volumes.</para>
+<para>Nova-volume provides persistent block storage compatible with Amazon's Elastic Block Store. The storage on the instances is non-persistent by nature and hence any data that are generated and stored on the file system on the first disk of the instance are lost when the instance is terminated. You will need to use persistent volumes provided by nova-volume if you want any data generated during the life of the instance to persist after the instance is terminated.</para>
+<para>Nova commands can be used to manage these volumes.</para>
<para>Here are a few examples:</para>
<section xml:id="Interacting_with_Storage_Controller-d1e2014">
<title>Interacting with Storage Controller</title>
<para>Make sure that you have sourced novarc before running any of the following commands. The following commands refer to a zone called 'nova', which we created in the chapter on "Installation and Configuration". The project is 'proj' as referred to in the other chapters.</para>
<para>Create a 10 GB volume</para>
-<programlisting>euca-create-volume -s 10 -z nova</programlisting>
-<para>You should see an output like:</para>
-<programlisting>VOLUME vol-00000002 1 creating (proj, None, None, None) 2011-04-21T07:19:52Z</programlisting>
+<programlisting>nova volume-create --display_name myvolume 10</programlisting>
<para>List the volumes</para>
-<programlisting>euca-describe-volumes</programlisting>
+<programlisting>nova volume-list</programlisting>
<para>You should see an output like this:</para>
-<programlisting>VOLUME vol-00000001 1 nova available (proj, server1, None, None) 2011-04-21T05:11:22Z</programlisting>
-<programlisting>VOLUME vol-00000002 1 nova available (proj, server1, None, None) 2011-04-21T07:19:52Z</programlisting>
+<programlisting>
++----+-----------+--------------+------+-------------+--------------------------------------+
+| ID | Status | Display Name | Size | Volume Type | Attached to |
++----+-----------+--------------+------+-------------+--------------------------------------+
+| 1 | in-use | New Volume | 20 | None | 7db4cb64-7f8f-42e3-9f58-e59c9a31827d |
+| 4 | available | volume1 | 10 | None | |
+| 5 | available | myvolume | 10 | None | |
+| 6 | available | myvolume1 | 10 | None | |
++----+-----------+--------------+------+-------------+--------------------------------------+
+</programlisting>
<para>Attach a volume to a running instance</para>
-<programlisting>euca-attach-volume -i i-00000009 -d /dev/vdb vol-00000002</programlisting>
-<para>A volume can only be attached to one instance at a time. When euca-describe-volumes shows the status of a volume as 'available', it means it is not attached to any instance and ready to be used. If you run euca-describe-volumes, you can see that the status changes from "available" to "in-use" if it is attached to an instance successfully.</para>
-<para>When a volume is attached to an instance, it shows up as an additional SCSI disk on the instance. You can login to the instance and mount the disk, format it and use it.</para>
+<programlisting>nova volume-attach 857d70e4-35d5-4bf6-97ed-bf4e9a4dcf5a <volume-id> /dev/vdb</programlisting>
+<para>A volume can only be attached to one instance at a time. When nova volume-list shows the status of a volume as 'available', it means it is not attached to any instance and ready to be used. If you run nova volume-list, you can see that the status changes from "available" to "in-use" if it is attached to an instance successfully.</para>
+<para>When a volume is attached to an instance, it shows up as an additional disk on the instance. You can login to the instance and mount the disk, format it and use it.</para>
<para>Detach a volume from an instance.</para>
-<programlisting>euca-detach-volume vol-00000002</programlisting>
-<para>The data on the volume persists even after the volume is detached from an instance. You can see the data on reattaching the volume to another instance.</para>
+<programlisting>nova volume-detach 857d70e4-35d5-4bf6-97ed-bf4e9a4dcf5a <volume-id></programlisting>
+<para>The data on the volume persists even after the volume is detached from an instance or after the instance is terminated. You can view the data after attaching the volume to another instance.</para>
<para>Even though you have indicated /dev/vdb as the device on the instance, the actual device name created by the OS running inside the instance may differ. You can find the name of the device by looking at the device nodes in /dev or by watching the syslog when the volume is being attached.</para>
</section>
-<section>
+<section xml:id="Swift_storage_operations--d1e2125">
<title>Swift</title>
-<para>Swift is a storage service that can be used for storage and archival of objects. Swift provides a REST interface. You can use 'curl' command to get familiar with the service. All requests to Swift service need an authentication token. This authentication token can be obtained by providing your user credentials on Swift. For more details refer to the Swift section in the "Installation & Configuration" chapter.</para>
-<para>Execute the following command and make a note of X-Auth-Token. You will need this token to use in all subsequent commands.</para>
-<programlisting>
-curl -v -H 'X-Storage-User: admin:admin' -H 'X-Storage-Pass: admin' http://10.10.10.2:8080/auth/v1.0
-</programlisting>
-<para>In the following command examples we are using 'AUTH_tk3bb59eda987446c79160202d4dfbdc8c' as the X-Auth-Token. Replace this with the appropriate token you obtained in the above step.</para>
-<para>To create a container:</para>
-<programlisting>
-curl -X PUT -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To list all containers in current account:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/
-</programlisting>
-<para>Uploading a file "file1" to container "mycontainer"</para>
-<programlisting>
-curl -X PUT -T file1 -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/
-</programlisting>
-<para>To list all objects in a container:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To list all objects in a container that starts with a particular prefix "fi":</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/?prefix=fi
-</programlisting>
-<para>To download a particular file "file1" from the container "mycontainer":</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To download file1 and save it locally as localfile1:</para>
-<programlisting>
-curl -o localfile1 -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To delete a container "mycontainer"</para>
-<programlisting>
-curl -X DELETE -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>To delete a specific file "file1" from the container:</para>
-<programlisting>
-curl -X DELETE -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer/file1
-</programlisting>
-<para>To get metadata associated with a Swift account:</para>
-<programlisting>
-curl -v -X HEAD -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/
-</programlisting>
-<para>To get metadata associated with a container:</para>
-<programlisting>
-curl -v -X HEAD -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/mycontainer
-</programlisting>
-<para>You can request the data from Swift in XML or JSON format by specifying the "format" paramater. This parameter can be applied to any of the above requests. Here are a few examples:</para>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/?format=json
-</programlisting>
-<programlisting>
-curl -H 'X-Auth-Token: AUTH_tk3bb59eda987446c79160202d4dfbdc8c' http://10.10.10.2:8080/v1/AUTH_admin/?format=xml
-</programlisting>
-<para>The above operations can also be done using 'swift' command. For instructions on using 'swift' command, please refer to "swift --help".</para>
-</section>
-</section>
-</chapter>
\ No newline at end of file
+<para>Swift is a reliable, distributed, massively scalable blob storage service that can be used for storage and archival of objects. Swift provides a REST interface. You can use Swift commandline which is an interface for the OpenStack object store service.</para>
+<para>To get the information about swift account, container and objects.</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat
+Account: AUTH_43b42dae-dc0b-4a4b-ac55-97de614d6e6e
+Containers: 1
+Objects: 1
+Bytes: 1124
+Accept-Ranges: bytes
+X-Trans-Id: txb21186a9eef64ed295a1e95896a0fc72
+</programlisting>
+<para>To get information about a particular container (mycontainer):</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat mycontainer
+</programlisting>
+<para>To get information about an object (abc123.txt) within container (mycontainer):</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd stat mycontainer abc123.txt
+</programlisting>
+<para>To list available containers in account:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd list
+</programlisting>
+<para>To list all containers whose names begin with 'my':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --prefix=my list
+</programlisting>
+<para>To list all objects within container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --prefix=my list mycontainer
+</programlisting>
+<para>To upload files 'abc.txt' and 'xyz.txt' to 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd upload mycontainer /path/abc.txt /path/xyz.txt
+</programlisting>
+<para>To download all the objects from all containers:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --all download
+</programlisting>
+<para>To download all objects from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd download mycontainer
+</programlisting>
+<para>To download 'abc.txt' and 'xyz.txt' from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd download mycontainer abc.txt xyz.txt
+</programlisting>
+<para>To delete all objects in all containers:</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd --all delete
+</programlisting>
+<para>To delete all objects in container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd delete mycontainer
+</programlisting>
+<para>To delete files 'abc.txt' and 'xyz.txt' from container 'mycontainer':</para>
+<programlisting>
+$ swift -v -V 2.0 -A http://127.0.0.1:5000/v2.0/ -U service:swiftuser -K swiftpasswd delete mycontainer abc.txt xyz.txt
+</programlisting>
+</section>
+</section>
+</chapter>
=== removed file 'images/Arch.png'
Binary files images/Arch.png 2011-10-11 13:49:47 +0000 and images/Arch.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/Archhtml.png'
Binary files images/Archhtml.png 2011-10-11 13:49:47 +0000 and images/Archhtml.png 1970-01-01 00:00:00 +0000 differ
=== added file 'images/architecture.png'
Binary files images/architecture.png 1970-01-01 00:00:00 +0000 and images/architecture.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/architecturehtml.png'
Binary files images/architecturehtml.png 1970-01-01 00:00:00 +0000 and images/architecturehtml.png 2012-05-09 21:52:21 +0000 differ
=== removed file 'images/ckeypairs.png'
Binary files images/ckeypairs.png 2011-09-16 11:05:01 +0000 and images/ckeypairs.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/coutput.png'
Binary files images/coutput.png 2011-09-16 11:05:01 +0000 and images/coutput.png 1970-01-01 00:00:00 +0000 differ
=== added directory 'images/dashboard'
=== added file 'images/dashboard/access_security.png'
Binary files images/dashboard/access_security.png 1970-01-01 00:00:00 +0000 and images/dashboard/access_security.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/access_security_securitygp.png'
Binary files images/dashboard/access_security_securitygp.png 1970-01-01 00:00:00 +0000 and images/dashboard/access_security_securitygp.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/containers.png'
Binary files images/dashboard/containers.png 1970-01-01 00:00:00 +0000 and images/dashboard/containers.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/create_keypair.png'
Binary files images/dashboard/create_keypair.png 1970-01-01 00:00:00 +0000 and images/dashboard/create_keypair.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/edit_security_securitygp.png'
Binary files images/dashboard/edit_security_securitygp.png 1970-01-01 00:00:00 +0000 and images/dashboard/edit_security_securitygp.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/flavors.png'
Binary files images/dashboard/flavors.png 1970-01-01 00:00:00 +0000 and images/dashboard/flavors.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/images.png'
Binary files images/dashboard/images.png 1970-01-01 00:00:00 +0000 and images/dashboard/images.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/images_snapshots.png'
Binary files images/dashboard/images_snapshots.png 1970-01-01 00:00:00 +0000 and images/dashboard/images_snapshots.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/instances.png'
Binary files images/dashboard/instances.png 1970-01-01 00:00:00 +0000 and images/dashboard/instances.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/instances_volumes.png'
Binary files images/dashboard/instances_volumes.png 1970-01-01 00:00:00 +0000 and images/dashboard/instances_volumes.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/login.png'
Binary files images/dashboard/login.png 1970-01-01 00:00:00 +0000 and images/dashboard/login.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/objects.png'
Binary files images/dashboard/objects.png 1970-01-01 00:00:00 +0000 and images/dashboard/objects.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/overview.png'
Binary files images/dashboard/overview.png 1970-01-01 00:00:00 +0000 and images/dashboard/overview.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/overview2.png'
Binary files images/dashboard/overview2.png 1970-01-01 00:00:00 +0000 and images/dashboard/overview2.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/projects.png'
Binary files images/dashboard/projects.png 1970-01-01 00:00:00 +0000 and images/dashboard/projects.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/quotas.png'
Binary files images/dashboard/quotas.png 1970-01-01 00:00:00 +0000 and images/dashboard/quotas.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/services.png'
Binary files images/dashboard/services.png 1970-01-01 00:00:00 +0000 and images/dashboard/services.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/users.png'
Binary files images/dashboard/users.png 1970-01-01 00:00:00 +0000 and images/dashboard/users.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/vnc1.png'
Binary files images/dashboard/vnc1.png 1970-01-01 00:00:00 +0000 and images/dashboard/vnc1.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/dashboard/vnc2.png'
Binary files images/dashboard/vnc2.png 1970-01-01 00:00:00 +0000 and images/dashboard/vnc2.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone.png'
Binary files images/keystone.png 1970-01-01 00:00:00 +0000 and images/keystone.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone_dashboard.png'
Binary files images/keystone_dashboard.png 1970-01-01 00:00:00 +0000 and images/keystone_dashboard.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystone_dashboardhtml.png'
Binary files images/keystone_dashboardhtml.png 1970-01-01 00:00:00 +0000 and images/keystone_dashboardhtml.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/keystonehtml.png'
Binary files images/keystonehtml.png 1970-01-01 00:00:00 +0000 and images/keystonehtml.png 2012-05-09 21:52:21 +0000 differ
=== modified file 'images/lifecycle.png'
Binary files images/lifecycle.png 2011-09-16 11:05:01 +0000 and images/lifecycle.png 2012-05-09 21:52:21 +0000 differ
=== modified file 'images/lifecyclehtml.png'
Binary files images/lifecyclehtml.png 2011-09-16 11:05:01 +0000 and images/lifecyclehtml.png 2012-05-09 21:52:21 +0000 differ
=== removed file 'images/linstance.png'
Binary files images/linstance.png 2011-09-16 11:05:01 +0000 and images/linstance.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/openstackv5.png'
Binary files images/openstackv5.png 2011-10-19 14:27:25 +0000 and images/openstackv5.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/openstackv5html.png'
Binary files images/openstackv5html.png 2011-10-19 14:27:25 +0000 and images/openstackv5html.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/security1.png'
Binary files images/security1.png 2011-09-16 11:05:01 +0000 and images/security1.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'images/security1html.png'
Binary files images/security1html.png 2011-09-16 11:05:01 +0000 and images/security1html.png 1970-01-01 00:00:00 +0000 differ
=== added file 'images/setup.png'
Binary files images/setup.png 1970-01-01 00:00:00 +0000 and images/setup.png 2012-05-09 21:52:21 +0000 differ
=== added file 'images/setuphtml.png'
Binary files images/setuphtml.png 1970-01-01 00:00:00 +0000 and images/setuphtml.png 2012-05-09 21:52:21 +0000 differ
=== removed file 'images/tinstance.png'
Binary files images/tinstance.png 2011-09-16 11:05:01 +0000 and images/tinstance.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'pom.xml'
--- pom.xml 2011-10-20 14:44:13 +0000
+++ pom.xml 2012-05-09 21:52:21 +0000
@@ -46,100 +46,126 @@
</resource>
</resources>
<plugins>
- <!--<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>batik-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
-
- <executions>
- <execution>
- <goals>
- <goal>rasterize</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <srcDir>${basedir}/source/docbkx/openstack-api-extensions/figures</srcDir>
- <destDir>${basedir}/target/docbkx/webhelp/apix-intro-proposal/content/figures</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>-->
+
<plugin>
<groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId>
- <version>1.0.4</version>
+ <version>1.2.0</version>
<executions>
<execution>
+ <id>goal1</id>
<goals>
<goal>generate-pdf</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <highlightSource>false</highlightSource>
+ <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+ <sectionAutolabel>0</sectionAutolabel>
+ <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+ </configuration>
+ </execution>
+ <execution>
+ <id>goal2</id>
+ <goals>
<goal>generate-webhelp</goal>
</goals>
<phase>generate-sources</phase>
+ <configuration>
+ <!-- These parameters only apply to webhelp -->
+ <enableDisqus>1</enableDisqus>
+ <disqusShortname>openstackstarterdoc</disqusShortname>
+ <enableGoogleAnalytics>1</enableGoogleAnalytics>
+ <googleAnalyticsId>UA-17511903-6</googleAnalyticsId>
+ <generateToc>
+ appendix toc,title
+ article/appendix nop
+ article toc,title
+ book title,figure,table,example,equation
+ chapter toc,title
+ part toc,title
+ preface toc,title
+ qandadiv toc
+ qandaset toc
+ reference toc,title
+ set toc,title
+ </generateToc>
+ <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+ <sectionAutolabel>0</sectionAutolabel>
+ <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+ <postProcess>
+ <!-- Copies the figures to the correct location for webhelp -->
+
+ <copy todir="${basedir}/target/docbkx/webhelp/OpenStackbook/content/images">
+ <fileset dir="${basedir}/images">
+ <include name="**/*.*" />
+ </fileset>
+ </copy>
+
+ <!-- Copies webhelp (HTML output) to desired URL location on docs.openstack.org -->
+
+ <copy
+ todir="${basedir}/target/docbkx/webhelp/openstack-compute/starter">
+ <fileset
+ dir="${basedir}/target/docbkx/webhelp/Openstackbook/">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+
+ <!--Moves PDFs to the needed placement -->
+
+ <move failonerror="false"
+ file="${basedir}/target/docbkx/pdf/Openstackbook.pdf"
+ tofile="${basedir}/target/docbkx/webhelp/openstack-compute/starter/os-compute-starterguide-trunk.pdf"/>
+
+ <!--Deletes leftover uneeded directories -->
+
+ <delete dir="${basedir}/target/docbkx/webhelp/Openstackbook"/>
+
+ </postProcess>
+ </configuration>
+ </execution>
+ <execution>
+ <id>goal3</id>
+ <goals>
+ <goal>generate-epub</goal>
+ </goals>
+ <!--<phase>generate-sources</phase>-->
+ <configuration>
+ <highlightSource>true</highlightSource>
+ <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+ <sectionAutolabel>0</sectionAutolabel>
+ <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+ <postProcess>
+ <!-- Copies the figures to the correct location for epub -->
+ <mkdir dir="${basedir}/target/docbkx/epub/Openstackbook/images"/>
+ <copy todir="${basedir}/target/docbkx/epub/Openstackbook/images">
+ <fileset dir="${basedir}/images">
+ <include name="**/*.png" />
+ </fileset>
+ </copy>
+
+ <!-- Rezip now that the figures are in the correct location -->
+ <zip
+ destfile="${basedir}/target/docbkx/webhelp/openstack-compute/starter/os-compute-starterguide.epub"
+ basedir="${basedir}/target/docbkx/epub/Openstackbook/"
+ update="true"
+ excludes="**/*.epub"/>
+
+ </postProcess>
+ </configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
<configuration>
+ <!-- These parameters apply to all the goals -->
<xincludeSupported>true</xincludeSupported>
<sourceDirectory>.</sourceDirectory>
<includes>
Openstackbook.xml
</includes>
- <highlightSource>false</highlightSource>
<profileSecurity>reviewer</profileSecurity>
<branding>openstack</branding>
- <enableDisqus>1</enableDisqus>
- <disqusShortname>openstackstarterdoc</disqusShortname>
- <enableGoogleAnalytics>1</enableGoogleAnalytics>
- <googleAnalyticsId>UA-17511903-6</googleAnalyticsId>
- <generateToc>
- appendix toc,title
- article/appendix nop
- article toc,title
- book title,figure,table,example,equation
- chapter toc,title
- part toc,title
- preface toc,title
- qandadiv toc
- qandaset toc
- reference toc,title
- set toc,title
- </generateToc>
- <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
- <sectionAutolabel>0</sectionAutolabel>
- <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
- <postProcess>
- <!-- Copies the figures to the correct location for webhelp -->
- <copy todir="${basedir}/target/docbkx/webhelp/Openstackbook/content/images">
- <fileset dir="${basedir}/images">
- <include name="**/*.png"/>
- </fileset>
- </copy>
-
- <!-- Moves HTML of Starter Guide to diablo directory -->
- <copy todir="${basedir}/target/docbkx/webhelp/diablo/openstack-compute/starter/">
- <fileset
- dir="${basedir}/target/docbkx/webhelp/Openstackbook">
- <include name="**/*" />
- </fileset>
- </copy>
-
- <!--Moves PDFs to the needed placement -->
- <move failonerror="false"
- file="${basedir}/target/docbkx/pdf/Openstackbook.pdf"
- tofile="${basedir}/target/docbkx/webhelp/diablo/openstack-compute/starter/openstack-starter-guide-diablo.pdf"/>
- <!--Deletes leftover uneeded directories -->
- <!--<delete
- dir="${basedir}/target/docbkx/pdf"/>-->
- </postProcess>
</configuration>
-
</plugin>
</plugins>
=== removed directory 'target'
=== removed directory 'target/docbkx'
=== removed directory 'target/docbkx/fonts'
=== removed directory 'target/docbkx/fonts/CartoGothic-Std'
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf 2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Bold.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf 2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-BoldItalic.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf 2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Book.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf'
Binary files target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf 2011-09-16 11:05:01 +0000 and target/docbkx/fonts/CartoGothic-Std/CartoGothicStd-Italic.ttf 1970-01-01 00:00:00 +0000 differ
=== removed file 'target/docbkx/fonts/CartoGothic-Std/FontSite License.txt'
--- target/docbkx/fonts/CartoGothic-Std/FontSite License.txt 2011-09-16 11:05:01 +0000
+++ target/docbkx/fonts/CartoGothic-Std/FontSite License.txt 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-This typeface software ("SOFTWARE") is the property of FontSite Inc. Its
-use by you is covered under the terms of an End-User License Agreement
-("EULA"). By exercising your rights to make and use copies of this SOFTWARE,
-you agree to be bound by the terms of this EULA. If you do not agree to the
-terms of this EULA, you may not use the SOFTWARE.
-
-This SOFTWARE is a valuable asset of FontSite Inc. which is protected by
-copyright laws and international copyright treaties, as well as other
-intellectual property laws and treaties. The typeface software is licensed,
-not sold.
-
-This EULA grants you the following rights:
-
-You may install and use an unlimited number of copies of this SOFTWARE.
-
-You may reproduce and distribute an unlimited number of copies of this
-SOFTWARE, provided that each copy shall be a true and complete copy,
-including all copyright and trademark notices, electronic documentation
-(user guide in PDF format, etc.), and shall be accompanied by a copy of this
-EULA. Copies of the SOFTWARE may not be distributed for profit either on a
-standalone basis or included as part of your own product.
\ No newline at end of file
=== removed file 'target/docbkx/fonts/fontconfig.st'
--- target/docbkx/fonts/fontconfig.st 2011-09-16 11:05:01 +0000
+++ target/docbkx/fonts/fontconfig.st 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fop version="1.0">
- <!-- Base URL for resolving relative URLs -->
- <base>.</base>
-
- <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
- <source-resolution>90</source-resolution>
- <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
- <target-resolution>90</target-resolution>
-
- <!-- Default page-height and page-width, in case
- value is specified as auto -->
- <default-page-settings height="11in" width="8.26in"/>
-
- <renderers>
- <renderer mime="application/pdf">
- <filterList>
- <!-- provides compression using zlib flate (default is on) -->
- <value>flate</value>
-
- <!-- encodes binary data into printable ascii characters (default off)
- This provides about a 4:5 expansion of data size -->
- <!-- <value>ascii-85</value> -->
-
- <!-- encodes binary data with hex representation (default off)
- This filter is not recommended as it doubles the data size -->
- <!-- <value>ascii-hex</value> -->
- </filterList>
- <fonts>
- <directory recursive="true">$fontPath$</directory>
- </fonts>
- </renderer>
- </renderers>
-</fop>
=== removed directory 'target/docbkx/images'
=== removed directory 'target/docbkx/images/callouts'
=== removed file 'target/docbkx/images/callouts/1.svg'
--- target/docbkx/images/callouts/1.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/1.svg 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M10.428,10.411h0.56c3.78,0,4.788-1.96,4.872-3.444h3.22v19.88h-3.92V13.154h-4.732V10.411z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/10.svg'
--- target/docbkx/images/callouts/10.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/10.svg 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.815,10.758h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.11H3.815V10.758z"/>
- <path style="fill:#FFFFFF;" d="M22.175,7.806c4.009,0,5.904,2.76,5.904,8.736c0,5.975-1.896,8.76-5.904,8.76
- c-4.008,0-5.904-2.785-5.904-8.76C16.271,10.566,18.167,7.806,22.175,7.806z M22.175,22.613c1.921,0,2.448-1.68,2.448-6.071
- c0-4.393-0.527-6.049-2.448-6.049c-1.92,0-2.448,1.656-2.448,6.049C19.727,20.934,20.255,22.613,22.175,22.613z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/11.svg'
--- target/docbkx/images/callouts/11.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/11.svg 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M5.209,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H5.209V10.412z"/>
- <path style="fill:#FFFFFF;" d="M18.553,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.359V12.764h-4.056V10.412z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/12.svg'
--- target/docbkx/images/callouts/12.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/12.svg 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/13.svg'
--- target/docbkx/images/callouts/13.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/13.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M20.611,14.636h0.529c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.288-2.185-2.137-2.185
- c-2.303,0-2.303,2.185-2.303,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.279,0,5.279,1.152,5.279,4.752
- c0,1.728-1.08,2.808-2.039,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
- c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
- c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/14.svg'
--- target/docbkx/images/callouts/14.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/14.svg 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.146,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.146V10.412z"/>
- <path style="fill:#FFFFFF;" d="M28.457,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L22.746,7.46h3.815v10.656h1.896V20.732z
- M23.201,18.116c0-4.128,0.072-6.792,0.072-7.32h-0.048l-4.272,7.32H23.201z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/15.svg'
--- target/docbkx/images/callouts/15.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/15.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
- <path style="fill:#FFFFFF;" d="M19.342,14.943c0.625-0.433,1.392-0.937,3.048-0.937c2.279,0,5.16,1.584,5.16,5.496
- c0,2.328-1.176,6.121-6.192,6.121c-2.664,0-5.376-1.584-5.544-5.016h3.36c0.144,1.391,0.888,2.326,2.376,2.326
- c1.607,0,2.544-1.367,2.544-3.191c0-1.512-0.72-3.047-2.496-3.047c-0.456,0-1.608,0.023-2.256,1.223l-3-0.143l1.176-9.361h9.36
- v2.832h-6.937L19.342,14.943z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/16.svg'
--- target/docbkx/images/callouts/16.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/16.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H3.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M24.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L19.58,14.9
- c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
- c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
- c0.936,0.912,1.271,1.416,1.584,3.217H24.309z M22.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
- c1.225,0,2.353-0.936,2.353-3.239C24.62,16.868,23.229,16.172,22.172,16.172z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/17.svg'
--- target/docbkx/images/callouts/17.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/17.svg 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.479,11.079h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.04h-3.36V13.43H3.479V11.079z"/>
- <path style="fill:#FFFFFF;" d="M27.838,11.006c-1.631,1.776-5.807,6.816-6.215,14.16h-3.457c0.36-6.816,4.632-12.24,6.072-13.776
- h-8.472l0.072-2.976h12V11.006z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/18.svg'
--- target/docbkx/images/callouts/18.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/18.svg 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.813,10.412h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76V24.5h-3.36V12.764H4.813V10.412z"/>
- <path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
- c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
- c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
- c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
- C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
- c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/19.svg'
--- target/docbkx/images/callouts/19.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/19.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.146,10.746h0.48c3.24,0,4.104-1.681,4.176-2.952h2.76v17.041h-3.36V13.097H4.146V10.746z"/>
- <path style="fill:#FFFFFF;" d="M20.225,20.898v0.023c0.192,1.176,0.936,1.68,1.968,1.68c1.392,0,2.783-1.176,2.808-4.752
- l-0.048-0.049c-0.768,1.152-2.088,1.441-3.24,1.441c-3.264,0-5.16-2.473-5.16-5.329c0-4.176,2.472-6.12,5.808-6.12
- c5.904,0,6,6.36,6,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.391H20.225z M22.434,16.553
- c1.176,0,2.472-0.84,2.472-2.855c0-1.944-0.841-3.145-2.568-3.145c-0.864,0-2.424,0.433-2.424,2.88
- C19.913,16.001,21.161,16.553,22.434,16.553z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/2.svg'
--- target/docbkx/images/callouts/2.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/2.svg 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M9.668,12.328c0-6.469,4.732-7.028,6.496-7.028c3.808,0,6.833,2.24,6.833,6.271
- c0,3.416-2.213,5.152-4.145,6.469c-2.632,1.848-4.004,2.744-4.452,3.668h8.624v3.472H9.444c0.14-2.324,0.308-4.76,4.62-7.896
- c3.584-2.604,5.012-3.612,5.012-5.853c0-1.315-0.84-2.828-2.744-2.828c-2.744,0-2.828,2.269-2.856,3.725H9.668z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/20.svg'
--- target/docbkx/images/callouts/20.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/20.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
- s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
- c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/21.svg'
--- target/docbkx/images/callouts/21.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/21.svg 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M5.306,13.151c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392v2.976H5.114c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H5.306z"/>
- <path style="fill:#FFFFFF;" d="M19.49,10.079h0.48c3.239,0,4.104-1.681,4.176-2.952h2.761v17.04h-3.361V12.431H19.49V10.079z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/22.svg'
--- target/docbkx/images/callouts/22.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/22.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M17.316,13.484c0-5.545,4.056-6.024,5.568-6.024c3.265,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.553,5.544c-2.256,1.584-3.432,2.353-3.815,3.145h7.392V24.5h-11.64c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.353-2.424c-2.352,0-2.423,1.944-2.447,3.192H17.316z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/23.svg'
--- target/docbkx/images/callouts/23.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/23.svg 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M21.612,14.636h0.528c1.008,0,2.855-0.096,2.855-2.304c0-0.624-0.287-2.185-2.136-2.185
- c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
- c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.377,5.496-5.809,5.496
- c-1.607,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.521-0.911,2.521-2.808
- c0-2.328-2.257-2.424-3.816-2.424V14.636z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/24.svg'
--- target/docbkx/images/callouts/24.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/24.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M4.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H4.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H4.972z"/>
- <path style="fill:#FFFFFF;" d="M30.124,20.732h-1.896V24.5h-3.36v-3.768h-6.72v-2.904L24.412,7.46h3.816v10.656h1.896V20.732z
- M24.868,18.116c0-4.128,0.071-6.792,0.071-7.32h-0.047l-4.272,7.32H24.868z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/25.svg'
--- target/docbkx/images/callouts/25.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/25.svg 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M20.676,14.276c0.624-0.433,1.393-0.937,3.049-0.937c2.279,0,5.16,1.584,5.16,5.496
- c0,2.328-1.177,6.12-6.193,6.12c-2.664,0-5.375-1.584-5.543-5.016h3.36c0.144,1.392,0.889,2.327,2.376,2.327
- c1.608,0,2.544-1.367,2.544-3.191c0-1.513-0.72-3.048-2.496-3.048c-0.455,0-1.607,0.023-2.256,1.224l-3-0.144l1.176-9.36h9.36
- v2.832h-6.937L20.676,14.276z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/26.svg'
--- target/docbkx/images/callouts/26.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/26.svg 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M25.309,11.78c-0.097-0.96-0.721-1.633-1.969-1.633c-2.184,0-2.688,2.496-2.808,4.704L20.58,14.9
- c0.456-0.624,1.296-1.416,3.191-1.416c3.529,0,5.209,2.712,5.209,5.256c0,3.72-2.28,6.216-5.568,6.216
- c-5.16,0-6.168-4.32-6.168-8.568c0-3.24,0.432-8.928,6.336-8.928c0.695,0,2.641,0.264,3.48,1.104
- c0.936,0.912,1.271,1.416,1.584,3.217H25.309z M23.172,16.172c-1.271,0-2.568,0.792-2.568,2.928c0,1.849,1.056,3.168,2.664,3.168
- c1.225,0,2.353-0.936,2.353-3.239C25.62,16.868,24.229,16.172,23.172,16.172z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/27.svg'
--- target/docbkx/images/callouts/27.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/27.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M29.172,10.34c-1.632,1.776-5.808,6.816-6.216,14.16H19.5c0.36-6.816,4.632-12.24,6.072-13.776
- H17.1l0.072-2.976h12V10.34z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/28.svg'
--- target/docbkx/images/callouts/28.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/28.svg 1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M23.172,24.956c-4.392,0-5.904-2.856-5.904-5.185c0-0.863,0-3.119,2.592-4.319
- c-1.344-0.672-2.064-1.752-2.064-3.336c0-2.904,2.328-4.656,5.304-4.656c3.528,0,5.4,2.088,5.4,4.44
- c0,1.464-0.6,2.712-1.968,3.432c1.632,0.815,2.544,1.896,2.544,4.104C29.076,21.596,27.684,24.956,23.172,24.956z M23.124,16.916
- c-1.224,0-2.4,0.792-2.4,2.64c0,1.632,0.936,2.712,2.472,2.712c1.752,0,2.424-1.512,2.424-2.688
- C25.62,18.38,24.996,16.916,23.124,16.916z M25.284,12.26c0-1.296-0.888-2.112-1.968-2.112c-1.512,0-2.305,0.864-2.305,2.112
- c0,1.008,0.744,2.112,2.185,2.112C24.516,14.372,25.284,13.484,25.284,12.26z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/29.svg'
--- target/docbkx/images/callouts/29.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/29.svg 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M3.972,13.484c0-5.545,4.056-6.024,5.568-6.024c3.264,0,5.856,1.92,5.856,5.376
- c0,2.928-1.896,4.416-3.552,5.544c-2.256,1.584-3.432,2.353-3.816,3.145h7.392V24.5H3.78c0.12-1.992,0.264-4.08,3.96-6.768
- c3.072-2.232,4.296-3.097,4.296-5.017c0-1.128-0.72-2.424-2.352-2.424c-2.352,0-2.424,1.944-2.448,3.192H3.972z"/>
- <path style="fill:#FFFFFF;" d="M20.893,20.564v0.023c0.191,1.176,0.936,1.68,1.967,1.68c1.393,0,2.785-1.176,2.809-4.752
- l-0.048-0.048c-0.769,1.152-2.088,1.44-3.24,1.44c-3.264,0-5.16-2.473-5.16-5.328c0-4.176,2.472-6.12,5.807-6.12
- c5.904,0,6.001,6.36,6.001,8.76c0,6.601-3.12,8.736-6.192,8.736c-2.904,0-4.992-1.68-5.28-4.392H20.893z M23.1,16.22
- c1.176,0,2.473-0.84,2.473-2.855c0-1.944-0.84-3.145-2.568-3.145c-0.863,0-2.424,0.433-2.424,2.88
- C20.58,15.668,21.828,16.22,23.1,16.22z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/3.svg'
--- target/docbkx/images/callouts/3.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/3.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M15.127,14.005h0.616c1.176,0,3.332-0.112,3.332-2.688c0-0.728-0.336-2.548-2.492-2.548
- c-2.688,0-2.688,2.548-2.688,3.248h-3.64c0-3.724,2.1-6.384,6.58-6.384c2.66,0,6.16,1.344,6.16,5.544
- c0,2.016-1.261,3.276-2.38,3.78v0.056c0.699,0.196,2.996,1.232,2.996,4.62c0,3.752-2.772,6.412-6.776,6.412
- c-1.876,0-6.916-0.42-6.916-6.636h3.836l-0.028,0.027c0,1.064,0.28,3.473,2.912,3.473c1.568,0,2.94-1.064,2.94-3.276
- c0-2.716-2.632-2.828-4.452-2.828V14.005z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/30.svg'
--- target/docbkx/images/callouts/30.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/30.svg 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M8.268,14.636h0.528c1.008,0,2.856-0.096,2.856-2.304c0-0.624-0.288-2.185-2.136-2.185
- c-2.304,0-2.304,2.185-2.304,2.784h-3.12c0-3.191,1.8-5.472,5.64-5.472c2.28,0,5.28,1.152,5.28,4.752
- c0,1.728-1.08,2.808-2.04,3.24V15.5c0.6,0.168,2.568,1.056,2.568,3.96c0,3.216-2.376,5.496-5.808,5.496
- c-1.608,0-5.928-0.36-5.928-5.688h3.288l-0.024,0.024c0,0.912,0.24,2.976,2.496,2.976c1.344,0,2.52-0.911,2.52-2.808
- c0-2.328-2.256-2.424-3.816-2.424V14.636z"/>
- <path style="fill:#FFFFFF;" d="M23.172,7.46c4.008,0,5.904,2.76,5.904,8.736c0,5.976-1.896,8.76-5.904,8.76
- s-5.904-2.784-5.904-8.76C17.268,10.22,19.164,7.46,23.172,7.46z M23.172,22.268c1.92,0,2.448-1.68,2.448-6.071
- c0-4.393-0.528-6.049-2.448-6.049s-2.448,1.656-2.448,6.049C20.724,20.588,21.252,22.268,23.172,22.268z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/4.svg'
--- target/docbkx/images/callouts/4.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/4.svg 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M21.891,20.784h-2.212v4.396h-3.92v-4.396h-7.84v-3.389L15.227,5.3h4.452v12.432h2.212V20.784z
- M15.759,17.731c0-4.815,0.084-7.924,0.084-8.54h-0.056l-4.984,8.54H15.759z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/5.svg'
--- target/docbkx/images/callouts/5.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/5.svg 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M14.035,14.252c0.728-0.504,1.624-1.092,3.556-1.092c2.66,0,6.02,1.848,6.02,6.411
- c0,2.717-1.372,7.141-7.224,7.141c-3.108,0-6.272-1.849-6.468-5.853h3.92c0.168,1.624,1.036,2.717,2.772,2.717
- c1.876,0,2.968-1.597,2.968-3.725c0-1.764-0.839-3.556-2.912-3.556c-0.532,0-1.876,0.028-2.632,1.428l-3.5-0.168l1.372-10.92
- h10.919v3.304h-8.092L14.035,14.252z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/6.svg'
--- target/docbkx/images/callouts/6.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/6.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M19.106,10.673c-0.112-1.12-0.84-1.904-2.296-1.904c-2.548,0-3.136,2.912-3.276,5.488l0.056,0.056
- c0.532-0.728,1.512-1.651,3.724-1.651c4.116,0,6.077,3.164,6.077,6.131c0,4.34-2.66,7.252-6.497,7.252
- c-6.02,0-7.196-5.039-7.196-9.996c0-3.78,0.504-10.416,7.392-10.416c0.812,0,3.08,0.308,4.061,1.288
- c1.092,1.063,1.483,1.652,1.848,3.752H19.106z M16.614,15.797c-1.484,0-2.996,0.924-2.996,3.416c0,2.156,1.232,3.697,3.108,3.697
- c1.428,0,2.745-1.094,2.745-3.781C19.471,16.609,17.846,15.797,16.614,15.797z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/7.svg'
--- target/docbkx/images/callouts/7.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/7.svg 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M24.28,9.66c-1.904,2.071-6.776,7.951-7.252,16.52h-4.032c0.42-7.952,5.404-14.28,7.084-16.072
- h-9.884l0.084-3.472h14V9.66z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/8.svg'
--- target/docbkx/images/callouts/8.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/8.svg 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M16.28,26.712c-5.124,0-6.888-3.332-6.888-6.048c0-1.009,0-3.641,3.024-5.04
- c-1.568-0.784-2.408-2.044-2.408-3.893c0-3.388,2.716-5.432,6.188-5.432c4.116,0,6.3,2.436,6.3,5.18
- c0,1.708-0.7,3.164-2.296,4.004c1.903,0.952,2.968,2.212,2.968,4.788C23.168,22.792,21.544,26.712,16.28,26.712z M16.224,17.332
- c-1.428,0-2.8,0.924-2.8,3.08c0,1.903,1.092,3.164,2.884,3.164c2.043,0,2.829-1.765,2.829-3.137
- C19.137,19.04,18.408,17.332,16.224,17.332z M18.744,11.899c0-1.512-1.036-2.464-2.296-2.464c-1.764,0-2.688,1.008-2.688,2.464
- c0,1.177,0.868,2.464,2.548,2.464C17.848,14.363,18.744,13.328,18.744,11.899z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/callouts/9.svg'
--- target/docbkx/images/callouts/9.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/callouts/9.svg 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-<!DOCTYPE svg [
- <!ENTITY ns_svg "http://www.w3.org/2000/svg";>
- <!ENTITY ns_xlink "http://www.w3.org/1999/xlink";>
-]>
-<svg version="1.0" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="33" height="33" viewBox="0 0 33 33"
- style="overflow:visible;enable-background:new 0 0 33 33;" xml:space="preserve">
-<circle style="stroke:#000000;" cx="16.5" cy="16.5" r="16"/>
-<g>
- <g style="enable-background:new ;">
- <path style="fill:#FFFFFF;" d="M13.953,21.921v0.027c0.224,1.372,1.092,1.961,2.296,1.961c1.624,0,3.248-1.372,3.276-5.545
- l-0.057-0.056c-0.896,1.344-2.436,1.68-3.78,1.68c-3.808,0-6.02-2.884-6.02-6.216c0-4.872,2.884-7.14,6.776-7.14
- c6.888,0,7,7.42,7,10.22c0,7.7-3.641,10.192-7.224,10.192c-3.388,0-5.824-1.96-6.16-5.124H13.953z M16.529,16.853
- c1.372,0,2.884-0.979,2.884-3.332c0-2.268-0.98-3.668-2.996-3.668c-1.008,0-2.828,0.504-2.828,3.36
- C13.589,16.209,15.045,16.853,16.529,16.853z"/>
- </g>
-</g>
-</svg>
=== removed file 'target/docbkx/images/caution.svg'
--- target/docbkx/images/caution.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/caution.svg 1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="48pt"
- height="48pt"
- viewBox="0 0 48 48"
- xml:space="preserve"
- id="svg4202"
- version="1.1"
- inkscape:version="0.48.0 r9654"
- sodipodi:docname="caution.svg"><metadata
- id="metadata4224"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /></cc:Work></rdf:RDF></metadata><defs
- id="defs4222">
-
-
-
-
-
-
- </defs><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1306"
- inkscape:window-height="784"
- id="namedview4220"
- showgrid="false"
- inkscape:zoom="14.373972"
- inkscape:cx="31.692308"
- inkscape:cy="30"
- inkscape:window-x="49"
- inkscape:window-y="50"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg4202" />
- <path
- style="fill-rule:nonzero;stroke:#ffffff;stroke-width:6.61119986;stroke-miterlimit:4"
- d="M 41.7,35.3 26.6,9.4 C 26,8.4 24.9,7.7 23.7,7.8 22.5,7.8 21.4,8.5 20.8,9.5 L 6.3,35.4 c -0.6,1 -0.6,2.3 0,3.3 0.6,1 1.7,1.6 2.9,1.6 h 29.6 c 1.2,0 2.3,-0.6 2.9,-1.7 0.6,-1 0.6,-2.3 0,-3.3 z"
- id="path4207"
- inkscape:connector-curvature="0" /><path
- style="fill:#ffffff;fill-rule:nonzero;stroke:#c40022;stroke-width:6.61119986000000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
- d="M 23.7,11 9.2,37 H 38.8 L 23.7,11 z"
- id="path4209"
- inkscape:connector-curvature="0" /><path
- style="fill:#ffffff;fill-rule:nonzero;stroke:none"
- d="M 23.7,11.9 10.3,36.1 H 37.8 L 23.8,12 z"
- id="path4211"
- inkscape:connector-curvature="0" /><g
- style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
- id="g4213">
- <path
- style="stroke:none"
- d="m 24.1,34 c -1.1,0 -1.8,-0.8 -1.8,-1.8 0,-1.1 0.7,-1.8 1.8,-1.8 1.1,0 1.8,0.7 1.8,1.8 0,1 -0.7,1.8 -1.8,1.8 h 0 z m -1.2,-4.7 -0.4,-9.1 h 3.2 l -0.4,9.1 H 23 z"
- id="path4215"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="crop_x0020_marks"
- style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
- <path
- style="fill:none;stroke:none;"
- d="M48,48H0V0h48v48z"
- id="path4218" />
- </g>
-</svg>
\ No newline at end of file
=== removed directory 'target/docbkx/images/cc'
=== removed file 'target/docbkx/images/cc/by-nc-nd.svg'
--- target/docbkx/images/cc/by-nc-nd.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-nc-nd.svg 1970-01-01 00:00:00 +0000
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by-nc-nd.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="179"
- inkscape:cy="89.569904"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="488"
- inkscape:window-y="401" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937728,0,0,0.9936696,-437.11979,0)"
- id="g361"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-nc-nd.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_4_"
- nodetypes="ccccccc"
- d="M 443.28955,0.44873 L 557.35303,0.65185 C 558.94678,0.65185 560.37061,0.41503 560.37061,3.83203 L 560.23096,41.39892 L 440.41064,41.39892 L 440.41064,3.69238 C 440.41064,2.00781 440.57373,0.44873 443.28955,0.44873 z"
- style="fill:#aab2ab" />
-
- <path
- d="M 558.3501,0 L 442.12061,0 C 440.87354,0 439.85889,1.01465 439.85889,2.26123 L 439.85889,41.75732 C 439.85889,42.03906 440.08741,42.26757 440.36963,42.26757 L 560.1001,42.26757 C 560.38233,42.26757 560.61084,42.03905 560.61084,41.75732 L 560.61084,2.26123 C 560.61084,1.01465 559.59619,0 558.3501,0 z M 442.12061,1.02148 L 558.3501,1.02148 C 559.03369,1.02148 559.58936,1.57763 559.58936,2.26123 C 559.58936,2.26123 559.58936,18.15234 559.58936,29.64893 L 476.51612,29.64893 C 473.4712,35.1543 467.60401,38.89258 460.87159,38.89258 C 454.13721,38.89258 448.27198,35.15772 445.22901,29.64893 L 440.88038,29.64893 C 440.88038,18.15235 440.88038,2.26123 440.88038,2.26123 C 440.88037,1.57764 441.43701,1.02148 442.12061,1.02148 z"
- id="path364" />
-
- <g
- id="g5908_4_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
-
- <path
- id="path5906_4_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 486.26709,-141.53052 C 486.27271,-132.85028 479.2392,-125.80957 470.55902,-125.80341 C 461.87878,-125.79841 454.83752,-132.83124 454.83191,-141.51148 C 454.83191,-141.51819 454.83191,-141.52436 454.83191,-141.53052 C 454.82629,-150.21186 461.85974,-157.25257 470.53998,-157.25763 C 479.22132,-157.26263 486.26264,-150.22974 486.26709,-141.5495 C 486.26709,-141.54395 486.26709,-141.53723 486.26709,-141.53052 z"
- style="fill:#ffffff" />
-
- <g
- id="g5706_4_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_4_"
- d="M 772.94281,-253.39801 C 776.42761,-249.9126 778.17059,-245.64465 778.17059,-240.59582 C 778.17059,-235.54644 776.45782,-231.32434 773.03228,-227.92785 C 769.39642,-224.35186 765.10046,-222.56414 760.14227,-222.56414 C 755.2445,-222.56414 751.0224,-224.33672 747.47827,-227.88366 C 743.93188,-231.4295 742.15985,-235.66668 742.15985,-240.59582 C 742.15985,-245.52435 743.93188,-249.79174 747.47827,-253.39801 C 750.93292,-256.88507 755.15497,-258.6275 760.14227,-258.6275 C 765.1911,-258.6275 769.45685,-256.88507 772.94281,-253.39801 z M 749.82422,-251.05371 C 746.8775,-248.07733 745.40412,-244.59082 745.40412,-240.59131 C 745.40412,-236.59302 746.86298,-233.13611 749.77839,-230.22016 C 752.69605,-227.30421 756.16743,-225.84595 760.19599,-225.84595 C 764.22455,-225.84595 767.72614,-227.31873 770.70307,-230.2649 C 773.529,-233.00074 774.94196,-236.44196 774.94196,-240.59132 C 774.94196,-244.70936 773.5055,-248.20485 770.63373,-251.07606 C 767.76306,-253.94673 764.28382,-255.38264 760.19599,-255.38264 C 756.10816,-255.38264 752.64905,-253.93945 749.82422,-251.05371 z M 757.57812,-242.35052 C 757.12841,-243.33221 756.45495,-243.82281 755.55548,-243.82281 C 753.96692,-243.82281 753.17261,-242.75329 753.17261,-240.61425 C 753.17261,-238.47472 753.96692,-237.40575 755.55548,-237.40575 C 756.60486,-237.40575 757.35443,-237.9265 757.80414,-238.97026 L 760.0069,-237.79729 C 758.95642,-235.93181 757.38123,-234.99822 755.28138,-234.99822 C 753.66151,-234.99822 752.36378,-235.49499 751.38935,-236.48784 C 750.41383,-237.48125 749.92603,-238.85057 749.92603,-240.59581 C 749.92603,-242.31139 750.42945,-243.67284 751.43409,-244.68138 C 752.43873,-245.68992 753.69172,-246.19334 755.1919,-246.19334 C 757.4126,-246.19334 759.00117,-245.31907 759.96326,-243.57103 L 757.57812,-242.35052 z M 767.94208,-242.35052 C 767.49121,-243.33221 766.83002,-243.82281 765.95966,-243.82281 C 764.33863,-243.82281 763.52753,-242.75329 763.52753,-240.61425 C 763.52753,-238.47472 764.33863,-237.40575 765.95966,-237.40575 C 767.0113,-237.40575 767.74738,-237.9265 768.16694,-238.97026 L 770.41895,-237.79729 C 769.37067,-235.93181 767.79773,-234.99822 765.70124,-234.99822 C 764.08356,-234.99822 762.78919,-235.49499 761.81477,-236.48784 C 760.8426,-237.48125 760.35487,-238.85057 760.35487,-240.59581 C 760.35487,-242.31139 760.84932,-243.67284 761.83827,-244.68138 C 762.82612,-245.68992 764.08357,-246.19334 765.61177,-246.19334 C 767.82796,-246.19334 769.41542,-245.31907 770.37306,-243.57103 L 767.94208,-242.35052 z" />
-
- </g>
-
- </g>
-
- <g
- enable-background="new "
- id="g370">
- <path
- d="M 488.25342,32.95605 C 488.5708,32.95605 488.86182,32.98437 489.12354,33.04003 C 489.38526,33.09569 489.60889,33.18749 489.79639,33.31542 C 489.98291,33.44237 490.12744,33.6123 490.23096,33.82323 C 490.3335,34.03514 490.38526,34.29589 490.38526,34.60741 C 490.38526,34.94335 490.30909,35.22264 490.15577,35.44628 C 490.00343,35.67089 489.77784,35.85351 489.47804,35.99706 C 489.89015,36.11522 490.19777,36.32226 490.40089,36.61815 C 490.60401,36.91404 490.70558,37.27049 490.70558,37.68749 C 490.70558,38.02343 490.64015,38.31444 490.50929,38.56054 C 490.37843,38.80566 490.20167,39.00683 489.98097,39.1621 C 489.75929,39.31835 489.50636,39.43358 489.22316,39.5078 C 488.93898,39.583 488.64796,39.6201 488.34816,39.6201 L 485.11183,39.6201 L 485.11183,32.95604 L 488.25342,32.95604 L 488.25342,32.95605 z M 488.06689,35.65137 C 488.32763,35.65137 488.54345,35.58887 488.71142,35.46485 C 488.87939,35.34083 488.96337,35.13965 488.96337,34.86036 C 488.96337,34.70509 488.93505,34.57716 488.87939,34.47852 C 488.82275,34.37891 488.74853,34.30176 488.65478,34.24512 C 488.56103,34.18946 488.45361,34.15039 488.33251,34.12891 C 488.21141,34.10743 488.08446,34.09668 487.9536,34.09668 L 486.58055,34.09668 L 486.58055,35.65137 L 488.06689,35.65137 z M 488.15186,38.47949 C 488.29541,38.47949 488.43213,38.46582 488.56299,38.4375 C 488.69385,38.40918 488.80908,38.3623 488.90967,38.29785 C 489.00928,38.23242 489.08838,38.14355 489.14795,38.03125 C 489.20752,37.91992 489.23682,37.77637 489.23682,37.60254 C 489.23682,37.26074 489.14014,37.0166 488.94678,36.87012 C 488.75342,36.72461 488.49854,36.65137 488.18018,36.65137 L 486.58057,36.65137 L 486.58057,38.47949 L 488.15186,38.47949 z"
- id="path372"
- style="fill:#ffffff" />
-
- <path
- d="M 490.96436,32.95605 L 492.60791,32.95605 L 494.16846,35.58789 L 495.71924,32.95605 L 497.35303,32.95605 L 494.8794,37.0625 L 494.8794,39.62012 L 493.41065,39.62012 L 493.41065,37.02539 L 490.96436,32.95605 z"
- id="path374"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- enable-background="new "
- id="g376">
- <path
- d="M 512.83057,32.95605 L 515.61475,37.42675 L 515.63037,37.42675 L 515.63037,32.95605 L 517.00537,32.95605 L 517.00537,39.62011 L 515.53955,39.62011 L 512.76611,35.1582 L 512.74756,35.1582 L 512.74756,39.62011 L 511.37256,39.62011 L 511.37256,32.95605 L 512.83057,32.95605 z"
- id="path378"
- style="fill:#ffffff" />
-
- <path
- d="M 522.56885,34.73145 C 522.48194,34.59083 522.37256,34.46778 522.2417,34.36231 C 522.11084,34.25684 521.96338,34.17383 521.79834,34.11524 C 521.6333,34.05567 521.46045,34.02637 521.28076,34.02637 C 520.95068,34.02637 520.67041,34.08985 520.43994,34.21778 C 520.20947,34.34473 520.02295,34.51563 519.88037,34.73048 C 519.73682,34.94532 519.63232,35.18946 519.56689,35.4629 C 519.50146,35.73634 519.46923,36.01954 519.46923,36.31153 C 519.46923,36.5918 519.50146,36.86426 519.56689,37.12794 C 519.63232,37.39259 519.73681,37.63087 519.88037,37.84181 C 520.02295,38.05372 520.20947,38.22267 520.43994,38.3506 C 520.67041,38.47853 520.95068,38.54201 521.28076,38.54201 C 521.72803,38.54201 522.07861,38.40529 522.33056,38.13088 C 522.58251,37.85744 522.73681,37.49611 522.79247,37.04787 L 524.21142,37.04787 C 524.17431,37.46486 524.07763,37.84182 523.92236,38.17775 C 523.76709,38.51466 523.56103,38.8008 523.30615,39.0381 C 523.05127,39.2754 522.75244,39.45607 522.40967,39.58107 C 522.06787,39.70607 521.69092,39.76857 521.28076,39.76857 C 520.77002,39.76857 520.31103,39.6797 519.90283,39.50197 C 519.4956,39.32521 519.15088,39.08009 518.8706,38.76955 C 518.58935,38.45803 518.37451,38.09182 518.22509,37.67189 C 518.07568,37.25099 518.00048,36.79884 518.00048,36.31251 C 518.00048,35.81446 518.07568,35.35255 518.22509,34.92579 C 518.3745,34.49903 518.58935,34.12696 518.8706,33.80958 C 519.15087,33.4922 519.4956,33.24317 519.90283,33.06251 C 520.31103,32.88185 520.77002,32.792 521.28076,32.792 C 521.64795,32.792 521.99463,32.84473 522.32178,32.95118 C 522.64795,33.05665 522.94092,33.21095 523.19873,33.41407 C 523.45752,33.61622 523.67041,33.86719 523.83838,34.16602 C 524.00635,34.46485 524.11182,34.80762 524.15576,35.19336 L 522.73681,35.19336 C 522.7124,35.02539 522.65576,34.87109 522.56885,34.73145 z"
- id="path380"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- enable-background="new "
- id="g382">
- <path
- d="M 538.83057,32.95605 L 541.61475,37.42675 L 541.63037,37.42675 L 541.63037,32.95605 L 543.00537,32.95605 L 543.00537,39.62011 L 541.53955,39.62011 L 538.76611,35.1582 L 538.74756,35.1582 L 538.74756,39.62011 L 537.37256,39.62011 L 537.37256,32.95605 L 538.83057,32.95605 z"
- id="path384"
- style="fill:#ffffff" />
-
- <path
- d="M 547.16748,32.95605 C 547.59814,32.95605 547.99756,33.02441 548.36865,33.16113 C 548.73974,33.29785 549.06006,33.5039 549.33154,33.77734 C 549.60205,34.05078 549.81396,34.39355 549.96631,34.80371 C 550.11963,35.21484 550.1958,35.69726 550.1958,36.25098 C 550.1958,36.73633 550.1333,37.1836 550.00928,37.59473 C 549.88428,38.00489 549.6958,38.36035 549.44385,38.65821 C 549.19092,38.95704 548.87647,39.19239 548.49951,39.36329 C 548.12255,39.53419 547.6792,39.62013 547.16748,39.62013 L 544.28955,39.62013 L 544.28955,32.95607 L 547.16748,32.95607 L 547.16748,32.95605 z M 547.06494,38.38574 C 547.27685,38.38574 547.48193,38.35156 547.68115,38.2832 C 547.88037,38.21484 548.0581,38.10156 548.21338,37.94238 C 548.36865,37.78418 548.49365,37.57812 548.5874,37.32324 C 548.68017,37.06836 548.72705,36.75683 548.72705,36.39062 C 548.72705,36.05468 548.69482,35.75195 548.62939,35.48144 C 548.56396,35.21093 548.45654,34.97949 548.30712,34.7871 C 548.1577,34.59471 547.96044,34.44628 547.71435,34.34374 C 547.46826,34.2412 547.16455,34.19042 546.80419,34.19042 L 545.75829,34.19042 L 545.75829,38.38573 L 547.06494,38.38573 L 547.06494,38.38574 z"
- id="path386"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- id="g6370_1_"
- transform="translate(286.1464,208.0498)">
- <g
- id="g7610_1_"
- transform="matrix(1.146822,0,0,1.146822,-67.14005,-41.89676)">
-
- <path
- id="path6372_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M 269.61823,-131.7348 C 269.62247,-126.90787 265.71222,-122.99292 260.88486,-122.98907 C 256.05832,-122.98611 252.14295,-126.89593 252.13956,-131.72204 C 252.13956,-131.72714 252.13956,-131.73098 252.13956,-131.7348 C 252.13614,-136.56216 256.04642,-140.47711 260.87293,-140.48095 C 265.69944,-140.48394 269.61481,-136.57409 269.61823,-131.74801 C 269.61823,-131.74374 269.61823,-131.73907 269.61823,-131.7348 z"
- style="fill:#ffffff" />
-
- <path
- id="path6374_1_"
- d="M 260.86526,-141.90982 C 263.71875,-141.90982 266.12945,-140.9263 268.09909,-138.95969 C 270.06869,-136.99219 271.05392,-134.58362 271.05392,-131.73481 C 271.05392,-128.88642 270.08572,-126.5034 268.15017,-124.58659 C 266.09539,-122.56843 263.6668,-121.56022 260.86526,-121.56022 C 258.0986,-121.56022 255.71261,-122.56077 253.70892,-124.5619 C 251.70526,-126.56214 250.70385,-128.95368 250.70385,-131.73481 C 250.70385,-134.51637 251.70525,-136.92493 253.70892,-138.95969 C 255.6615,-140.9263 258.04752,-141.90982 260.86526,-141.90982 z M 252.9928,-134.46866 C 252.68964,-133.6099 252.53723,-132.69876 252.53723,-131.7348 C 252.53723,-129.47952 253.36151,-127.5299 255.00839,-125.88431 C 256.65524,-124.23999 258.61636,-123.41742 260.89166,-123.41742 C 263.1661,-123.41742 265.14422,-124.24808 266.82516,-125.91028 C 267.38803,-126.45398 267.85214,-127.04709 268.21572,-127.69 L 264.37954,-129.39776 C 264.11984,-128.10726 262.96941,-127.23571 261.5797,-127.13351 L 261.5797,-125.56457 L 260.41137,-125.56457 L 260.41137,-127.13351 C 259.26946,-127.1463 258.16674,-127.61337 257.32287,-128.35165 L 258.72448,-129.76477 C 259.39892,-129.12952 260.07418,-128.8447 260.99554,-128.8447 C 261.59246,-128.8447 262.25412,-129.07801 262.25412,-129.8559 C 262.25412,-130.13135 262.14767,-130.32297 261.97992,-130.46729 L 261.00919,-130.89817 L 259.8017,-131.43677 C 259.20392,-131.70331 258.69724,-131.92768 258.18973,-132.15418 L 252.9928,-134.46866 z M 260.89166,-140.07861 C 258.58145,-140.07861 256.6297,-139.26495 255.03308,-137.63638 C 254.59878,-137.19784 254.2207,-136.74014 253.90054,-136.26199 L 257.78952,-134.52996 C 258.1412,-135.60931 259.16644,-136.26412 260.41138,-136.33651 L 260.41138,-137.90548 L 261.57971,-137.90548 L 261.57971,-136.33651 C 262.3844,-136.29775 263.2666,-136.07723 264.13601,-135.40365 L 262.7991,-134.02926 C 262.30606,-134.37927 261.68359,-134.62536 261.06027,-134.62536 C 260.55444,-134.62536 259.83999,-134.47036 259.83999,-133.83468 C 259.83999,-133.73803 259.87322,-133.65289 259.93197,-133.57626 L 261.23312,-132.99807 L 262.11361,-132.60549 C 262.67648,-132.35387 263.21465,-132.11544 263.74685,-131.87829 L 268.96084,-129.557 C 269.13284,-130.2395 269.21969,-130.96587 269.21969,-131.7348 C 269.21969,-134.05823 268.40478,-136.02569 266.77493,-137.63638 C 265.16129,-139.26495 263.20102,-140.07861 260.89166,-140.07861 z" />
-
- </g>
-
- </g>
-
- <g
- id="g6394_1_"
- transform="matrix(0.624995,0,0,0.624995,312.8511,316.9328)">
-
- <path
- id="path6396_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M 387.83435,-482.97366 C 387.84216,-473.56265 380.2171,-465.92666 370.80609,-465.91885 C 361.39349,-465.91342 353.75751,-473.53689 353.75122,-482.95022 C 353.75122,-482.9573 353.75122,-482.96664 353.75122,-482.97366 C 353.74499,-492.38546 361.36847,-500.02145 370.78107,-500.02853 C 380.19208,-500.03634 387.82807,-492.41128 387.83435,-482.99948 C 387.83435,-482.99008 387.83435,-482.98306 387.83435,-482.97366 z"
- style="fill:#ffffff" />
-
- <g
- id="g6398_1_"
- transform="translate(-23.9521,-87.92102)">
- <path
- id="path6400_1_"
- d="M 394.47845,-413.72311 C 389.30651,-413.72311 384.9284,-411.92001 381.34552,-408.30978 C 377.66895,-404.5762 375.83142,-400.15817 375.83142,-395.05264 C 375.83142,-389.94949 377.66894,-385.56271 381.34552,-381.89084 C 385.02057,-378.21896 389.40027,-376.38297 394.47845,-376.38297 C 399.61914,-376.38297 404.07385,-378.23533 407.84417,-381.93613 C 411.39422,-385.45334 413.17236,-389.82608 413.17236,-395.05265 C 413.17236,-400.28239 411.36456,-404.69962 407.75042,-408.30979 C 404.13635,-411.92001 399.7113,-413.72311 394.47845,-413.72311 z M 394.5238,-410.36453 C 398.76129,-410.36453 402.3598,-408.86996 405.32074,-405.88168 C 408.3114,-402.92617 409.80518,-399.31753 409.80518,-395.05264 C 409.80518,-390.75888 408.34266,-387.19638 405.41449,-384.36508 C 402.32855,-381.31503 398.69879,-379.79239 394.5238,-379.79239 C 390.34875,-379.79239 386.7503,-381.3002 383.72839,-384.31979 C 380.70648,-387.337 379.19555,-390.91592 379.19555,-395.05264 C 379.19555,-399.19333 380.7221,-402.80197 383.77679,-405.88168 C 386.70496,-408.86996 390.28625,-410.36453 394.5238,-410.36453 z" />
-
- <g
- id="g6402_1_">
- <path
- id="path6404_1_"
- d="M 401.55505,-399.47849 L 387.98468,-399.47849 L 387.98468,-396.26359 L 401.55505,-396.26359 L 401.55505,-399.47849 z M 401.55505,-393.47763 L 387.98468,-393.47763 L 387.98468,-390.26358 L 401.55505,-390.26358 L 401.55505,-393.47763 z" />
-
- </g>
-
- </g>
-
- </g>
-
- <g
- id="g398">
- <circle
- cx="491.9473"
- cy="15.31396"
- r="10.80615"
- id="circle400"
- sodipodi:cx="491.9473"
- sodipodi:cy="15.31396"
- sodipodi:rx="10.80615"
- sodipodi:ry="10.80615"
- style="fill:#ffffff" />
-
- <g
- id="g402">
- <path
- d="M 495.07474,12.18701 C 495.07474,11.77051 494.73685,11.43359 494.32083,11.43359 L 489.54837,11.43359 C 489.13235,11.43359 488.79446,11.7705 488.79446,12.18701 L 488.79446,16.95996 L 490.12551,16.95996 L 490.12551,22.6123 L 493.7427,22.6123 L 493.7427,16.95996 L 495.07473,16.95996 L 495.07473,12.18701 L 495.07474,12.18701 z"
- id="path404" />
-
- <circle
- cx="491.9346"
- cy="9.1723604"
- r="1.63232"
- id="circle406"
- sodipodi:cx="491.9346"
- sodipodi:cy="9.1723604"
- sodipodi:rx="1.63232"
- sodipodi:ry="1.63232" />
-
- </g>
-
- <path
- clip-rule="evenodd"
- d="M 491.91946,3.40771 C 488.68801,3.40771 485.95169,4.53515 483.71243,6.7915 C 481.41458,9.12451 480.26614,11.88671 480.26614,15.07568 C 480.26614,18.26465 481.41458,21.00781 483.71243,23.30273 C 486.01028,25.59716 488.74661,26.74462 491.91946,26.74462 C 495.13235,26.74462 497.91751,25.58788 500.27395,23.27294 C 502.49368,21.07616 503.60305,18.34325 503.60305,15.07567 C 503.60305,11.80809 502.47414,9.04735 500.21535,6.79149 C 497.95657,4.53516 495.19193,3.40771 491.91946,3.40771 z M 491.94974,5.50732 C 494.59818,5.50732 496.84622,6.44091 498.69583,8.3081 C 500.56595,10.15527 501.50052,12.41162 501.50052,15.07568 C 501.50052,17.75927 500.58548,19.98681 498.75443,21.75634 C 496.8267,23.6621 494.55814,24.61474 491.94974,24.61474 C 489.33939,24.61474 487.09036,23.67187 485.20169,21.78564 C 483.31302,19.89892 482.36868,17.66259 482.36868,15.07568 C 482.36868,12.48925 483.32278,10.23339 485.23098,8.3081 C 487.06204,6.44092 489.3013,5.50732 491.94974,5.50732 z"
- id="path408"
- style="fill-rule:evenodd" />
-
- </g>
-
-</g>
- </g>
-</svg>
=== removed file 'target/docbkx/images/cc/by-nc-sa.svg'
--- target/docbkx/images/cc/by-nc-sa.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-nc-sa.svg 1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by-nc-sa.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.8760684"
- inkscape:cx="60"
- inkscape:cy="31"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="170"
- inkscape:window-y="319" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937808,0,0,0.9936696,-437.12334,-74.436914)"
- id="g117"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-nc-sa.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_5_"
- nodetypes="ccccccc"
- d="M 443.28857,75.3667 L 557.35205,75.56934 C 558.9458,75.56934 560.36963,75.33301 560.36963,78.75 L 560.22998,116.31689 L 440.40967,116.31689 L 440.40967,78.61035 C 440.40967,76.92529 440.57275,75.3667 443.28857,75.3667 z"
- style="fill:#aab2ab" />
- <path
- d="M 558.34912,74.91113 L 442.12061,74.91113 C 440.87354,74.91113 439.85889,75.92578 439.85889,77.17236 L 439.85889,116.66845 C 439.85889,116.95019 440.08741,117.1787 440.36963,117.1787 L 560.09912,117.1787 C 560.38135,117.1787 560.60986,116.95018 560.60986,116.66845 L 560.60986,77.17236 C 560.60986,75.92578 559.59521,74.91113 558.34912,74.91113 z M 442.12061,75.93262 L 558.34913,75.93262 C 559.03272,75.93262 559.58839,76.48877 559.58839,77.17237 C 559.58839,77.17237 559.58839,93.06934 559.58839,104.56641 L 476.51515,104.56641 C 473.47023,110.07227 467.60304,113.81055 460.87062,113.81055 C 454.13624,113.81055 448.27101,110.07569 445.22804,104.56641 L 440.88038,104.56641 C 440.88038,93.06934 440.88038,77.17237 440.88038,77.17237 C 440.88037,76.48877 441.43701,75.93262 442.12061,75.93262 z"
- id="path120" />
- <g
- id="g5908_5_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
- <path
- id="path5906_5_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 486.26599,-55.7066 C 486.27154,-47.02581 479.2381,-39.9851 470.55786,-39.97952 C 461.87768,-39.9739 454.83636,-47.00738 454.83081,-55.68762 C 454.83081,-55.69433 454.83081,-55.69989 454.83081,-55.7066 C 454.82519,-64.38739 461.85864,-71.4281 470.53888,-71.43371 C 479.22022,-71.43871 486.26148,-64.40588 486.26599,-55.72564 C 486.26599,-55.71948 486.26599,-55.71277 486.26599,-55.7066 z"
- style="fill:#ffffff" />
- <g
- id="g5706_5_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_5_"
- d="M 772.94165,-167.5741 C 776.42651,-164.08869 778.16943,-159.82074 778.16943,-154.77191 C 778.16943,-149.72253 776.45666,-145.49988 773.03112,-142.10397 C 769.39526,-138.52795 765.09936,-136.74023 760.14111,-136.74023 C 755.24328,-136.74023 751.02124,-138.51287 747.47717,-142.05978 C 743.93078,-145.60504 742.15869,-149.84222 742.15869,-154.77191 C 742.15869,-159.7005 743.93078,-163.96789 747.47717,-167.5741 C 750.93176,-171.06061 755.15381,-172.80359 760.14111,-172.80359 C 765.18994,-172.80359 769.45569,-171.06061 772.94165,-167.5741 z M 749.82312,-165.22925 C 746.87634,-162.25287 745.40295,-158.76636 745.40295,-154.76746 C 745.40295,-150.76856 746.86181,-147.31165 749.77722,-144.39624 C 752.69482,-141.47974 756.16626,-140.02148 760.19482,-140.02148 C 764.22338,-140.02148 767.72497,-141.49429 770.7019,-144.44043 C 773.52783,-147.17688 774.94079,-150.6181 774.94079,-154.76746 C 774.94079,-158.88495 773.50439,-162.38038 770.63256,-165.25165 C 767.76195,-168.12226 764.28271,-169.55817 760.19482,-169.55817 C 756.10693,-169.55817 752.64783,-168.11499 749.82312,-165.22925 z M 757.57703,-156.52606 C 757.12732,-157.50775 756.45386,-157.9989 755.55432,-157.9989 C 753.9657,-157.9989 753.17139,-156.92883 753.17139,-154.78979 C 753.17139,-152.65026 753.9657,-151.58129 755.55432,-151.58129 C 756.60376,-151.58129 757.35327,-152.10204 757.80298,-153.14587 L 760.00574,-151.97284 C 758.95532,-150.10736 757.38013,-149.17383 755.28028,-149.17383 C 753.66028,-149.17383 752.36256,-149.67053 751.38819,-150.66339 C 750.41273,-151.6568 749.92493,-153.02673 749.92493,-154.77191 C 749.92493,-156.48694 750.42835,-157.84845 751.43299,-158.85693 C 752.43751,-159.86547 753.69056,-160.3695 755.1908,-160.3695 C 757.41138,-160.3695 759,-159.49462 759.96216,-157.74664 L 757.57703,-156.52606 z M 767.94092,-156.52606 C 767.49011,-157.50775 766.82886,-157.9989 765.9585,-157.9989 C 764.33753,-157.9989 763.52637,-156.92883 763.52637,-154.78979 C 763.52637,-152.65026 764.33753,-151.58129 765.9585,-151.58129 C 767.01014,-151.58129 767.74622,-152.10204 768.16578,-153.14587 L 770.41773,-151.97284 C 769.36951,-150.10736 767.79664,-149.17383 765.70008,-149.17383 C 764.0824,-149.17383 762.78809,-149.67053 761.81361,-150.66339 C 760.84144,-151.6568 760.35365,-153.02673 760.35365,-154.77191 C 760.35365,-156.48694 760.84816,-157.84845 761.83717,-158.85693 C 762.82496,-159.86547 764.08241,-160.3695 765.61061,-160.3695 C 767.8268,-160.3695 769.41432,-159.49462 770.37196,-157.74664 L 767.94092,-156.52606 z" />
- </g>
- </g>
- <g
- id="g126">
- <circle
- cx="491.94629"
- cy="90.231934"
- r="10.80615"
- id="circle128"
- sodipodi:cx="491.94629"
- sodipodi:cy="90.231934"
- sodipodi:rx="10.80615"
- sodipodi:ry="10.80615"
- style="fill:#ffffff" />
- <g
- id="g130">
- <path
- d="M 495.07373,87.10498 C 495.07373,86.68848 494.73584,86.35107 494.31982,86.35107 L 489.54736,86.35107 C 489.13134,86.35107 488.79345,86.68847 488.79345,87.10498 L 488.79345,91.87793 L 490.1245,91.87793 L 490.1245,97.52979 L 493.74169,97.52979 L 493.74169,91.87793 L 495.07372,91.87793 L 495.07372,87.10498 L 495.07373,87.10498 z"
- id="path132" />
- <circle
- cx="491.93359"
- cy="84.090332"
- r="1.63232"
- id="circle134"
- sodipodi:cx="491.93359"
- sodipodi:cy="84.090332"
- sodipodi:rx="1.63232"
- sodipodi:ry="1.63232" />
- </g>
- <path
- clip-rule="evenodd"
- d="M 491.91846,78.3252 C 488.68701,78.3252 485.95069,79.45313 483.71143,81.70899 C 481.41358,84.04249 480.26514,86.80469 480.26514,89.99366 C 480.26514,93.18263 481.41358,95.9253 483.71143,98.22071 C 486.00928,100.51466 488.74561,101.6626 491.91846,101.6626 C 495.13135,101.6626 497.91651,100.50586 500.27295,98.19092 C 502.49268,95.99365 503.60205,93.26123 503.60205,89.99365 C 503.60205,86.72607 502.47314,83.96484 500.21435,81.70898 C 497.95556,79.45312 495.19092,78.3252 491.91846,78.3252 z M 491.94873,80.4248 C 494.59717,80.4248 496.84521,81.35888 498.69482,83.22607 C 500.56494,85.07324 501.49951,87.32959 501.49951,89.99365 C 501.49951,92.67724 500.58447,94.90429 498.75342,96.67431 C 496.82569,98.58007 494.55713,99.53271 491.94873,99.53271 C 489.33838,99.53271 487.08935,98.58984 485.20068,96.70312 C 483.31201,94.81689 482.36767,92.58056 482.36767,89.99365 C 482.36767,87.40674 483.32177,85.15136 485.22997,83.22607 C 487.06104,81.35889 489.30029,80.4248 491.94873,80.4248 z"
- id="path136"
- style="fill-rule:evenodd" />
- </g>
- <g
- enable-background="new "
- id="g138">
- <path
- d="M 488.56299,107.86719 C 488.88037,107.86719 489.17041,107.89551 489.43213,107.95117 C 489.69385,108.00683 489.91846,108.09863 490.10596,108.22656 C 490.29248,108.35351 490.43701,108.52344 490.54053,108.73437 C 490.64307,108.94628 490.69483,109.20703 490.69483,109.51855 C 490.69483,109.85449 490.61866,110.13378 490.46534,110.35742 C 490.313,110.58203 490.08643,110.76465 489.78761,110.9082 C 490.19972,111.02636 490.50734,111.2334 490.71046,111.52929 C 490.91358,111.82518 491.01515,112.18163 491.01515,112.59863 C 491.01515,112.93457 490.94972,113.22558 490.81886,113.47168 C 490.688,113.7168 490.51124,113.91797 490.28956,114.07324 C 490.06886,114.22949 489.81593,114.34472 489.53272,114.41894 C 489.24854,114.49414 488.95752,114.53124 488.65772,114.53124 L 485.42139,114.53124 L 485.42139,107.86718 L 488.56299,107.86718 L 488.56299,107.86719 z M 488.37549,110.5625 C 488.63721,110.5625 488.85205,110.5 489.02002,110.37598 C 489.18897,110.25196 489.27295,110.05078 489.27295,109.77149 C 489.27295,109.61622 489.24463,109.48829 489.18897,109.38965 C 489.13233,109.29004 489.05811,109.21289 488.96436,109.15625 C 488.87061,109.10059 488.76319,109.06152 488.64209,109.04004 C 488.52002,109.01856 488.39404,109.00781 488.26318,109.00781 L 486.89013,109.00781 L 486.89013,110.5625 L 488.37549,110.5625 z M 488.46143,113.39062 C 488.60498,113.39062 488.7417,113.37695 488.87256,113.34863 C 489.00342,113.32031 489.11865,113.27343 489.21924,113.20898 C 489.31885,113.14355 489.39795,113.05468 489.45752,112.94238 C 489.51611,112.83105 489.54639,112.6875 489.54639,112.51367 C 489.54639,112.17187 489.44971,111.92773 489.25635,111.78125 C 489.06299,111.63574 488.80713,111.5625 488.48975,111.5625 L 486.89014,111.5625 L 486.89014,113.39062 L 488.46143,113.39062 z"
- id="path140"
- style="fill:#ffffff" />
- <path
- d="M 491.27393,107.86719 L 492.91651,107.86719 L 494.47706,110.49903 L 496.02882,107.86719 L 497.66261,107.86719 L 495.188,111.97364 L 495.188,114.53126 L 493.71925,114.53126 L 493.71925,111.93653 L 491.27393,107.86719 z"
- id="path142"
- style="fill:#ffffff" />
- </g>
- <g
- enable-background="new "
- id="g144">
- <path
- d="M 538.91553,112.88379 C 538.99658,113.03906 539.10303,113.16504 539.23682,113.26172 C 539.37061,113.3584 539.52686,113.42969 539.70752,113.47656 C 539.88721,113.52344 540.07275,113.54687 540.26611,113.54687 C 540.39599,113.54687 540.53564,113.53613 540.68506,113.51367 C 540.8335,113.49219 540.97315,113.45019 541.10401,113.38769 C 541.23389,113.32617 541.34229,113.24023 541.43018,113.13085 C 541.51612,113.02245 541.56006,112.88378 541.56006,112.71581 C 541.56006,112.53515 541.50244,112.38964 541.38721,112.27733 C 541.27295,112.16503 541.12159,112.07225 540.93604,111.99706 C 540.74952,111.92284 540.5376,111.85741 540.30225,111.80077 C 540.06592,111.74511 539.82666,111.68261 539.58448,111.61425 C 539.33546,111.55175 539.09327,111.47558 538.85694,111.38573 C 538.62159,111.29589 538.40967,111.1787 538.22315,111.03514 C 538.0376,110.89256 537.88624,110.71385 537.77198,110.49901 C 537.65675,110.28417 537.59913,110.0244 537.59913,109.71971 C 537.59913,109.37694 537.67237,109.08006 537.81788,108.82811 C 537.96436,108.57616 538.15577,108.3662 538.39112,108.19725 C 538.62745,108.02928 538.89503,107.90526 539.19385,107.8242 C 539.4917,107.74315 539.79053,107.70311 540.08838,107.70311 C 540.43701,107.70311 540.771,107.74217 541.09131,107.8203 C 541.41065,107.89745 541.6958,108.0244 541.94385,108.19823 C 542.19287,108.37303 542.39014,108.59569 542.53662,108.8662 C 542.68213,109.13768 542.75537,109.46581 542.75537,109.85155 L 541.33349,109.85155 C 541.32079,109.65233 541.27978,109.48729 541.20849,109.35741 C 541.1372,109.22655 541.04247,109.12401 540.92431,109.04882 C 540.80712,108.9746 540.67236,108.92089 540.52099,108.89062 C 540.36962,108.85937 540.20361,108.84374 540.02392,108.84374 C 539.90673,108.84374 539.78857,108.85644 539.67138,108.88085 C 539.55322,108.90624 539.44677,108.94921 539.35107,109.01171 C 539.25439,109.07421 539.17627,109.15136 539.11377,109.24511 C 539.05225,109.33886 539.021,109.45702 539.021,109.5996 C 539.021,109.73046 539.04541,109.8369 539.09522,109.91698 C 539.14502,109.99803 539.24268,110.07323 539.38917,110.14159 C 539.53566,110.20995 539.73683,110.27831 539.99464,110.34667 C 540.25245,110.41503 540.59034,110.50292 541.00636,110.60839 C 541.13038,110.6328 541.30324,110.6787 541.52296,110.74413 C 541.74366,110.80956 541.96339,110.91308 542.18019,111.05663 C 542.39796,111.20018 542.58546,111.39159 542.74464,111.63085 C 542.90284,111.87011 542.98194,112.17675 542.98194,112.55077 C 542.98194,112.85546 542.92237,113.13866 542.80421,113.40038 C 542.68605,113.6621 542.51026,113.88768 542.27687,114.07714 C 542.04347,114.26757 541.75441,114.41503 541.40871,114.5205 C 541.06398,114.62695 540.66457,114.67968 540.20949,114.67968 C 539.8423,114.67968 539.48683,114.63378 539.14113,114.54394 C 538.79543,114.45312 538.49074,114.31152 538.22707,114.11816 C 537.96242,113.9248 537.75246,113.67773 537.59621,113.3789 C 537.44094,113.08007 537.36574,112.72558 537.37258,112.31445 L 538.79446,112.31445 C 538.79443,112.53809 538.83447,112.72852 538.91553,112.88379 z"
- id="path146"
- style="fill:#ffffff" />
- <path
- d="M 547.17236,107.86719 L 549.66455,114.53125 L 548.14307,114.53125 L 547.63916,113.04687 L 545.14697,113.04687 L 544.62353,114.53125 L 543.14892,114.53125 L 545.66943,107.86719 L 547.17236,107.86719 z M 547.25635,111.95312 L 546.41651,109.50976 L 546.39698,109.50976 L 545.52979,111.95312 L 547.25635,111.95312 z"
- id="path148"
- style="fill:#ffffff" />
- </g>
- <g
- enable-background="new "
- id="g150">
- <path
- d="M 512.83057,107.86719 L 515.61475,112.33789 L 515.63037,112.33789 L 515.63037,107.86719 L 517.00537,107.86719 L 517.00537,114.53125 L 515.53955,114.53125 L 512.76611,110.06934 L 512.74756,110.06934 L 512.74756,114.53125 L 511.37256,114.53125 L 511.37256,107.86719 L 512.83057,107.86719 z"
- id="path152"
- style="fill:#ffffff" />
- <path
- d="M 522.56885,109.64258 C 522.48194,109.50196 522.37256,109.37891 522.2417,109.27344 C 522.11084,109.16797 521.96338,109.08496 521.79834,109.02637 C 521.6333,108.9668 521.46045,108.9375 521.28076,108.9375 C 520.95068,108.9375 520.67041,109.00098 520.43994,109.12891 C 520.20947,109.25586 520.02295,109.42676 519.88037,109.64161 C 519.73682,109.85645 519.63232,110.10059 519.56689,110.37403 C 519.50146,110.64747 519.46923,110.93067 519.46923,111.22266 C 519.46923,111.50293 519.50146,111.77539 519.56689,112.03907 C 519.63232,112.30372 519.73681,112.542 519.88037,112.75294 C 520.02295,112.96485 520.20947,113.1338 520.43994,113.26173 C 520.67041,113.38966 520.95068,113.45314 521.28076,113.45314 C 521.72803,113.45314 522.07861,113.31642 522.33056,113.04201 C 522.58251,112.76857 522.73681,112.40724 522.79247,111.959 L 524.21142,111.959 C 524.17431,112.37599 524.07763,112.75295 523.92236,113.08888 C 523.76709,113.42579 523.56103,113.71193 523.30615,113.94923 C 523.05127,114.18653 522.75244,114.3672 522.40967,114.4922 C 522.06787,114.6172 521.69092,114.6797 521.28076,114.6797 C 520.77002,114.6797 520.31103,114.59083 519.90283,114.4131 C 519.4956,114.23634 519.15088,113.99122 518.8706,113.68068 C 518.59033,113.36916 518.37451,113.00295 518.22509,112.58302 C 518.07568,112.16212 518.00048,111.70997 518.00048,111.22364 C 518.00048,110.72559 518.07568,110.26368 518.22509,109.83692 C 518.3745,109.41016 518.59032,109.03809 518.8706,108.72071 C 519.15088,108.40333 519.4956,108.1543 519.90283,107.97364 C 520.31103,107.79298 520.77002,107.70313 521.28076,107.70313 C 521.64795,107.70313 521.99463,107.75586 522.3208,107.86231 C 522.64795,107.96778 522.94092,108.12208 523.19873,108.3252 C 523.45752,108.52735 523.67041,108.77832 523.83838,109.07715 C 524.00635,109.37598 524.11182,109.71875 524.15576,110.10449 L 522.73681,110.10449 C 522.71143,109.93652 522.65576,109.78223 522.56885,109.64258 z"
- id="path154"
- style="fill:#ffffff" />
- </g>
- <g
- id="g6332_1_"
- transform="matrix(0.624995,0,0,0.624995,152.2987,316.9328)">
- <path
- id="path6334_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M 644.57642,-363.11569 C 644.58423,-353.70389 636.95911,-346.0679 627.54663,-346.06088 C 618.13403,-346.05539 610.49963,-353.67813 610.4917,-363.09225 C 610.4917,-363.09927 610.4917,-363.10867 610.4917,-363.11569 C 610.48547,-372.52749 618.1106,-380.16348 627.52161,-380.1705 C 636.93421,-380.17752 644.56861,-372.55246 644.57642,-363.14145 C 644.57642,-363.13211 644.57642,-363.12509 644.57642,-363.11569 z"
- style="fill:#ffffff" />
- <g
- id="g6336_1_"
- transform="translate(-23.9521,-89.72962)">
- <path
- id="path6338_1_"
- d="M 651.36426,-292.05655 C 646.19238,-292.05655 641.81421,-290.25107 638.23291,-286.64322 C 634.5564,-282.90878 632.71729,-278.48923 632.71729,-273.38608 C 632.71729,-268.28293 634.5564,-263.89615 638.23291,-260.22348 C 641.90796,-256.55154 646.28613,-254.71561 651.36426,-254.71561 C 656.50501,-254.71561 660.95972,-256.56797 664.72998,-260.26957 C 668.28162,-263.78678 670.05823,-268.15873 670.05823,-273.38609 C 670.05823,-278.61351 668.25196,-283.03306 664.63623,-286.64323 C 661.02222,-290.25107 656.59875,-292.05655 651.36426,-292.05655 z M 651.41113,-288.69559 C 655.64868,-288.69559 659.2456,-287.20261 662.20654,-284.21427 C 665.19726,-281.25883 666.6925,-277.65098 666.6925,-273.38608 C 666.6925,-269.09232 665.22851,-265.52976 662.2987,-262.69614 C 659.21594,-259.64768 655.58459,-258.12345 651.41113,-258.12345 C 647.23608,-258.12345 643.63769,-259.63285 640.61572,-262.65085 C 637.59387,-265.66959 636.08288,-269.24698 636.08288,-273.38608 C 636.08288,-277.52518 637.6079,-281.13455 640.66259,-284.21427 C 643.59082,-287.20261 647.17358,-288.69559 651.41113,-288.69559 z" />
- <path
- id="path6340_1_"
- d="M 643.08923,-276.02048 C 643.833,-280.71897 647.13928,-283.22989 651.28466,-283.22989 C 657.24401,-283.22989 660.87682,-278.90488 660.87682,-273.13767 C 660.87682,-267.5095 657.01122,-263.13913 651.19078,-263.13913 C 647.18614,-263.13913 643.6002,-265.60245 642.94859,-270.43997 L 647.65171,-270.43997 C 647.79233,-267.92898 649.4221,-267.04465 651.75022,-267.04465 C 654.40342,-267.04465 656.12681,-269.50949 656.12681,-273.27671 C 656.12681,-277.23142 654.6378,-279.32285 651.84239,-279.32285 C 649.79393,-279.32285 648.02513,-278.57834 647.65172,-276.02048 L 649.01891,-276.02988 L 645.31737,-272.32669 L 641.61571,-276.02988 L 643.08923,-276.02048 z" />
- </g>
- </g>
- <g
- id="g6361_1_"
- transform="matrix(1.146822,0,0,1.146822,-85.92464,166.153)">
- <path
- id="path6363_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M 536.23669,-66.41458 C 536.24096,-61.18613 532.00543,-56.94675 526.77868,-56.94208 C 521.55108,-56.93866 517.30956,-61.17337 517.30615,-66.40094 C 517.30615,-66.40564 517.30615,-66.41031 517.30615,-66.41458 C 517.30194,-71.64218 521.53747,-75.88241 526.76422,-75.88708 C 531.99182,-75.8905 536.23334,-71.65536 536.23669,-66.42819 C 536.23669,-66.42438 536.23669,-66.41882 536.23669,-66.41458 z"
- style="fill:#ffffff" />
- <path
- id="path6365_1_"
- d="M 526.75824,-76.5896 C 529.6109,-76.5896 532.02161,-75.60565 533.99121,-73.63944 C 535.96167,-71.67197 536.94604,-69.2634 536.94604,-66.41459 C 536.94604,-63.56578 535.97784,-61.18318 534.04315,-59.26634 C 531.98755,-57.24821 529.55981,-56.23958 526.75824,-56.23958 C 523.99072,-56.23958 521.60474,-57.24013 519.60193,-59.24123 C 517.59827,-61.2415 516.59601,-63.63347 516.59601,-66.4146 C 516.59601,-69.19573 517.59827,-71.6043 519.60193,-73.63945 C 521.5545,-75.60565 523.93964,-76.5896 526.75824,-76.5896 z M 518.8858,-69.14801 C 518.58178,-68.28967 518.43023,-67.37851 518.43023,-66.41458 C 518.43023,-64.15884 519.25366,-62.20926 520.90051,-60.56409 C 522.54736,-58.91935 524.50848,-58.09674 526.78381,-58.09674 C 529.05908,-58.09674 531.03723,-58.92743 532.71814,-60.58963 C 533.28015,-61.13333 533.74426,-61.72644 534.10785,-62.36935 L 530.27252,-64.07751 C 530.01282,-62.78659 528.86242,-61.91546 527.47186,-61.81286 L 527.47186,-60.24389 L 526.30353,-60.24389 L 526.30353,-61.81286 C 525.16248,-61.82604 524.0589,-62.29312 523.21503,-63.0314 L 524.61664,-64.44412 C 525.29187,-63.80929 525.96631,-63.52402 526.8877,-63.52402 C 527.48548,-63.52402 528.1471,-63.75736 528.1471,-64.53565 C 528.1471,-64.8107 528.0398,-65.00272 527.87208,-65.14664 L 526.90217,-65.5788 L 525.69386,-66.11655 C 525.09608,-66.38263 524.59022,-66.60746 524.08271,-66.83396 L 518.8858,-69.14801 z M 526.78381,-74.75793 C 524.47442,-74.75793 522.5227,-73.9443 520.92608,-72.31573 C 520.49175,-71.87762 520.1137,-71.41949 519.79266,-70.94134 L 523.68249,-69.20974 C 524.03417,-70.28863 525.05944,-70.94347 526.30352,-71.01629 L 526.30352,-72.58523 L 527.47185,-72.58523 L 527.47185,-71.01629 C 528.27654,-70.97711 529.15874,-70.75655 530.02898,-70.083 L 528.69207,-68.70904 C 528.19817,-69.05859 527.57574,-69.30511 526.95238,-69.30511 C 526.44658,-69.30511 525.73296,-69.15014 525.73296,-68.51532 C 525.73296,-68.41782 525.76537,-68.33225 525.82409,-68.25687 L 527.12524,-67.6774 L 528.00573,-67.28485 C 528.56945,-67.03363 529.1068,-66.79523 529.63982,-66.55765 L 534.85381,-64.23633 C 535.02581,-64.91928 535.11181,-65.64563 535.11181,-66.41458 C 535.11181,-68.73886 534.29693,-70.70505 532.6679,-72.31573 C 531.05426,-73.94431 529.09314,-74.75793 526.78381,-74.75793 z" />
- </g>
- </g>
- </g>
-</svg>
=== removed file 'target/docbkx/images/cc/by-nc.svg'
--- target/docbkx/images/cc/by-nc.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-nc.svg 1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by-nc.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="179"
- inkscape:cy="89.569904"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="488"
- inkscape:window-y="401" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937808,0,0,0.9936927,-177.69414,-148.87729)"
- id="g325"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-nc.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_3_"
- nodetypes="ccccccc"
- d="M 182.23535,150.26416 L 296.29931,150.4668 C 297.89306,150.4668 299.31689,150.23047 299.31689,153.64698 L 299.17724,191.21387 L 179.35693,191.21387 L 179.35693,153.50782 C 179.35693,151.82275 179.52002,150.26416 182.23535,150.26416 z"
- style="fill:#aab2ab" />
-
- <g
- id="g5908_3_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
-
- <path
- id="path5906_3_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 187.20946,30.09433 C 187.21504,38.77457 180.1816,45.81586 171.50138,45.82144 C 162.82116,45.82648 155.77932,38.79358 155.77428,30.11337 C 155.77428,30.10666 155.77428,30.10104 155.77428,30.09433 C 155.76924,21.41357 162.80213,14.37228 171.48236,14.36725 C 180.16368,14.36221 187.20442,21.39511 187.20946,30.07532 C 187.20946,30.08148 187.20946,30.08762 187.20946,30.09433 z"
- style="fill:#ffffff" />
-
- <g
- id="g5706_3_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_3_"
- d="M 473.88458,-81.77313 C 477.36999,-78.28775 479.11297,-74.01977 479.11297,-68.97098 C 479.11297,-63.92157 477.40014,-59.69895 473.9746,-56.30304 C 470.33929,-52.72702 466.04284,-50.93927 461.08517,-50.93927 C 456.18737,-50.93927 451.9653,-52.71191 448.42004,-56.25885 C 444.87423,-59.80411 443.10162,-64.04184 443.10162,-68.97098 C 443.10162,-73.89954 444.87423,-78.16693 448.42004,-81.77313 C 451.87524,-85.26022 456.09732,-87.00265 461.08517,-87.00265 C 466.13342,-87.00266 470.39917,-85.26022 473.88458,-81.77313 z M 450.7666,-79.42883 C 447.81982,-76.45245 446.34704,-72.96539 446.34704,-68.96649 C 446.34704,-64.96814 447.80529,-61.51126 450.72125,-58.5953 C 453.63781,-55.67935 457.10977,-54.22106 461.1383,-54.22106 C 465.16686,-54.22106 468.66851,-55.69332 471.64489,-58.64004 C 474.47076,-61.37591 475.88427,-64.8171 475.88427,-68.96649 C 475.88427,-73.08453 474.44781,-76.57944 471.57659,-79.45065 C 468.70598,-82.32132 465.22674,-83.7572 461.1383,-83.7572 C 457.04993,-83.7572 453.59192,-82.31406 450.7666,-79.42883 z M 458.52106,-70.72513 C 458.07077,-71.70737 457.39673,-72.19794 456.49784,-72.19794 C 454.9087,-72.19794 454.11439,-71.12787 454.11439,-68.98941 C 454.11439,-66.84985 454.9087,-65.78033 456.49784,-65.78033 C 457.54719,-65.78033 458.29676,-66.30111 458.74647,-67.34487 L 460.94926,-66.1719 C 459.89933,-64.30642 458.32417,-63.37341 456.22377,-63.37341 C 454.60384,-63.37341 453.30611,-63.87011 452.33168,-64.86297 C 451.35561,-65.85641 450.86897,-67.22573 450.86897,-68.97097 C 450.86897,-70.68597 451.37126,-72.04803 452.37645,-73.05599 C 453.38161,-74.06453 454.6335,-74.5685 456.13426,-74.5685 C 458.35438,-74.5685 459.9441,-73.69423 460.90507,-71.94622 L 458.52106,-70.72513 z M 468.8844,-70.72513 C 468.43353,-71.70737 467.77295,-72.19794 466.90204,-72.19794 C 465.28095,-72.19794 464.46991,-71.12787 464.46991,-68.98941 C 464.46991,-66.84985 465.28095,-65.78033 466.90204,-65.78033 C 467.95307,-65.78033 468.68921,-66.30111 469.10925,-67.34487 L 471.36126,-66.1719 C 470.31304,-64.30642 468.74011,-63.37341 466.64361,-63.37341 C 465.02587,-63.37341 463.73095,-63.87011 462.75714,-64.86297 C 461.78497,-65.85641 461.29773,-67.22573 461.29773,-68.97097 C 461.29773,-70.68597 461.79224,-72.04803 462.78064,-73.05599 C 463.76843,-74.06453 465.02588,-74.5685 466.55408,-74.5685 C 468.77027,-74.5685 470.35779,-73.69423 471.31543,-71.94622 L 468.8844,-70.72513 z" />
-
- </g>
-
- </g>
-
- <path
- d="M 297.29639,149.82227 L 181.06739,149.82227 C 179.82081,149.82227 178.80616,150.83594 178.80616,152.08252 L 178.80616,191.57861 C 178.80616,191.86035 179.03516,192.08886 179.3169,192.08886 L 299.04639,192.08886 C 299.32813,192.08886 299.55713,191.86034 299.55713,191.57861 L 299.55713,152.08252 C 299.55713,150.83594 298.54297,149.82227 297.29639,149.82227 z M 181.06738,150.84277 L 297.29638,150.84277 C 297.97997,150.84277 298.53564,151.39892 298.53564,152.08252 C 298.53564,152.08252 298.53564,167.96777 298.53564,179.46387 L 215.46191,179.46387 C 212.41699,184.96973 206.55078,188.70752 199.81836,188.70752 C 193.08301,188.70752 187.21826,184.97266 184.17481,179.46387 L 179.82764,179.46387 C 179.82764,167.96778 179.82764,152.08252 179.82764,152.08252 C 179.82764,151.39893 180.38379,150.84277 181.06738,150.84277 z"
- id="path332" />
-
- <g
- enable-background="new "
- id="g334">
- <path
- d="M 239.17822,182.77734 C 239.49609,182.77734 239.78564,182.80566 240.04736,182.86132 C 240.30908,182.91698 240.53369,183.00878 240.72119,183.13671 C 240.90771,183.26366 241.05322,183.43359 241.15576,183.64452 C 241.2583,183.85643 241.31006,184.11718 241.31006,184.4287 C 241.31006,184.76464 241.23389,185.04393 241.08057,185.26757 C 240.92823,185.49218 240.70166,185.6748 240.40284,185.81835 C 240.81495,185.93651 241.12257,186.14355 241.32569,186.43944 C 241.52881,186.73533 241.63038,187.09178 241.63038,187.50878 C 241.63038,187.84472 241.56495,188.13573 241.43409,188.38183 C 241.30323,188.62695 241.12647,188.82812 240.90577,188.98339 C 240.68409,189.13964 240.43116,189.25487 240.14796,189.32909 C 239.86378,189.40429 239.57276,189.44139 239.27296,189.44139 L 236.03663,189.44139 L 236.03663,182.77733 L 239.17822,182.77733 L 239.17822,182.77734 z M 238.99121,185.47266 C 239.25244,185.47266 239.46777,185.41016 239.63623,185.28614 C 239.8042,185.16212 239.88818,184.96094 239.88818,184.68165 C 239.88818,184.52638 239.85986,184.39845 239.8042,184.29981 C 239.74756,184.2002 239.67334,184.12305 239.57959,184.06641 C 239.48633,184.01075 239.37891,183.97168 239.25732,183.9502 C 239.13573,183.92872 239.00976,183.91797 238.8789,183.91797 L 237.50536,183.91797 L 237.50536,185.47266 L 238.99121,185.47266 z M 239.07666,188.30078 C 239.22021,188.30078 239.35693,188.28711 239.48828,188.25879 C 239.61865,188.23047 239.73486,188.18359 239.83447,188.11914 C 239.93408,188.05371 240.01318,187.96484 240.07275,187.85254 C 240.13232,187.74121 240.16162,187.59766 240.16162,187.42383 C 240.16162,187.08203 240.06494,186.83789 239.87158,186.69141 C 239.67822,186.5459 239.42285,186.47266 239.10498,186.47266 L 237.50537,186.47266 L 237.50537,188.30078 L 239.07666,188.30078 L 239.07666,188.30078 z"
- id="path336"
- style="fill:#ffffff" />
-
- <path
- d="M 241.88916,182.77734 L 243.53271,182.77734 L 245.09326,185.40918 L 246.64404,182.77734 L 248.27783,182.77734 L 245.8042,186.88379 L 245.8042,189.44141 L 244.33545,189.44141 L 244.33545,186.84668 L 241.88916,182.77734 z"
- id="path338"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- enable-background="new "
- id="g340">
- <path
- d="M 265.78076,182.77734 L 268.56494,187.24804 L 268.58056,187.24804 L 268.58056,182.77734 L 269.95556,182.77734 L 269.95556,189.4414 L 268.48974,189.4414 L 265.7163,184.97949 L 265.69775,184.97949 L 265.69775,189.4414 L 264.32275,189.4414 L 264.32275,182.77734 L 265.78076,182.77734 z"
- id="path342"
- style="fill:#ffffff" />
-
- <path
- d="M 275.51904,184.55273 C 275.43213,184.41211 275.32275,184.28906 275.19189,184.18359 C 275.06103,184.07812 274.91357,183.99511 274.74853,183.93652 C 274.58349,183.87695 274.41064,183.84765 274.23095,183.84765 C 273.90087,183.84765 273.6206,183.91113 273.39013,184.03906 C 273.15966,184.16601 272.97314,184.33691 272.83056,184.55176 C 272.68701,184.7666 272.58251,185.01074 272.51708,185.28418 C 272.45165,185.55762 272.41942,185.84082 272.41942,186.13281 C 272.41942,186.41308 272.45165,186.68554 272.51708,186.94922 C 272.58251,187.21387 272.687,187.45215 272.83056,187.66309 C 272.97314,187.875 273.15966,188.04395 273.39013,188.17188 C 273.6206,188.29981 273.90087,188.36329 274.23095,188.36329 C 274.67822,188.36329 275.0288,188.22657 275.28075,187.95216 C 275.5327,187.67872 275.687,187.31739 275.74266,186.86915 L 277.16161,186.86915 C 277.1245,187.28614 277.02782,187.6631 276.87255,187.99903 C 276.71728,188.33594 276.51122,188.62208 276.25634,188.85938 C 276.00146,189.09668 275.70263,189.27735 275.35986,189.40235 C 275.01806,189.52735 274.64111,189.58985 274.23095,189.58985 C 273.72021,189.58985 273.26122,189.50098 272.85302,189.32325 C 272.44579,189.14649 272.10107,188.90137 271.82079,188.59083 C 271.53954,188.27931 271.3247,187.9131 271.17528,187.49317 C 271.02587,187.07227 270.95067,186.62012 270.95067,186.13379 C 270.95067,185.63574 271.02587,185.17383 271.17528,184.74707 C 271.32469,184.32031 271.53954,183.94824 271.82079,183.63086 C 272.10106,183.31348 272.44579,183.06445 272.85302,182.88379 C 273.26122,182.70313 273.72021,182.61328 274.23095,182.61328 C 274.59814,182.61328 274.94482,182.66601 275.27197,182.77246 C 275.59814,182.87793 275.89111,183.03223 276.14892,183.23535 C 276.40771,183.4375 276.6206,183.68847 276.78857,183.9873 C 276.95654,184.28613 277.06201,184.6289 277.10595,185.01464 L 275.687,185.01464 C 275.6626,184.84668 275.60596,184.69238 275.51904,184.55273 z"
- id="path344"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- id="g6379_1_"
- transform="matrix(1.146822,0,0,1.146822,457.9375,166.153)">
-
- <path
- id="path6381_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M -154.14499,-1.09436 C -154.14157,3.73257 -158.051,7.64752 -162.87836,7.65134 C -167.70488,7.65433 -171.62026,3.74448 -171.62366,-1.0816 C -171.62366,-1.0867 -171.62366,-1.09054 -171.62366,-1.09436 C -171.62706,-5.92175 -167.71765,-9.8367 -162.89115,-9.84051 C -158.06376,-9.8435 -154.14838,-5.93365 -154.145,-1.10757 C -154.14499,-1.1033 -154.14499,-1.09863 -154.14499,-1.09436 z"
- style="fill:#ffffff" />
-
- <path
- id="path6383_1_"
- d="M -162.89709,-11.26941 C -160.04528,-11.26941 -157.63372,-10.28589 -155.66412,-8.31925 C -153.69452,-6.35178 -152.70929,-3.94321 -152.70929,-1.09437 C -152.70929,1.75445 -153.67749,4.13704 -155.61304,6.05385 C -157.66779,8.07198 -160.09552,9.08022 -162.8971,9.08022 C -165.66544,9.08022 -168.0506,8.07967 -170.05428,6.07854 C -172.05794,4.07827 -173.05935,1.68672 -173.05935,-1.09437 C -173.05935,-3.87593 -172.05795,-6.28449 -170.05428,-8.31925 C -168.1017,-10.28589 -165.71568,-11.26941 -162.89709,-11.26941 z M -170.77042,-3.82825 C -171.07357,-2.96945 -171.22513,-2.05832 -171.22513,-1.09436 C -171.22513,1.16092 -170.40254,3.11054 -168.75568,4.7561 C -167.1088,6.40045 -165.14771,7.22345 -162.87156,7.22345 C -160.59623,7.22345 -158.61897,6.39276 -156.93803,4.73013 C -156.37516,4.18686 -155.91108,3.59335 -155.54747,2.95044 L -159.38365,1.24268 C -159.64339,2.53318 -160.79295,3.40473 -162.18352,3.5069 L -162.18352,5.07587 L -163.35182,5.07587 L -163.35182,3.5069 C -164.49374,3.49414 -165.59733,3.02707 -166.44035,2.28879 L -165.03958,0.87567 C -164.3643,1.51089 -163.68904,1.79617 -162.76768,1.79617 C -162.17073,1.79617 -161.5091,1.56241 -161.5091,0.78454 C -161.5091,0.50906 -161.6164,0.31747 -161.78412,0.17355 L -162.75403,-0.25901 L -163.96237,-0.79633 C -164.55929,-1.06287 -165.06511,-1.28727 -165.57347,-1.51377 L -170.77042,-3.82825 z M -162.87155,-9.43817 C -165.18092,-9.43817 -167.1335,-8.62451 -168.72928,-6.99597 C -169.16441,-6.5574 -169.54164,-6.0993 -169.86353,-5.62158 L -165.97286,-3.88955 C -165.62201,-4.96887 -164.59676,-5.62371 -163.35181,-5.69607 L -163.35181,-7.26504 L -162.18351,-7.26504 L -162.18351,-5.69607 C -161.37882,-5.65734 -160.49662,-5.43679 -159.62721,-4.76321 L -160.96412,-3.38885 C -161.45716,-3.7384 -162.07963,-3.98492 -162.70295,-3.98492 C -163.20875,-3.98492 -163.92236,-3.82992 -163.92236,-3.19513 C -163.92236,-3.09763 -163.89085,-3.01245 -163.83123,-2.93668 L -162.5301,-2.35764 L -161.64961,-1.96506 C -161.08674,-1.71344 -160.54857,-1.47501 -160.01552,-1.23743 L -154.80239,1.08343 C -154.62954,0.40093 -154.54354,-0.32544 -154.54354,-1.09437 C -154.54354,-3.41865 -155.35845,-5.38487 -156.9883,-6.99598 C -158.60193,-8.62451 -160.56302,-9.43817 -162.87155,-9.43817 z" />
-
- </g>
-
- <g
- id="g349">
- <circle
- cx="242.56226"
- cy="165.13574"
- r="10.8064"
- id="circle351"
- sodipodi:cx="242.56226"
- sodipodi:cy="165.13574"
- sodipodi:rx="10.8064"
- sodipodi:ry="10.8064"
- style="fill:#ffffff" />
-
- <g
- id="g353">
- <path
- d="M 245.68994,162.00928 C 245.68994,161.59278 245.35205,161.25537 244.93603,161.25537 L 240.16357,161.25537 C 239.74755,161.25537 239.40966,161.59277 239.40966,162.00928 L 239.40966,166.78223 L 240.74071,166.78223 L 240.74071,172.43409 L 244.3579,172.43409 L 244.3579,166.78223 L 245.68993,166.78223 L 245.68993,162.00928 L 245.68994,162.00928 z"
- id="path355" />
-
- <circle
- cx="242.5498"
- cy="158.99463"
- r="1.63232"
- id="circle357"
- sodipodi:cx="242.5498"
- sodipodi:cy="158.99463"
- sodipodi:rx="1.63232"
- sodipodi:ry="1.63232" />
-
- </g>
-
- <path
- clip-rule="evenodd"
- d="M 242.53467,153.22949 C 239.30322,153.22949 236.56641,154.35693 234.32715,156.61328 C 232.0293,158.94678 230.88086,161.70898 230.88086,164.89795 C 230.88086,168.08692 232.0293,170.82959 234.32715,173.12451 C 236.625,175.41894 239.36133,176.5664 242.53467,176.5664 C 245.74756,176.5664 248.53272,175.41015 250.88819,173.09521 C 253.10889,170.89794 254.21827,168.16552 254.21827,164.89794 C 254.21827,161.63036 253.08936,158.86913 250.83057,156.61327 C 248.57178,154.35693 245.80615,153.22949 242.53467,153.22949 z M 242.56396,155.3291 C 245.2124,155.3291 247.46142,156.26318 249.31103,158.12988 C 251.18115,159.97754 252.11572,162.2334 252.11572,164.89795 C 252.11572,167.58154 251.20068,169.80859 249.36963,171.57813 C 247.4419,173.48438 245.17334,174.43702 242.56397,174.43702 C 239.9546,174.43702 237.70557,173.49366 235.81739,171.60743 C 233.92774,169.72071 232.98389,167.48438 232.98389,164.89796 C 232.98389,162.31105 233.93799,160.05519 235.84619,158.12989 C 237.67676,156.26318 239.9165,155.3291 242.56396,155.3291 z"
- id="path359"
- style="fill-rule:evenodd" />
-
- </g>
-
-</g>
- </g>
-</svg>
=== removed file 'target/docbkx/images/cc/by-nd.svg'
--- target/docbkx/images/cc/by-nd.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-nd.svg 1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by-nd.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="179"
- inkscape:cy="89.569904"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="488"
- inkscape:window-y="401" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937808,0,0,0.9936696,-177.69414,-223.30978)"
- id="g78"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-nd.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_6_"
- nodetypes="ccccccc"
- d="M 182.23535,225.17188 L 296.29931,225.375 C 297.89306,225.375 299.31689,225.13867 299.31689,228.55566 L 299.17724,266.12207 L 179.35693,266.12207 L 179.35693,228.41602 C 179.35693,226.73145 179.52002,225.17188 182.23535,225.17188 z"
- style="fill:#aab2ab" />
-
- <g
- id="g5908_6_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
-
- <path
- id="path5906_6_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 187.20946,115.90759 C 187.21504,124.58783 180.1816,131.62912 171.50138,131.6347 C 162.82116,131.64028 155.77932,124.60684 155.77428,115.92663 C 155.77428,115.91992 155.77428,115.9143 155.77428,115.90759 C 155.76924,107.22625 162.80213,100.18609 171.48236,100.18051 C 180.16368,100.17602 187.20442,107.20837 187.20946,115.88858 C 187.20946,115.89529 187.20946,115.90088 187.20946,115.90759 z"
- style="fill:#ffffff" />
-
- <g
- id="g5706_6_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_6_"
- d="M 473.88458,4.04068 C 477.36999,7.52551 479.11297,11.79349 479.11297,16.84229 C 479.11297,21.89225 477.40014,26.11432 473.9746,29.51081 C 470.33929,33.08625 466.04284,34.874 461.08517,34.874 C 456.18737,34.874 451.9653,33.10191 448.42004,29.55442 C 444.87423,26.00916 443.10162,21.77143 443.10162,16.84229 C 443.10162,11.91431 444.87423,7.64634 448.42004,4.04068 C 451.87524,0.55359 456.09732,-1.18939 461.08517,-1.18939 C 466.13342,-1.18939 470.39917,0.55359 473.88458,4.04068 z M 450.7666,6.38443 C 447.81982,9.36136 446.34704,12.84845 446.34704,16.84677 C 446.34704,20.84512 447.80529,24.302 450.72125,27.2185 C 453.63781,30.13391 457.10977,31.59274 461.1383,31.59274 C 465.16686,31.59274 468.66851,30.12051 471.64489,27.17376 C 474.47076,24.43734 475.88427,20.99615 475.88427,16.84676 C 475.88427,12.72872 474.44781,9.23381 471.57659,6.36202 C 468.70598,3.49248 465.22674,2.05605 461.1383,2.05605 C 457.04993,2.05606 453.59192,3.49921 450.7666,6.38443 z M 458.52106,15.08813 C 458.07077,14.10589 457.39673,13.61587 456.49784,13.61587 C 454.9087,13.61587 454.11439,14.68539 454.11439,16.8244 C 454.11439,18.96341 454.9087,20.03293 456.49784,20.03293 C 457.54719,20.03293 458.29676,19.5116 458.74647,18.46893 L 460.94926,19.64135 C 459.89933,21.50628 458.32417,22.44042 456.22377,22.44042 C 454.60384,22.44042 453.30611,21.94369 452.33168,20.95028 C 451.35561,19.95684 450.86897,18.58752 450.86897,16.84228 C 450.86897,15.12728 451.37126,13.76577 452.37645,12.75671 C 453.38161,11.74871 454.6335,11.2453 456.13426,11.2453 C 458.35438,11.2453 459.9441,12.11902 460.90507,13.86758 L 458.52106,15.08813 z M 468.8844,15.08813 C 468.43353,14.10589 467.77295,13.61587 466.90204,13.61587 C 465.28095,13.61587 464.46991,14.68539 464.46991,16.8244 C 464.46991,18.96341 465.28095,20.03293 466.90204,20.03293 C 467.95307,20.03293 468.68921,19.5116 469.10925,18.46893 L 471.36126,19.64135 C 470.31304,21.50628 468.74011,22.44042 466.64361,22.44042 C 465.02587,22.44042 463.73095,21.94369 462.75714,20.95028 C 461.78497,19.95684 461.29773,18.58752 461.29773,16.84228 C 461.29773,15.12728 461.79224,13.76577 462.78064,12.75671 C 463.76843,11.74871 465.02588,11.2453 466.55408,11.2453 C 468.77027,11.2453 470.35779,12.11902 471.31543,13.86758 L 468.8844,15.08813 z" />
-
- </g>
-
- </g>
-
- <g
- id="g85">
- <circle
- cx="242.56226"
- cy="240.00684"
- r="10.8064"
- id="circle87"
- sodipodi:cx="242.56226"
- sodipodi:cy="240.00684"
- sodipodi:rx="10.8064"
- sodipodi:ry="10.8064"
- style="fill:#ffffff" />
-
- <g
- id="g89">
- <path
- d="M 245.68994,236.87988 C 245.68994,236.46289 245.35205,236.12597 244.93603,236.12597 L 240.16357,236.12597 C 239.74755,236.12597 239.40966,236.46288 239.40966,236.87988 L 239.40966,241.65234 L 240.74071,241.65234 L 240.74071,247.30468 L 244.3579,247.30468 L 244.3579,241.65234 L 245.68993,241.65234 L 245.68993,236.87988 L 245.68994,236.87988 z"
- id="path91" />
-
- <circle
- cx="242.5498"
- cy="233.86523"
- r="1.63232"
- id="circle93"
- sodipodi:cx="242.5498"
- sodipodi:cy="233.86523"
- sodipodi:rx="1.63232"
- sodipodi:ry="1.63232" />
-
- </g>
-
- <path
- clip-rule="evenodd"
- d="M 242.53467,228.10059 C 239.30322,228.10059 236.56641,229.22754 234.32715,231.48438 C 232.0293,233.81739 230.88086,236.58008 230.88086,239.76856 C 230.88086,242.95704 232.0293,245.7002 234.32715,247.99512 C 236.625,250.29004 239.36133,251.4375 242.53467,251.4375 C 245.74756,251.4375 248.53272,250.28027 250.88819,247.96582 C 253.10889,245.76855 254.21827,243.03613 254.21827,239.76855 C 254.21827,236.50097 253.08936,233.74023 250.83057,231.48437 C 248.57178,229.22754 245.80615,228.10059 242.53467,228.10059 z M 242.56396,230.2002 C 245.2124,230.2002 247.46142,231.13379 249.31103,233.00098 C 251.18115,234.84766 252.11572,237.1045 252.11572,239.76856 C 252.11572,242.45215 251.20068,244.67969 249.36963,246.44922 C 247.4419,248.35449 245.17334,249.30762 242.56397,249.30762 C 239.9546,249.30762 237.70557,248.36426 235.81739,246.47852 C 233.92774,244.5918 232.98389,242.35547 232.98389,239.76856 C 232.98389,237.18165 233.93799,234.92579 235.84619,233.00098 C 237.67676,231.13379 239.9165,230.2002 242.56396,230.2002 z"
- id="path95"
- style="fill-rule:evenodd" />
-
- </g>
-
- <path
- d="M 297.29639,224.73242 L 181.06739,224.73242 C 179.82081,224.73242 178.80616,225.74707 178.80616,226.99316 L 178.80616,266.48925 C 178.80616,266.77148 179.03516,266.99999 179.3169,266.99999 L 299.04639,266.99999 C 299.32813,266.99999 299.55713,266.77147 299.55713,266.48925 L 299.55713,226.99316 C 299.55713,225.74707 298.54297,224.73242 297.29639,224.73242 z M 181.06738,225.75391 L 297.29638,225.75391 C 297.97997,225.75391 298.53564,226.30957 298.53564,226.99317 C 298.53564,226.99317 298.53564,242.87598 298.53564,254.37208 L 215.46191,254.37208 C 212.41699,259.87794 206.55078,263.61622 199.81836,263.61622 C 193.08301,263.61622 187.21826,259.88087 184.17481,254.37208 L 179.82764,254.37208 C 179.82764,242.87599 179.82764,226.99317 179.82764,226.99317 C 179.82764,226.30957 180.38379,225.75391 181.06738,225.75391 z"
- id="path97" />
-
- <g
- enable-background="new "
- id="g99">
- <path
- d="M 239.17822,257.68848 C 239.49609,257.68848 239.78564,257.7168 240.04736,257.77246 C 240.30908,257.82812 240.53369,257.91992 240.72119,258.04785 C 240.90771,258.1748 241.05322,258.34473 241.15576,258.55566 C 241.2583,258.76757 241.31006,259.02832 241.31006,259.33984 C 241.31006,259.67578 241.23389,259.95507 241.08057,260.17968 C 240.92823,260.40331 240.70166,260.58691 240.40284,260.72948 C 240.81495,260.84764 241.12257,261.05468 241.32569,261.35057 C 241.52881,261.64646 241.63038,262.00291 241.63038,262.41991 C 241.63038,262.75585 241.56495,263.04686 241.43409,263.29296 C 241.30323,263.53906 241.12647,263.73925 240.90577,263.89452 C 240.68409,264.05077 240.43116,264.166 240.14796,264.24022 C 239.86378,264.31542 239.57276,264.35252 239.27296,264.35252 L 236.03663,264.35252 L 236.03663,257.68846 L 239.17822,257.68846 L 239.17822,257.68848 z M 238.99121,260.38379 C 239.25244,260.38379 239.46777,260.32227 239.63623,260.19727 C 239.8042,260.07325 239.88818,259.87207 239.88818,259.59278 C 239.88818,259.43751 239.85986,259.31055 239.8042,259.21094 C 239.74756,259.11133 239.67334,259.03418 239.57959,258.97852 C 239.48633,258.92188 239.37891,258.88379 239.25732,258.86133 C 239.13574,258.83985 239.00976,258.8291 238.8789,258.8291 L 237.50536,258.8291 L 237.50536,260.38379 L 238.99121,260.38379 z M 239.07666,263.21191 C 239.22021,263.21191 239.35693,263.19824 239.48828,263.16992 C 239.61865,263.1416 239.73486,263.0957 239.83447,263.03027 C 239.93408,262.96484 240.01318,262.87597 240.07275,262.76465 C 240.13232,262.65235 240.16162,262.50977 240.16162,262.33496 C 240.16162,261.99316 240.06494,261.74902 239.87158,261.60351 C 239.67822,261.45703 239.42285,261.38378 239.10498,261.38378 L 237.50537,261.38378 L 237.50537,263.2119 L 239.07666,263.2119 L 239.07666,263.21191 z"
- id="path101"
- style="fill:#ffffff" />
-
- <path
- d="M 241.88916,257.68848 L 243.53271,257.68848 L 245.09326,260.32032 L 246.64404,257.68848 L 248.27783,257.68848 L 245.8042,261.79493 L 245.8042,264.35255 L 244.33545,264.35255 L 244.33545,261.75782 L 241.88916,257.68848 z"
- id="path103"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- enable-background="new "
- id="g105">
- <path
- d="M 265.27686,257.68848 L 268.06104,262.15918 L 268.07666,262.15918 L 268.07666,257.68848 L 269.45166,257.68848 L 269.45166,264.35254 L 267.98584,264.35254 L 265.2124,259.89063 L 265.19385,259.89063 L 265.19385,264.35254 L 263.81885,264.35254 L 263.81885,257.68848 L 265.27686,257.68848 z"
- id="path107"
- style="fill:#ffffff" />
-
- <path
- d="M 273.61377,257.68848 C 274.04443,257.68848 274.44385,257.75684 274.81494,257.89356 C 275.18603,258.03126 275.50635,258.23633 275.77783,258.50977 C 276.04834,258.78321 276.26025,259.12598 276.4126,259.53614 C 276.56592,259.94727 276.64209,260.42969 276.64209,260.98341 C 276.64209,261.46876 276.57959,261.917 276.45557,262.32716 C 276.33057,262.73829 276.14209,263.09278 275.89014,263.39161 C 275.63721,263.68946 275.32276,263.92481 274.9458,264.09571 C 274.56885,264.26759 274.12549,264.35255 273.61377,264.35255 L 270.73584,264.35255 L 270.73584,257.68849 L 273.61377,257.68849 L 273.61377,257.68848 z M 273.51123,263.11816 C 273.72314,263.11816 273.92822,263.08398 274.12744,263.01562 C 274.32666,262.94726 274.50439,262.83398 274.65967,262.67578 C 274.81494,262.5166 274.93994,262.31055 275.03369,262.05566 C 275.12646,261.80078 275.17334,261.49023 275.17334,261.12304 C 275.17334,260.7871 275.14111,260.48437 275.07568,260.21386 C 275.01025,259.94335 274.90283,259.71191 274.75341,259.51952 C 274.60399,259.32713 274.40673,259.17968 274.16064,259.07616 C 273.91455,258.9746 273.61084,258.92284 273.25048,258.92284 L 272.20458,258.92284 L 272.20458,263.11815 L 273.51123,263.11815 L 273.51123,263.11816 z"
- id="path109"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- id="g6501"
- transform="matrix(0.624995,0,0,0.624995,-183.0107,316.9328)">
-
- <path
- id="path6503"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M 743.93005,-123.39972 C 743.93634,-113.98871 736.31128,-106.35272 726.89868,-106.34491 C 717.48767,-106.34021 709.85168,-113.96213 709.84387,-123.37628 C 709.84387,-123.38409 709.84387,-123.39346 709.84387,-123.39972 C 709.83764,-132.81229 717.46264,-140.44675 726.87524,-140.45456 C 736.28784,-140.46237 743.92224,-132.83728 743.93005,-123.42471 C 743.93005,-123.4169 743.93005,-123.40909 743.93005,-123.39972 z"
- style="fill:#ffffff" />
-
- <g
- id="g6505"
- transform="translate(-23.9521,-87.92102)">
- <path
- id="path6507"
- d="M 750.57263,-54.14914 C 745.39917,-54.14914 741.02258,-52.34604 737.43976,-48.7366 C 733.76319,-45.00219 731.92566,-40.58343 731.92566,-35.4787 C 731.92566,-30.37552 733.76318,-25.98956 737.43976,-22.3161 C 741.11633,-18.64419 745.49292,-16.80823 750.57263,-16.80823 C 755.71179,-16.80823 760.16809,-18.66138 763.93835,-22.36298 C 767.48999,-25.88019 769.2666,-30.25211 769.2666,-35.4787 C 769.2666,-40.70844 767.45874,-45.12564 763.8446,-48.7366 C 760.23059,-52.34604 755.80554,-54.14914 750.57263,-54.14914 z M 750.61951,-50.79129 C 754.85547,-50.79129 758.45398,-49.29599 761.41492,-46.30691 C 764.40558,-43.3522 765.90088,-39.74435 765.90088,-35.47869 C 765.90088,-31.1849 764.43683,-27.62237 761.50708,-24.7911 C 758.42273,-21.74108 754.79297,-20.21764 750.61951,-20.21764 C 746.44294,-20.21764 742.84449,-21.72545 739.82257,-24.74578 C 736.80066,-27.76299 735.28973,-31.34115 735.28973,-35.47869 C 735.28973,-39.61935 736.81628,-43.22719 739.86944,-46.30691 C 742.79919,-49.29599 746.38196,-50.79129 750.61951,-50.79129 z" />
-
- <g
- id="g6509">
- <path
- id="path6511"
- d="M 757.65088,-39.90375 L 744.07727,-39.90375 L 744.07727,-36.68964 L 757.65088,-36.68964 L 757.65088,-39.90375 z M 757.65088,-33.90369 L 744.07727,-33.90369 L 744.07727,-30.68961 L 757.65088,-30.68961 L 757.65088,-33.90369 z" />
-
- </g>
-
- </g>
-
- </g>
-
-</g>
- </g>
-</svg>
=== removed file 'target/docbkx/images/cc/by-sa.svg'
--- target/docbkx/images/cc/by-sa.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by-sa.svg 1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by-sa.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="179"
- inkscape:cy="89.569904"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="488"
- inkscape:window-y="401" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937807,0,0,0.9936694,-177.69409,-74.436409)"
- id="g287"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-sa.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_2_"
- nodetypes="ccccccc"
- d="M 182.23532,75.39014 L 296.29928,75.59326 C 297.89303,75.59326 299.31686,75.35644 299.31686,78.77344 L 299.17721,116.34033 L 179.3569,116.34033 L 179.3569,78.63379 C 179.3569,76.94922 179.51999,75.39014 182.23532,75.39014 z"
- style="fill:#aab2ab" />
-
- <g
- id="g5908_2_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
-
- <path
- id="path5906_2_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 187.20944,-55.6792 C 187.21502,-46.99896 180.18158,-39.95825 171.50134,-39.95212 C 162.82113,-39.94708 155.77929,-46.97998 155.77426,-55.66016 C 155.77426,-55.66687 155.77426,-55.67249 155.77426,-55.6792 C 155.76922,-64.36054 162.80209,-71.40125 171.48233,-71.40631 C 180.16367,-71.41193 187.20441,-64.37842 187.20944,-55.69824 C 187.20944,-55.69263 187.20944,-55.68591 187.20944,-55.6792 z"
- style="fill:#ffffff" />
-
- <g
- id="g5706_2_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_2_"
- d="M 473.88455,-167.54724 C 477.36996,-164.06128 479.11294,-159.79333 479.11294,-154.74451 C 479.11294,-149.69513 477.40014,-145.47303 473.9746,-142.07715 C 470.33929,-138.50055 466.04281,-136.71283 461.08513,-136.71283 C 456.18736,-136.71283 451.96526,-138.48544 448.42003,-142.03238 C 444.87419,-145.57819 443.10158,-149.81537 443.10158,-154.74451 C 443.10158,-159.6731 444.87419,-163.94049 448.42003,-167.54724 C 451.87523,-171.03375 456.09728,-172.77618 461.08513,-172.77618 C 466.13342,-172.77618 470.39914,-171.03375 473.88455,-167.54724 z M 450.76657,-165.20239 C 447.81982,-162.22601 446.34701,-158.7395 446.34701,-154.74005 C 446.34701,-150.7417 447.80529,-147.28485 450.72125,-144.36938 C 453.63778,-141.45288 457.10974,-139.99462 461.1383,-139.99462 C 465.16683,-139.99462 468.66848,-141.46743 471.64486,-144.41363 C 474.47076,-147.14947 475.88427,-150.59069 475.88427,-154.74005 C 475.88427,-158.85809 474.44781,-162.35297 471.57659,-165.22479 C 468.70595,-168.09546 465.22671,-169.53131 461.1383,-169.53131 C 457.04993,-169.53131 453.59192,-168.08813 450.76657,-165.20239 z M 458.52106,-156.49927 C 458.07074,-157.4809 457.39673,-157.9715 456.49781,-157.9715 C 454.90867,-157.9715 454.11439,-156.90198 454.11439,-154.763 C 454.11439,-152.62341 454.90867,-151.55389 456.49781,-151.55389 C 457.54719,-151.55389 458.29676,-152.07519 458.74647,-153.11901 L 460.94923,-151.94598 C 459.8993,-150.0805 458.32417,-149.14697 456.22374,-149.14697 C 454.60384,-149.14697 453.30611,-149.64367 452.33168,-150.63653 C 451.35561,-151.62994 450.86894,-152.99926 450.86894,-154.7445 C 450.86894,-156.46008 451.37123,-157.82159 452.37642,-158.83013 C 453.38161,-159.83806 454.63347,-160.34264 456.13423,-160.34264 C 458.35435,-160.34264 459.94407,-159.46776 460.90504,-157.71978 L 458.52106,-156.49927 z M 468.8844,-156.49927 C 468.43353,-157.4809 467.77292,-157.9715 466.90201,-157.9715 C 465.28095,-157.9715 464.46988,-156.90198 464.46988,-154.763 C 464.46988,-152.62341 465.28095,-151.55389 466.90201,-151.55389 C 467.95304,-151.55389 468.68918,-152.07519 469.10925,-153.11901 L 471.36126,-151.94598 C 470.31301,-150.0805 468.74007,-149.14697 466.64358,-149.14697 C 465.02587,-149.14697 463.73095,-149.64367 462.75711,-150.63653 C 461.78494,-151.62994 461.29773,-152.99926 461.29773,-154.7445 C 461.29773,-156.46008 461.79221,-157.82159 462.78061,-158.83013 C 463.76843,-159.83806 465.02588,-160.34264 466.55408,-160.34264 C 468.77027,-160.34264 470.35776,-159.46776 471.3154,-157.71978 L 468.8844,-156.49927 z" />
-
- </g>
-
- </g>
-
- <path
- d="M 297.29639,74.91064 L 181.06688,74.91064 C 179.8203,74.91064 178.80614,75.92529 178.80614,77.17187 L 178.80614,116.66748 C 178.80614,116.94922 179.03466,117.17822 179.31639,117.17822 L 299.04639,117.17822 C 299.32813,117.17822 299.55713,116.94922 299.55713,116.66748 L 299.55713,77.17188 C 299.55713,75.92529 298.54297,74.91064 297.29639,74.91064 z M 181.06688,75.93213 L 297.29639,75.93213 C 297.97998,75.93213 298.53565,76.48828 298.53565,77.17188 C 298.53565,77.17188 298.53565,93.09131 298.53565,104.59034 L 215.4619,104.59034 C 212.41698,110.09571 206.55077,113.83399 199.81835,113.83399 C 193.083,113.83399 187.21825,110.09913 184.1748,104.59034 L 179.82666,104.59034 C 179.82666,93.09132 179.82666,77.17188 179.82666,77.17188 C 179.82664,76.48828 180.38329,75.93213 181.06688,75.93213 z"
- id="path294" />
-
- <g
- enable-background="new "
- id="g296">
- <path
- d="M 265.60986,112.8833 C 265.68994,113.03906 265.79736,113.16504 265.93115,113.26172 C 266.06494,113.35791 266.22119,113.42969 266.40088,113.47608 C 266.58154,113.52296 266.76807,113.54639 266.96045,113.54639 C 267.09033,113.54639 267.22998,113.53565 267.3794,113.51368 C 267.52784,113.4922 267.66749,113.44972 267.79835,113.3877 C 267.92823,113.32569 268.03761,113.23975 268.12355,113.13086 C 268.21144,113.02197 268.25441,112.88379 268.25441,112.71533 C 268.25441,112.53515 268.19679,112.38916 268.08156,112.27685 C 267.9673,112.16455 267.81594,112.07177 267.62941,111.99658 C 267.44386,111.92236 267.23195,111.85693 266.9966,111.80078 C 266.76027,111.74463 266.52101,111.68262 266.27883,111.61377 C 266.02981,111.55176 265.78762,111.47559 265.55129,111.38525 C 265.31594,111.29541 265.10402,111.17822 264.9175,111.03515 C 264.73098,110.89208 264.58059,110.71337 264.46535,110.49853 C 264.35109,110.28369 264.29347,110.02392 264.29347,109.71923 C 264.29347,109.37646 264.36671,109.07958 264.51222,108.82763 C 264.6587,108.57568 264.85011,108.36572 265.08644,108.19726 C 265.32179,108.02929 265.58937,107.90478 265.8882,107.82372 C 266.18605,107.74315 266.48488,107.70263 266.78273,107.70263 C 267.13136,107.70263 267.46535,107.74169 267.78566,107.81982 C 268.105,107.89746 268.39015,108.02392 268.6382,108.19824 C 268.88722,108.37256 269.08449,108.59521 269.23097,108.86621 C 269.37648,109.13721 269.44972,109.46582 269.44972,109.85156 L 268.02784,109.85156 C 268.01514,109.65234 267.97315,109.4873 267.90284,109.35693 C 267.83155,109.22607 267.73682,109.12353 267.61964,109.04834 C 267.50148,108.97412 267.36671,108.9209 267.21534,108.89014 C 267.063,108.85889 266.89796,108.84326 266.71827,108.84326 C 266.60108,108.84326 266.48292,108.85596 266.36573,108.88037 C 266.24757,108.90576 266.14112,108.94922 266.04542,109.01123 C 265.94874,109.07373 265.86964,109.15137 265.80812,109.24463 C 265.7466,109.33838 265.71535,109.45654 265.71535,109.59961 C 265.71535,109.73047 265.73976,109.83643 265.78957,109.91699 C 265.83937,109.99804 265.93801,110.07275 266.08352,110.14111 C 266.22903,110.20947 266.43118,110.27832 266.68899,110.34668 C 266.9468,110.41504 267.28372,110.50244 267.70071,110.60791 C 267.82473,110.63281 267.99661,110.67822 268.21731,110.74365 C 268.43801,110.80908 268.65676,110.91308 268.87454,111.05615 C 269.09231,111.1997 269.27981,111.39111 269.43899,111.63037 C 269.59719,111.87012 269.67629,112.17676 269.67629,112.55029 C 269.67629,112.85547 269.61672,113.13867 269.49856,113.3999 C 269.3804,113.66162 269.20461,113.8872 268.97122,114.07666 C 268.73782,114.26709 268.44876,114.41455 268.10403,114.52051 C 267.75833,114.62647 267.35794,114.6792 266.90481,114.6792 C 266.53762,114.6792 266.18118,114.63379 265.83547,114.54346 C 265.49074,114.45313 265.18508,114.31104 264.92043,114.11768 C 264.65676,113.92432 264.4468,113.67774 264.29055,113.37891 C 264.13528,113.07959 264.06106,112.7251 264.06692,112.31397 L 265.4888,112.31397 C 265.48877,112.53809 265.52881,112.72803 265.60986,112.8833 z"
- id="path298"
- style="fill:#ffffff" />
-
- <path
- d="M 273.8667,107.8667 L 276.35986,114.53076 L 274.8374,114.53076 L 274.33349,113.04638 L 271.84033,113.04638 L 271.31787,114.53076 L 269.84326,114.53076 L 272.36377,107.8667 L 273.8667,107.8667 z M 273.95068,111.95264 L 273.11084,109.50928 L 273.09229,109.50928 L 272.22315,111.95264 L 273.95068,111.95264 z"
- id="path300"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- enable-background="new "
- id="g302">
- <path
- d="M 239.17821,107.8667 C 239.49559,107.8667 239.78563,107.89502 240.04735,107.95068 C 240.30907,108.00683 240.53368,108.09863 240.72118,108.22607 C 240.9077,108.35351 241.05321,108.52295 241.15575,108.73437 C 241.25829,108.94579 241.31005,109.20703 241.31005,109.51806 C 241.31005,109.854 241.23388,110.13329 241.08056,110.35742 C 240.92822,110.58154 240.70165,110.76465 240.40283,110.90771 C 240.81494,111.02587 241.12256,111.23291 241.32568,111.5288 C 241.5288,111.82469 241.63037,112.18114 241.63037,112.59814 C 241.63037,112.93408 241.56494,113.22509 241.43408,113.47119 C 241.30322,113.7168 241.12646,113.91748 240.90576,114.07324 C 240.68408,114.229 240.43115,114.34424 240.14795,114.41845 C 239.86377,114.49365 239.57275,114.53075 239.27295,114.53075 L 236.03662,114.53075 L 236.03662,107.86669 L 239.17821,107.86669 L 239.17821,107.8667 z M 238.99071,110.56201 C 239.25243,110.56201 239.46727,110.5 239.63622,110.37597 C 239.80419,110.25146 239.88817,110.05029 239.88817,109.77099 C 239.88817,109.61572 239.85985,109.48828 239.80419,109.38915 C 239.74755,109.28954 239.67333,109.21239 239.57958,109.15624 C 239.48583,109.10058 239.37841,109.06151 239.25731,109.04003 C 239.13524,109.01806 239.00926,109.00732 238.8784,109.00732 L 237.50535,109.00732 L 237.50535,110.56201 L 238.99071,110.56201 z M 239.07664,113.39014 C 239.22019,113.39014 239.35691,113.37647 239.48777,113.34815 C 239.61863,113.32032 239.73484,113.27344 239.83445,113.2085 C 239.93406,113.14307 240.01316,113.0542 240.07273,112.94239 C 240.1323,112.83058 240.1616,112.68751 240.1616,112.51319 C 240.1616,112.17139 240.06492,111.92725 239.87156,111.78126 C 239.6782,111.63527 239.42234,111.56202 239.10496,111.56202 L 237.50535,111.56202 L 237.50535,113.39014 L 239.07664,113.39014 z"
- id="path304"
- style="fill:#ffffff" />
-
- <path
- d="M 241.88914,107.8667 L 243.53269,107.8667 L 245.09324,110.49854 L 246.64402,107.8667 L 248.27781,107.8667 L 245.80418,111.97315 L 245.80418,114.53077 L 244.33543,114.53077 L 244.33543,111.93604 L 241.88914,107.8667 z"
- id="path306"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- id="g6316_1_"
- transform="matrix(0.624995,0,0,0.624995,391.2294,176.9332)">
-
- <path
- id="path6318_1_"
- cx="475.97119"
- ry="29.209877"
- cy="252.08646"
- type="arc"
- rx="29.209877"
- d="M -175.0083,-139.1153 C -175.00204,-129.7035 -182.62555,-122.06751 -192.03812,-122.06049 C -201.44913,-122.05341 -209.08512,-129.67774 -209.09293,-139.09028 C -209.09293,-139.09809 -209.09293,-139.10749 -209.09293,-139.1153 C -209.09919,-148.52784 -201.47413,-156.1623 -192.06311,-156.17011 C -182.65054,-156.17713 -175.01456,-148.55207 -175.0083,-139.14026 C -175.0083,-139.13092 -175.0083,-139.1239 -175.0083,-139.1153 z"
- style="fill:#ffffff" />
-
- <g
- id="g6320_1_"
- transform="translate(-23.9521,-89.72962)">
- <path
- id="path6322_1_"
- d="M -168.2204,-68.05536 C -173.39234,-68.05536 -177.76892,-66.25067 -181.35175,-62.64203 C -185.02836,-58.90759 -186.86588,-54.48883 -186.86588,-49.38568 C -186.86588,-44.28253 -185.02836,-39.89416 -181.35175,-36.22308 C -177.67673,-32.55114 -173.29859,-30.71521 -168.2204,-30.71521 C -163.07974,-30.71521 -158.62503,-32.56677 -154.85312,-36.26996 C -151.30307,-39.78558 -149.52652,-44.15827 -149.52652,-49.38568 C -149.52652,-54.6123 -151.33432,-59.03265 -154.94843,-62.64203 C -158.5625,-66.25067 -162.98599,-68.05536 -168.2204,-68.05536 z M -168.17352,-64.69519 C -163.936,-64.69519 -160.33752,-63.20221 -157.37655,-60.21466 C -154.38748,-57.25836 -152.89214,-53.64899 -152.89214,-49.38568 C -152.89214,-45.09186 -154.35466,-41.52856 -157.28438,-38.69653 C -160.36876,-35.64727 -163.99849,-34.12304 -168.17351,-34.12304 C -172.34856,-34.12304 -175.94701,-35.63244 -178.96892,-38.64965 C -181.9908,-41.66918 -183.50176,-45.24657 -183.50176,-49.38567 C -183.50176,-53.52398 -181.97518,-57.13414 -178.92205,-60.21465 C -175.9939,-63.20221 -172.41107,-64.69519 -168.17352,-64.69519 z" />
-
- <path
- id="path6324_1_"
- d="M -176.49548,-52.02087 C -175.75171,-56.71856 -172.44387,-59.22949 -168.30008,-59.22949 C -162.33911,-59.22949 -158.70783,-54.90448 -158.70783,-49.1372 C -158.70783,-43.50982 -162.57194,-39.13793 -168.39383,-39.13793 C -172.39856,-39.13793 -175.98297,-41.60277 -176.63611,-46.43877 L -171.93292,-46.43877 C -171.7923,-43.92778 -170.1626,-43.04418 -167.83447,-43.04418 C -165.1813,-43.04418 -163.4563,-45.50908 -163.4563,-49.27709 C -163.4563,-53.22942 -164.94693,-55.32244 -167.74228,-55.32244 C -169.79074,-55.32244 -171.55948,-54.57787 -171.93292,-52.02087 L -170.56418,-52.02789 L -174.26734,-48.32629 L -177.96894,-52.02789 L -176.49548,-52.02087 z" />
-
- </g>
-
- </g>
-
- <g
- id="g313">
- <circle
- cx="242.56226"
- cy="90.224609"
- r="10.8064"
- id="circle315"
- sodipodi:cx="242.56226"
- sodipodi:cy="90.224609"
- sodipodi:rx="10.8064"
- sodipodi:ry="10.8064"
- style="fill:#ffffff" />
-
- <g
- id="g317">
- <path
- d="M 245.68994,87.09766 C 245.68994,86.68116 245.35205,86.34424 244.93603,86.34424 L 240.16357,86.34424 C 239.74755,86.34424 239.40966,86.68115 239.40966,87.09766 L 239.40966,91.87061 L 240.74071,91.87061 L 240.74071,97.52295 L 244.3579,97.52295 L 244.3579,91.87061 L 245.68993,91.87061 L 245.68993,87.09766 L 245.68994,87.09766 z"
- id="path319" />
-
- <circle
- cx="242.5498"
- cy="84.083008"
- r="1.63232"
- id="circle321"
- sodipodi:cx="242.5498"
- sodipodi:cy="84.083008"
- sodipodi:rx="1.63232"
- sodipodi:ry="1.63232" />
-
- </g>
-
- <path
- clip-rule="evenodd"
- d="M 242.53467,78.31836 C 239.30322,78.31836 236.56641,79.4458 234.32715,81.70215 C 232.0293,84.03516 230.88086,86.79736 230.88086,89.98633 C 230.88086,93.1753 232.0293,95.91846 234.32715,98.21338 C 236.625,100.50781 239.36133,101.65527 242.53467,101.65527 C 245.74756,101.65527 248.53272,100.49853 250.88819,98.18359 C 253.10889,95.98681 254.21827,93.2539 254.21827,89.98632 C 254.21827,86.71874 253.08936,83.95751 250.83057,81.70214 C 248.57178,79.4458 245.80615,78.31836 242.53467,78.31836 z M 242.56396,80.41797 C 245.2124,80.41797 247.46142,81.35156 249.31103,83.21875 C 251.18115,85.06592 252.11572,87.32227 252.11572,89.98633 C 252.11572,92.66992 251.20068,94.89746 249.36963,96.66699 C 247.4419,98.57275 245.17334,99.52539 242.56397,99.52539 C 239.9546,99.52539 237.70557,98.58252 235.81739,96.6958 C 233.92774,94.80957 232.98389,92.57324 232.98389,89.98633 C 232.98389,87.3999 233.93799,85.14404 235.84619,83.21875 C 237.67676,81.35156 239.9165,80.41797 242.56396,80.41797 z"
- id="path323"
- style="fill-rule:evenodd" />
-
- </g>
-
-</g>
- </g>
-</svg>
=== removed file 'target/docbkx/images/cc/by.svg'
--- target/docbkx/images/cc/by.svg 2011-09-16 11:05:01 +0000
+++ target/docbkx/images/cc/by.svg 1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://web.resource.org/cc/";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="120"
- height="42"
- id="svg2759"
- sodipodi:version="0.32"
- inkscape:version="0.45+devel"
- version="1.0"
- sodipodi:docname="by.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2761" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#8b8b8b"
- borderopacity="1"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="179"
- inkscape:cy="89.569904"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- width="120px"
- height="42px"
- inkscape:showpageshadow="false"
- inkscape:window-width="1198"
- inkscape:window-height="624"
- inkscape:window-x="396"
- inkscape:window-y="242" />
- <metadata
- id="metadata2764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- transform="matrix(0.9937728,0,0,0.9936696,-177.69267,6.25128e-7)"
- id="g260"
- inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by.png"
- inkscape:export-xdpi="300.23013"
- inkscape:export-ydpi="300.23013">
- <path
- id="path3817_1_"
- nodetypes="ccccccc"
- d="M 181.96579,0.51074 L 296.02975,0.71338 C 297.6235,0.71338 299.04733,0.47705 299.04733,3.89404 L 298.90768,41.46093 L 179.08737,41.46093 L 179.08737,3.75439 C 179.08737,2.06934 179.25046,0.51074 181.96579,0.51074 z"
- style="fill:#aab2ab" />
-
- <path
- d="M 297.29636,0 L 181.06736,0 C 179.82078,0 178.80613,1.01416 178.80613,2.26074 L 178.80613,41.75732 C 178.80613,42.03906 179.03513,42.26757 179.31687,42.26757 L 299.04734,42.26757 C 299.32908,42.26757 299.55808,42.03905 299.55808,41.75732 L 299.55808,2.26074 C 299.55807,1.01416 298.54343,0 297.29636,0 z M 181.06735,1.02148 L 297.29635,1.02148 C 297.98043,1.02148 298.53658,1.57714 298.53658,2.26074 C 298.53658,2.26074 298.53658,18.20898 298.53658,29.71045 L 215.19234,29.71045 C 212.14742,35.21631 206.28121,38.95459 199.54879,38.95459 C 192.81344,38.95459 186.94869,35.21973 183.90524,29.71045 L 179.8276,29.71045 C 179.8276,18.20899 179.8276,2.26074 179.8276,2.26074 C 179.82761,1.57715 180.38376,1.02148 181.06735,1.02148 z"
- id="path263" />
-
- <g
- enable-background="new "
- id="g265">
- <path
- d="M 253.07761,32.95605 C 253.39499,32.95605 253.68503,32.98437 253.94773,33.04003 C 254.20945,33.09569 254.43308,33.18749 254.62058,33.31542 C 254.8071,33.44237 254.95261,33.6123 255.05515,33.82323 C 255.15769,34.03514 255.20945,34.29589 255.20945,34.60741 C 255.20945,34.94335 255.13328,35.22264 254.97996,35.44628 C 254.82762,35.67089 254.60105,35.85351 254.30223,35.99706 C 254.71434,36.11522 255.02196,36.32226 255.22508,36.61815 C 255.4282,36.91404 255.52977,37.27049 255.52977,37.68749 C 255.52977,38.02343 255.46434,38.31444 255.33348,38.56054 C 255.20262,38.80566 255.02586,39.00683 254.80516,39.1621 C 254.58348,39.31835 254.33055,39.43358 254.04735,39.5078 C 253.76317,39.583 253.47215,39.6201 253.17235,39.6201 L 249.936,39.6201 L 249.936,32.95604 L 253.07761,32.95604 L 253.07761,32.95605 z M 252.89011,35.65137 C 253.15183,35.65137 253.36667,35.58887 253.53562,35.46485 C 253.70359,35.34083 253.78757,35.13965 253.78757,34.86036 C 253.78757,34.70509 253.75925,34.57716 253.70359,34.47852 C 253.64695,34.37891 253.57273,34.30176 253.47898,34.24512 C 253.38523,34.18946 253.27781,34.15039 253.15671,34.12891 C 253.03561,34.10743 252.90866,34.09668 252.77878,34.09668 L 251.40476,34.09668 L 251.40476,35.65137 L 252.89011,35.65137 z M 252.97604,38.47949 C 253.11959,38.47949 253.25631,38.46582 253.38717,38.4375 C 253.51803,38.40918 253.63326,38.3623 253.73385,38.29785 C 253.83346,38.23242 253.91256,38.14355 253.97213,38.03125 C 254.0317,37.91992 254.061,37.77637 254.061,37.60254 C 254.061,37.26074 253.96432,37.0166 253.77096,36.87012 C 253.5776,36.72461 253.32174,36.65137 253.00436,36.65137 L 251.40475,36.65137 L 251.40475,38.47949 L 252.97604,38.47949 z"
- id="path267"
- style="fill:#ffffff" />
-
- <path
- d="M 255.78854,32.95605 L 257.43209,32.95605 L 258.99264,35.58789 L 260.54342,32.95605 L 262.17721,32.95605 L 259.70358,37.0625 L 259.70358,39.62012 L 258.23483,39.62012 L 258.23483,37.02539 L 255.78854,32.95605 z"
- id="path269"
- style="fill:#ffffff" />
-
- </g>
-
- <g
- id="g5908_1_"
- transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">
-
- <path
- id="path5906_1_"
- cx="296.35416"
- ry="22.939548"
- cy="264.3577"
- type="arc"
- rx="22.939548"
- d="M 186.90065,-141.46002 C 186.90623,-132.77923 179.87279,-125.73852 171.19257,-125.73291 C 162.51235,-125.72736 155.47051,-132.76025 155.46547,-141.44098 C 155.46547,-141.44714 155.46547,-141.45331 155.46547,-141.46002 C 155.46043,-150.14081 162.49333,-157.18152 171.17355,-157.18658 C 179.8549,-157.19213 186.89561,-150.15924 186.90065,-141.47845 C 186.90065,-141.4729 186.90065,-141.46619 186.90065,-141.46002 z"
- style="fill:#ffffff" />
-
- <g
- id="g5706_1_"
- transform="translate(-289.6157,99.0653)">
- <path
- id="path5708_1_"
- d="M 473.57574,-253.32751 C 477.06115,-249.8421 478.80413,-245.5736 478.80413,-240.52532 C 478.80413,-235.47594 477.09136,-231.25329 473.66582,-227.85741 C 470.03051,-224.28081 465.734,-222.49309 460.77635,-222.49309 C 455.87858,-222.49309 451.65648,-224.26628 448.11122,-227.81261 C 444.56541,-231.35845 442.79277,-235.59563 442.79277,-240.52532 C 442.79277,-245.45391 444.56541,-249.7213 448.11122,-253.32751 C 451.56642,-256.81402 455.7885,-258.557 460.77635,-258.557 C 465.82465,-258.55701 470.09039,-256.81403 473.57574,-253.32751 z M 450.45776,-250.98267 C 447.51104,-248.00629 446.03823,-244.51978 446.03823,-240.52033 C 446.03823,-236.52198 447.49651,-233.06507 450.41247,-230.14966 C 453.32897,-227.23316 456.80096,-225.77545 460.82952,-225.77545 C 464.85808,-225.77545 468.35967,-227.24768 471.33605,-230.19385 C 474.16198,-232.9303 475.57549,-236.37091 475.57549,-240.52033 C 475.57549,-244.63837 474.13903,-248.13379 471.26781,-251.00501 C 468.39714,-253.87568 464.9179,-255.31159 460.82952,-255.31159 C 456.74112,-255.31158 453.28314,-253.86841 450.45776,-250.98267 z M 458.21225,-242.27948 C 457.76196,-243.26117 457.08795,-243.75232 456.18903,-243.75232 C 454.59986,-243.75232 453.80558,-242.68225 453.80558,-240.54321 C 453.80558,-238.40368 454.59986,-237.33471 456.18903,-237.33471 C 457.23841,-237.33471 457.98795,-237.85546 458.43769,-238.89922 L 460.64045,-237.72625 C 459.59052,-235.86077 458.01536,-234.92779 455.91496,-234.92779 C 454.29506,-234.92779 452.99733,-235.42449 452.0229,-236.4168 C 451.0468,-237.41021 450.56016,-238.77953 450.56016,-240.52532 C 450.56016,-242.24035 451.06245,-243.60186 452.06764,-244.61034 C 453.07283,-245.61888 454.32466,-246.12291 455.82545,-246.12291 C 458.04557,-246.12291 459.63526,-245.24803 460.59626,-243.50005 L 458.21225,-242.27948 z M 468.57562,-242.27948 C 468.12475,-243.26117 467.46417,-243.75232 466.5932,-243.75232 C 464.97217,-243.75232 464.16107,-242.68225 464.16107,-240.54321 C 464.16107,-238.40368 464.97217,-237.33471 466.5932,-237.33471 C 467.64429,-237.33471 468.38037,-237.85546 468.80048,-238.89922 L 471.05249,-237.72625 C 470.00421,-235.86077 468.43127,-234.92779 466.33478,-234.92779 C 464.7171,-234.92779 463.42218,-235.42449 462.44831,-236.4168 C 461.47614,-237.41021 460.98896,-238.77953 460.98896,-240.52532 C 460.98896,-242.24035 461.48341,-243.60186 462.47181,-244.61034 C 463.45966,-245.61888 464.71711,-246.12291 466.24531,-246.12291 C 468.4615,-246.12291 470.04896,-245.24803 471.0066,-243.50005 L 468.57562,-242.27948 z" />
-
- </g>
-
- </g>
-
- <g
- id="g275">
- <circle
- cx="255.55124"
- cy="15.31348"
- r="10.80664"
- id="circle277"
- sodipodi:cx="255.55124"
- sodipodi:cy="15.31348"
- sodipodi:rx="10.80664"
- sodipodi:ry="10.80664"
- style="fill:#ffffff" />
-
- <g
- id="g279">
- <path
- d="M 258.67819,12.18701 C 258.67819,11.77051 258.3403,11.4331 257.92526,11.4331 L 253.15182,11.4331 C 252.73678,11.4331 252.39889,11.7705 252.39889,12.18701 L 252.39889,16.95996 L 253.72994,16.95996 L 253.72994,22.61182 L 257.34713,22.61182 L 257.34713,16.95996 L 258.67818,16.95996 L 258.67818,12.18701 L 258.67819,12.18701 z"
- id="path281" />
-
- <circle
- cx="255.53854"
- cy="9.1723604"
- r="1.63281"
- id="circle283"
- sodipodi:cx="255.53854"
- sodipodi:cy="9.1723604"
- sodipodi:rx="1.63281"
- sodipodi:ry="1.63281" />
-
- </g>
-
- <path
- clip-rule="evenodd"
- d="M 255.5239,3.40723 C 252.29148,3.40723 249.55515,4.53516 247.31589,6.79102 C 245.01804,9.12452 243.8696,11.88672 243.8696,15.07569 C 243.8696,18.26466 245.01804,21.00733 247.31589,23.30225 C 249.61374,25.59668 252.35007,26.74414 255.5239,26.74414 C 258.73679,26.74414 261.52195,25.58789 263.87742,23.27295 C 266.09715,21.07568 267.2075,18.34326 267.2075,15.07568 C 267.2075,11.8081 266.07762,9.04687 263.8198,6.79101 C 261.56003,4.53516 258.79538,3.40723 255.5239,3.40723 z M 255.55319,5.50684 C 258.20163,5.50684 260.45065,6.44092 262.30026,8.30811 C 264.1694,10.15528 265.10397,12.41114 265.10397,15.07569 C 265.10397,17.75928 264.18893,19.98633 262.35885,21.75587 C 260.43014,23.66212 258.16256,24.61476 255.55319,24.61476 C 252.94284,24.61476 250.69381,23.67189 248.80612,21.78517 C 246.91647,19.89845 245.97311,17.66212 245.97311,15.0757 C 245.97311,12.48879 246.92721,10.23341 248.83541,8.30812 C 250.6655,6.44092 252.90475,5.50684 255.55319,5.50684 z"
- id="path285"
- style="fill-rule:evenodd" />
-
- </g>
-
-</g>
- </g>
-</svg>
=== removed directory 'target/docbkx/images/cloud'
=== removed file 'target/docbkx/images/cloud/cover.svg'
--- target/docbkx/images/cloud/cover.svg 2011-10-20 14:44:13 +0000
+++ target/docbkx/images/cloud/cover.svg 1970-01-01 00:00:00 +0000
@@ -1,1650 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --><svg xmlns="http://www.w3.org/2000/svg"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:cc="http://creativecommons.org/ns#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; version="1.1" x="0px" y="0px" width="765" height="990" viewBox="0 0 765.00002 990.00001" enable-background="new 0 0 715.558 742.133" xml:space="preserve" id="svg2" inkscape:version="0.48.0 r9654" sodipodi:docname="openstack.st"><metadata id="metadata2976"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><defs id="defs2974"/><sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1074" inkscape:window-height="1002" id="namedview2972" showgrid="false" units="in" showguides="true" inkscape:guide-bbox="true" inkscape:zoom="1.1" inkscape:cx="357.77899" inkscape:cy="291.98385" inkscape:window-x="26" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="Layer_1"/>
- <font horiz-adv-x="1000" id="font708" horiz-origin-x="0" horiz-origin-y="0" vert-origin-x="45" vert-origin-y="90" vert-adv-y="90">
-<!-- Typeface © FontSite Inc., 1996-2008. All Rights Reserved. www.fontsite.com -->
-<!-- Copyright: Copyright 2011 Adobe System Incorporated. All rights reserved. -->
-<font-face font-family="CartoGothic Std" units-per-em="1000" underline-position="-100" underline-thickness="50" id="font-face710"/>
-<missing-glyph horiz-adv-x="500" d="M50,0l400,0l0,668l-400,0M250,382l-128,240l256,0M404,94l-128,240l128,239M96,94l0,479l128,-239M122,46l128,240l128,-240z" id="missing-glyph712"/>
-<glyph unicode="A" horiz-adv-x="683" d="M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph714"/>
-<glyph unicode="Æ" horiz-adv-x="902" d="M6,0l107,0l101,171l281,0l13,-171l332,0l0,81l-244,0l-15,223l231,0l0,81l-237,0l-15,201l268,0l0,81l-420,0M260,252l207,346l22,-346z" id="glyph716"/>
-<glyph unicode="Á" horiz-adv-x="683" d="M316,733l69,0l129,130l-111,0M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph718"/>
-<glyph unicode="Â" horiz-adv-x="683" d="M190,733l84,0l71,83l72,-83l84,0l-110,130l-91,0M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph720"/>
-<glyph unicode="Ä" horiz-adv-x="683" d="M391,746l91,0l0,97l-91,0M197,746l91,0l0,97l-91,0M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph722"/>
-<glyph unicode="À" horiz-adv-x="683" d="M308,733l69,0l-88,130l-110,0M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph724"/>
-<glyph unicode="Å" horiz-adv-x="683" d="M343,706C397,706 442,751 442,806C442,860 397,905 344,905C288,905 243,861 243,806C243,751 287,706 343,706M342,757C315,757 294,779 294,806C294,833 316,854 343,854C368,854 390,832 390,806C390,779 368,757 342,757M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph726"/>
-<glyph unicode="Ã" horiz-adv-x="683" d="M193,741l47,0C246,767 263,786 282,786C294,786 306,783 335,771C396,745 405,743 429,743C458,743 482,756 499,780C512,797 514,803 521,840C522,842 522,846 523,850l-47,0C469,820 454,806 429,806C418,806 411,808 389,818C346,837 315,846 292,846C238,846 206,813 193,741M5,0l103,0l69,169l324,0l70,-169l107,0l-289,667l-100,0M207,250l74,184C319,529 326,547 337,585C342,560 359,512 391,436l77,-186z" id="glyph728"/>
-<glyph unicode="B" horiz-adv-x="579" d="M86,0l190,0C354,0 397,7 433,27C490,58 524,114 524,179C524,235 501,279 458,308C431,326 412,332 362,339C402,348 421,356 443,372C483,400 504,444 504,496C504,558 475,606 420,638C380,661 346,667 244,667l-158,0M181,383l0,203l49,0C282,586 315,583 335,577C381,562 409,528 409,484C409,444 384,409 346,394C325,386 299,383 249,383M181,81l0,224l50,0C288,305 320,302 342,295C394,278 426,238 426,188C426,147 405,115 366,97C339,84 315,81 255,81z" id="glyph730"/>
-<glyph unicode="C" horiz-adv-x="581" d="M173,65C235,17 310,-5 409,-5C468,-5 506,1 557,18l-7,92C497,89 453,80 407,80C259,80 150,190 150,339C150,487 254,591 403,591C455,591 491,581 542,552l8,90C505,663 458,672 398,672C192,672 48,535 48,337C48,224 92,127 173,65z" id="glyph732"/>
-<glyph unicode="Ç" horiz-adv-x="581" d="M173,65C222,27 267,10 343,-1l-47,-76l16,-16C330,-88 339,-86 347,-86C373,-86 393,-103 393,-124C393,-147 372,-162 341,-162C317,-162 298,-158 276,-149l-17,-35C290,-198 318,-204 351,-204C419,-204 466,-169 466,-118C466,-78 433,-49 389,-49C381,-49 374,-50 354,-54l30,50C397,-5 409,-5 413,-5C468,-5 507,1 557,18l-7,92C497,89 453,80 407,80C259,80 150,190 150,339C150,487 254,591 403,591C455,591 491,581 542,552l8,90C505,663 458,672 398,672C192,672 48,535 48,337C48,224 92,128 173,65z" id="glyph734"/>
-<glyph unicode="D" horiz-adv-x="689" d="M86,0l153,0C318,0 371,7 418,22C556,67 642,185 642,331C642,484 545,613 402,651C357,663 313,667 224,667l-138,0M181,81l0,505l51,0C304,586 347,581 382,569C476,536 540,441 540,334C540,229 487,143 399,105C356,87 318,81 231,81z" id="glyph736"/>
-<glyph unicode="∆" horiz-adv-x="667" d="M24,0l618,0l-262,667l-97,0M153,84l179,473l180,-473z" id="glyph738"/>
-<glyph unicode="E" horiz-adv-x="527" d="M86,0l379,0l0,81l-284,0l0,227l256,0l0,81l-256,0l0,197l276,0l0,81l-371,0z" id="glyph740"/>
-<glyph unicode="É" horiz-adv-x="527" d="M228,733l69,0l129,130l-111,0M86,0l379,0l0,81l-284,0l0,227l256,0l0,81l-256,0l0,197l276,0l0,81l-371,0z" id="glyph742"/>
-<glyph unicode="Ê" horiz-adv-x="527" d="M120,733l84,0l71,83l72,-83l84,0l-110,130l-91,0M86,0l379,0l0,81l-284,0l0,227l256,0l0,81l-256,0l0,197l276,0l0,81l-371,0z" id="glyph744"/>
-<glyph unicode="Ë" horiz-adv-x="527" d="M327,746l91,0l0,97l-91,0M133,746l91,0l0,97l-91,0M86,0l379,0l0,81l-284,0l0,227l256,0l0,81l-256,0l0,197l276,0l0,81l-371,0z" id="glyph746"/>
-<glyph unicode="È" horiz-adv-x="527" d="M254,733l69,0l-88,130l-110,0M86,0l379,0l0,81l-284,0l0,227l256,0l0,81l-256,0l0,197l276,0l0,81l-371,0z" id="glyph748"/>
-<glyph unicode="Ð" horiz-adv-x="689" d="M86,0l151,0C317,0 370,7 417,22C553,67 641,188 641,331C641,482 543,612 400,651C356,663 313,667 223,667l-137,0l0,-280l-67,0l0,-80l67,0M180,82l0,225l173,0l0,80l-173,0l0,198l51,0C303,585 347,580 381,568C476,535 540,441 540,334C540,229 487,143 399,106C355,87 318,82 230,82z" id="glyph750"/>
-<glyph unicode="€" horiz-adv-x="654" d="M42,267l70,0C141,90 257,-13 429,-13C484,-13 540,-1 583,19l0,112C541,85 489,62 429,62C319,62 238,139 215,267l280,0l17,53l-303,0l0,33l314,0l17,53l-325,0C238,529 319,605 429,605C491,605 542,583 582,538l30,93C560,664 501,680 428,680C256,680 146,585 113,406l-54,0l-17,-53l65,0l0,-33l-48,0z" id="glyph752"/>
-<glyph unicode="F" horiz-adv-x="482" d="M86,0l95,0l0,305l249,0l0,81l-249,0l0,200l259,0l0,81l-354,0z" id="glyph754"/>
-<glyph unicode="G" horiz-adv-x="687" d="M48,339C48,128 190,-5 415,-5C483,-5 542,4 607,26l0,339l-238,0l0,-81l143,0l0,-193C474,79 454,76 422,76C259,76 150,181 150,338C150,487 260,591 418,591C482,591 534,578 588,548l7,91C537,662 481,672 412,672C191,672 48,541 48,339z" id="glyph756"/>
-<glyph unicode="H" horiz-adv-x="685" d="M86,0l95,0l0,306l323,0l0,-306l95,0l0,667l-95,0l0,-280l-323,0l0,280l-95,0z" id="glyph758"/>
-<glyph unicode="I" horiz-adv-x="280" d="M93,0l95,0l0,667l-95,0z" id="glyph760"/>
-<glyph unicode="Í" horiz-adv-x="280" d="M108,733l69,0l119,130l-107,0M93,0l95,0l0,667l-95,0z" id="glyph762"/>
-<glyph unicode="Î" horiz-adv-x="280" d="M5,733l80,0l59,86l58,-86l80,0l-93,130l-91,0M93,0l95,0l0,667l-95,0z" id="glyph764"/>
-<glyph unicode="Ï" horiz-adv-x="280" d="M170,746l86,0l0,97l-86,0M31,746l86,0l0,97l-86,0M93,0l95,0l0,667l-95,0z" id="glyph766"/>
-<glyph unicode="Ì" horiz-adv-x="280" d="M117,733l69,0l-81,130l-107,0M93,0l95,0l0,667l-95,0z" id="glyph768"/>
-<glyph unicode="J" horiz-adv-x="368" d="M19,3C65,-7 77,-9 103,-9C178,-9 233,19 262,71C281,105 283,118 283,213l0,454l-95,0l0,-430C188,166 187,153 178,131C164,93 132,72 89,72C64,72 44,76 19,86z" id="glyph770"/>
-<glyph unicode="K" horiz-adv-x="630" d="M86,0l95,0l0,262C181,290 181,303 180,330C202,304 227,273 241,259l243,-259l138,0l-341,351l314,316l-128,0l-233,-242C216,406 203,391 179,364C181,387 181,398 181,444l0,223l-95,0z" id="glyph772"/>
-<glyph unicode="L" horiz-adv-x="480" d="M86,0l377,0l0,81l-282,0l0,586l-95,0z" id="glyph774"/>
-<glyph unicode="Ł" horiz-adv-x="480" d="M86,0l376,0l0,81l-281,0l0,221l152,99l0,88l-152,-99l0,277l-95,0l0,-318l-67,-44l0,-88l67,44z" id="glyph776"/>
-<glyph unicode="M" horiz-adv-x="905" d="M86,0l95,0l0,374C181,388 180,410 179,440C178,472 177,499 177,517C176,553 176,553 171,608l0,15C174,614 177,607 177,605C203,523 202,523 279,324l126,-324l92,0l125,324C627,337 634,353 641,373C648,392 654,411 661,430C696,525 697,528 705,554l16,52C722,608 724,614 727,623l0,-14C727,552 724,443 724,381l0,-381l95,0l0,667l-159,0l-127,-333C487,213 467,159 453,108C448,132 444,144 432,181C425,200 406,250 374,332l-131,335l-157,0z" id="glyph778"/>
-<glyph unicode="N" horiz-adv-x="705" d="M86,0l95,0l0,340C181,427 178,534 173,591C188,538 220,473 285,362l211,-362l123,0l0,667l-95,0l0,-321C524,238 528,141 534,83C519,130 485,201 443,274l-227,393l-130,0z" id="glyph780"/>
-<glyph unicode="Ñ" horiz-adv-x="705" d="M214,741l47,0C267,767 284,786 303,786C315,786 327,783 356,771C417,745 426,743 450,743C479,743 503,756 520,780C533,797 535,803 542,840C543,842 543,846 544,850l-47,0C490,820 475,806 450,806C439,806 432,808 410,818C367,837 336,846 313,846C259,846 227,813 214,741M86,0l95,0l0,340C181,427 178,534 173,591C188,538 220,473 285,362l211,-362l123,0l0,667l-95,0l0,-321C524,238 528,141 534,83C519,130 485,201 443,274l-227,393l-130,0z" id="glyph782"/>
-<glyph unicode="O" horiz-adv-x="741" d="M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph784"/>
-<glyph unicode="Œ" horiz-adv-x="906" d="M47,339C47,140 189,6 403,2C483,1 523,0 523,0l321,0l0,81l-277,0l0,225l249,0l0,81l-249,0l0,199l268,0l0,81l-220,0l-127,0C335,667 276,657 210,622C108,568 47,463 47,339M295,105C203,142 149,230 149,339C149,462 215,550 324,575C368,585 377,586 472,586l0,-505C463,82 457,82 455,82C366,83 338,87 295,105z" id="glyph786"/>
-<glyph unicode="Ó" horiz-adv-x="741" d="M338,733l69,0l129,130l-111,0M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph788"/>
-<glyph unicode="Ô" horiz-adv-x="741" d="M225,733l84,0l71,83l72,-83l84,0l-110,130l-91,0M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph790"/>
-<glyph unicode="Ö" horiz-adv-x="741" d="M429,746l91,0l0,97l-91,0M235,746l91,0l0,97l-91,0M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph792"/>
-<glyph unicode="Ò" horiz-adv-x="741" d="M350,733l69,0l-88,130l-110,0M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph794"/>
-<glyph unicode="Ω" horiz-adv-x="667" d="M29,0l264,0l0,73C177,137 121,229 121,353C121,434 145,497 196,545C235,582 284,602 335,602C391,602 439,579 481,533C526,483 547,428 547,354C547,276 523,207 477,152C450,120 425,101 375,73l0,-73l264,0l0,81l-166,0C587,149 639,238 639,364C639,545 507,683 334,683C161,683 29,545 29,365C29,238 81,150 195,81l-166,0z" id="glyph796"/>
-<glyph unicode="Ø" horiz-adv-x="741" d="M54,25l50,-42l62,70C220,9 289,-13 374,-13C569,-13 693,122 693,333C693,424 669,502 620,570l67,77l-51,41l-62,-71C516,660 453,680 369,680C274,680 194,649 142,594C84,531 48,433 48,335C48,246 74,164 120,101M187,175C163,219 150,273 150,336C150,495 239,605 368,605C425,605 478,584 511,550M228,119l325,379C579,442 591,389 591,330C591,173 500,62 371,62C317,62 273,80 228,119z" id="glyph798"/>
-<glyph unicode="Õ" horiz-adv-x="741" d="M222,741l47,0C275,767 292,786 311,786C323,786 335,783 364,771C425,745 434,743 458,743C487,743 511,756 528,780C541,797 543,803 550,840C551,842 551,846 552,850l-47,0C498,820 483,806 458,806C447,806 440,808 418,818C375,837 344,846 321,846C267,846 235,813 222,741M137,81C192,20 275,-13 372,-13C474,-13 559,22 613,87C664,149 693,237 693,333C693,544 568,680 375,680C274,680 196,651 142,594C83,531 48,433 48,332C48,237 82,141 137,81M150,334C150,499 238,605 374,605C502,605 591,493 591,331C591,173 500,62 371,62C241,62 150,174 150,334z" id="glyph800"/>
-<glyph unicode="P" horiz-adv-x="531" d="M87,0l95,0l0,267l53,0C308,267 356,273 390,287C464,316 509,384 509,468C509,553 463,622 388,649C349,663 311,667 219,667l-132,0M182,348l0,238l40,0C262,586 303,582 321,577C376,561 407,521 407,468C407,425 386,387 351,367C328,354 291,348 234,348z" id="glyph802"/>
-<glyph unicode="Q" horiz-adv-x="741" d="M48,333C48,123 176,-13 373,-13C387,-13 400,-12 424,-10l127,-119l125,0l-160,144C630,69 693,182 693,331C693,426 667,511 617,573C561,644 478,680 371,680C175,680 48,544 48,333M150,337C150,499 239,605 374,605C502,605 591,493 591,331C591,172 501,62 370,62C240,62 150,175 150,337z" id="glyph804"/>
-<glyph unicode="R" horiz-adv-x="583" d="M86,0l95,0l0,297l55,0C312,297 330,283 366,200l86,-200l110,0l-113,243C424,296 406,317 366,334C409,342 429,350 453,369C488,398 508,443 508,491C508,565 465,627 397,650C356,664 326,667 247,667l-161,0M181,379l0,207l69,0C294,586 325,583 346,575C386,561 410,526 410,483C410,440 386,406 344,391C322,383 288,379 240,379z" id="glyph806"/>
-<glyph unicode="S" horiz-adv-x="474" d="M54,14C101,-4 151,-13 207,-13C343,-13 434,68 434,188C434,273 398,319 286,375l-36,18C168,434 142,461 142,507C142,562 191,599 262,599C299,599 336,591 387,572l12,84C351,672 305,680 253,680C127,680 43,607 43,498C43,415 87,363 192,315l37,-17C301,265 332,231 332,181C332,113 278,68 195,68C154,68 116,78 64,103z" id="glyph808"/>
-<glyph unicode="Š" horiz-adv-x="474" d="M200,733l91,0l110,130l-84,0l-72,-83l-71,83l-84,0M54,14C101,-4 151,-13 207,-13C343,-13 434,68 434,188C434,273 398,319 286,375l-36,18C168,434 142,461 142,507C142,562 191,599 262,599C299,599 336,591 387,572l12,84C351,672 305,680 253,680C127,680 43,607 43,498C43,415 87,363 192,315l37,-17C301,265 332,231 332,181C332,113 278,68 195,68C154,68 116,78 64,103z" id="glyph810"/>
-<glyph unicode="T" horiz-adv-x="529" d="M219,0l95,0l0,586l209,0l0,81l-517,0l0,-81l213,0z" id="glyph812"/>
-<glyph unicode="Þ" horiz-adv-x="533" d="M86,0l96,0l0,173l53,0C308,173 356,179 390,193C464,222 509,290 509,374C509,458 463,528 388,555C349,569 311,573 219,573l-37,0l0,94l-96,0M182,254l0,238l40,0C261,492 304,488 322,483C377,466 408,427 408,374C408,331 387,293 352,273C328,260 292,254 234,254z" id="glyph814"/>
-<glyph unicode="U" horiz-adv-x="688" d="M112,124C150,36 235,-13 345,-13C442,-13 518,24 562,94C592,141 602,190 602,291l0,376l-95,0l0,-354C507,229 505,202 493,169C470,103 419,68 348,68C284,68 231,98 205,149C187,185 181,225 181,318l0,349l-95,0l0,-363C86,222 95,162 112,124z" id="glyph816"/>
-<glyph unicode="Ú" horiz-adv-x="688" d="M308,733l69,0l129,130l-111,0M112,124C150,36 235,-13 345,-13C442,-13 518,24 562,94C592,141 602,190 602,291l0,376l-95,0l0,-354C507,229 505,202 493,169C470,103 419,68 348,68C284,68 231,98 205,149C187,185 181,225 181,318l0,349l-95,0l0,-363C86,222 95,162 112,124z" id="glyph818"/>
-<glyph unicode="Û" horiz-adv-x="688" d="M195,733l84,0l71,83l72,-83l84,0l-110,130l-91,0M112,124C150,36 235,-13 345,-13C442,-13 518,24 562,94C592,141 602,190 602,291l0,376l-95,0l0,-354C507,229 505,202 493,169C470,103 419,68 348,68C284,68 231,98 205,149C187,185 181,225 181,318l0,349l-95,0l0,-363C86,222 95,162 112,124z" id="glyph820"/>
-<glyph unicode="Ü" horiz-adv-x="688" d="M402,746l91,0l0,97l-91,0M208,746l91,0l0,97l-91,0M112,124C150,36 235,-13 345,-13C442,-13 518,24 562,94C592,141 602,190 602,291l0,376l-95,0l0,-354C507,229 505,202 493,169C470,103 419,68 348,68C284,68 231,98 205,149C187,185 181,225 181,318l0,349l-95,0l0,-363C86,222 95,162 112,124z" id="glyph822"/>
-<glyph unicode="Ù" horiz-adv-x="688" d="M324,733l69,0l-88,130l-110,0M112,124C150,36 235,-13 345,-13C442,-13 518,24 562,94C592,141 602,190 602,291l0,376l-95,0l0,-354C507,229 505,202 493,169C470,103 419,68 348,68C284,68 231,98 205,149C187,185 181,225 181,318l0,349l-95,0l0,-363C86,222 95,162 112,124z" id="glyph824"/>
-<glyph unicode="V" horiz-adv-x="633" d="M260,0l116,0l252,667l-100,0l-163,-440C342,164 330,124 320,78C307,131 290,180 273,227l-163,440l-105,0z" id="glyph826"/>
-<glyph unicode="W" horiz-adv-x="954" d="M210,0l123,0l110,438C455,488 465,538 476,590C483,557 493,512 513,438l116,-438l121,0l200,667l-98,0l-114,-390C714,194 703,146 694,93C691,104 689,112 688,115C675,164 674,176 648,277l-102,390l-137,0l-96,-387C292,194 277,135 271,93C264,131 250,187 224,277l-115,390l-104,0z" id="glyph828"/>
-<glyph unicode="X" horiz-adv-x="635" d="M6,0l114,0l190,285l198,-285l121,0l-250,350l224,317l-110,0l-176,-252l-177,252l-115,0l227,-317z" id="glyph830"/>
-<glyph unicode="Y" horiz-adv-x="629" d="M269,0l95,0l0,283l260,384l-113,0l-167,-253C327,388 326,387 317,367C309,386 308,387 288,417l-165,250l-118,0l264,-387z" id="glyph832"/>
-<glyph unicode="Ý" horiz-adv-x="629" d="M276,733l69,0l129,130l-111,0M269,0l95,0l0,283l260,384l-113,0l-167,-253C327,388 326,387 317,367C309,386 308,387 288,417l-165,250l-118,0l264,-387z" id="glyph834"/>
-<glyph unicode="Ÿ" horiz-adv-x="629" d="M372,746l91,0l0,97l-91,0M178,746l91,0l0,97l-91,0M269,0l95,0l0,283l260,384l-113,0l-167,-253C327,388 326,387 317,367C309,386 308,387 288,417l-165,250l-118,0l264,-387z" id="glyph836"/>
-<glyph unicode="Z" horiz-adv-x="534" d="M30,0l465,0l0,81l-282,0C176,81 163,81 139,78C144,86 148,93 150,95C151,97 156,103 163,112C168,120 174,128 181,137C188,147 196,157 203,168l286,411l0,88l-447,0l0,-81l251,0C337,586 337,586 386,588C368,569 338,528 301,474l-271,-393z" id="glyph838"/>
-<glyph unicode="Ž" horiz-adv-x="534" d="M231,733l91,0l110,130l-84,0l-72,-83l-71,83l-84,0M30,0l465,0l0,81l-282,0C176,81 163,81 139,78C144,86 148,93 150,95C151,97 156,103 163,112C168,120 174,128 181,137C188,147 196,157 203,168l286,411l0,88l-447,0l0,-81l251,0C337,586 337,586 386,588C368,569 338,528 301,474l-271,-393z" id="glyph840"/>
-<glyph unicode="a" horiz-adv-x="529" d="M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph842"/>
-<glyph unicode="á" horiz-adv-x="529" d="M231,571l64,0l118,137l-100,0M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph844"/>
-<glyph unicode="â" horiz-adv-x="529" d="M124,571l76,0l72,92l71,-92l76,0l-103,137l-89,0M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph846"/>
-<glyph unicode="´" horiz-adv-x="500" d="M194,571l64,0l118,137l-100,0z" id="glyph848"/>
-<glyph unicode="ä" horiz-adv-x="529" d="M325,587l87,0l0,97l-87,0M144,587l87,0l0,97l-87,0M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph850"/>
-<glyph unicode="æ" horiz-adv-x="855" d="M43,143C43,53 116,-7 227,-7C325,-7 399,38 414,107C420,77 435,57 470,33C511,6 559,-7 622,-7C677,-7 722,1 766,18l0,89C718,77 680,65 637,65C539,65 475,126 469,225l346,0C814,308 807,347 783,393C748,461 681,499 597,499C518,499 454,467 429,415C408,466 343,499 263,499C208,499 155,485 101,458l0,-83C146,406 195,422 245,422C297,422 342,403 363,373C376,355 381,337 382,303l-66,0C226,303 174,294 131,273C74,245 43,198 43,143M469,296C477,379 526,432 596,432C665,432 709,382 716,296M139,142C139,176 161,202 204,217C236,229 258,231 324,231l58,0C382,138 317,65 234,65C179,65 139,97 139,142z" id="glyph852"/>
-<glyph unicode="ℓ" horiz-adv-x="500" d="M147,84C147,21 172,-14 216,-14C243,-14 267,0 291,29C309,52 321,78 321,95C321,106 315,112 306,112C298,112 293,107 287,93C271,59 254,41 238,41C226,41 221,49 221,68C221,104 221,104 253,268C310,328 342,368 365,405C404,470 428,540 428,594C428,645 402,678 361,678C279,678 216,545 162,259C148,243 122,215 113,206C99,193 94,186 94,178C94,169 102,160 109,160C116,160 122,165 154,195C149,134 147,109 147,84M265,340C283,440 305,537 323,588C332,613 348,631 361,631C374,631 383,614 383,587C383,515 337,419 265,340z" id="glyph854"/>
-<glyph unicode="à" horiz-adv-x="529" d="M236,571l64,0l-82,137l-100,0M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph856"/>
-<glyph unicode="&" horiz-adv-x="696" d="M79,186C79,70 175,-13 307,-13C381,-13 432,8 489,63l53,-63l117,0l-113,133C589,186 616,268 620,362l-89,0C528,294 516,245 489,197l-132,160C449,402 498,463 498,531C498,615 430,673 330,673C228,673 157,611 157,524C157,474 188,410 232,372C191,355 172,345 153,331C105,294 79,243 79,186M308,410C264,465 250,492 250,522C250,564 285,596 330,596C375,596 409,567 409,527C409,486 380,452 308,410M180,187C180,223 196,256 226,280C240,292 251,298 280,315l156,-187C393,84 355,66 308,66C236,66 180,119 180,187z" id="glyph858"/>
-<glyph unicode="" horiz-adv-x="800" d="M35,101C35,45 80,0 136,0l629,0l0,635C765,691 720,736 664,736l-629,0M301,378C255,378 231,405 231,450l0,173C231,669 255,695 301,695C347,695 371,669 371,623l0,-173C371,405 347,378 301,378M398,383l0,307l55,0l0,-7C457,691 475,693 480,693C520,693 538,671 538,625l0,-242l-54,0l0,236C484,634 478,642 468,642C457,642 452,634 452,619l0,-236M578,450l0,135l-19,0l0,52l18,0l0,53l54,0l0,-53l79,0l0,-52l-78,0l0,-132C632,438 638,430 648,430C658,430 664,438 664,453l0,31l54,0l0,-34C718,405 694,378 648,378C602,378 578,405 578,450M90,383l0,307l121,0l0,-60l-67,0l0,-84l59,0l0,-60l-59,0l0,-103M301,431C311,431 317,438 317,453l0,166C317,634 311,642 301,642C291,642 285,634 285,619l0,-166C285,438 291,431 301,431M522,114l0,171C522,331 546,357 592,357C638,357 662,331 662,285l0,-128l-86,0l0,-40C576,102 582,95 592,95C602,95 608,102 608,117l0,9l54,0l0,-12C662,69 638,42 592,42C546,42 522,69 522,114M86,123l0,14l54,0l0,-10C140,106 146,95 158,95C171,95 177,106 177,133C177,151 167,161 152,171C90,212 86,240 86,268C86,324 111,357 159,357C207,357 232,328 232,276l0,-29l-54,0l0,25C178,293 172,304 160,304C147,304 141,293 141,266C141,247 151,236 166,226C227,184 232,159 232,131C232,75 207,42 159,42C111,42 86,71 86,123M361,114l0,132l-19,0l0,52l18,0l0,55l54,0l0,-55l79,0l0,-52l-78,0l0,-129C415,102 421,95 431,95C441,95 447,102 447,117l0,31l54,0l0,-34C501,69 477,42 431,42C385,42 361,69 361,114M262,292l0,61l54,0l0,-61M576,203l32,0l0,78C608,296 602,304 592,304C582,304 576,296 576,281M262,46l0,215l54,0l0,-215M703,46l0,31l8,0l9,-21l9,21l8,0l0,-31l-6,0l0,21l-9,-21l-4,0l-9,21l0,-21M672,71l0,6l26,0l0,-6l-10,0l0,-25l-6,0l0,25z" id="glyph860"/>
-<glyph unicode="≈" horiz-adv-x="500" d="M61,348C87,398 110,417 143,417C158,417 180,412 201,403C291,365 316,356 342,356C373,356 405,368 431,388C454,407 469,428 492,475l-53,31C410,457 390,442 354,442C331,442 318,447 260,472C206,496 177,504 151,504C88,504 49,470 9,382M61,170C87,220 110,239 143,239C158,239 180,233 201,224C291,185 316,178 342,178C373,178 406,190 431,210C454,229 469,250 492,297l-53,31C409,279 390,264 354,264C331,264 318,268 260,294C207,317 177,326 151,326C88,326 49,292 9,203z" id="glyph862"/>
-<glyph unicode="å" horiz-adv-x="529" d="M267,546C320,546 364,590 364,643C364,696 320,740 269,740C214,740 170,697 170,644C170,590 213,546 267,546M267,595C240,595 219,617 219,643C219,670 241,691 268,691C293,691 315,669 315,643C315,617 293,595 267,595M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph864"/>
-<glyph unicode="^" horiz-adv-x="500" d="M19,356l96,0l135,242l135,-242l96,0l-172,313l-118,0z" id="glyph866"/>
-<glyph unicode="~" horiz-adv-x="667" d="M144,576C171,626 193,645 226,645C241,645 262,640 284,630C374,592 399,584 425,584C456,584 488,596 514,616C537,635 552,656 575,703l-53,31C492,685 473,670 437,670C414,670 401,674 343,700C290,723 260,732 233,732C190,732 156,713 129,676C117,660 112,651 92,610z" id="glyph868"/>
-<glyph unicode="*" horiz-adv-x="537" d="M191,366l79,118l80,-119l58,43l-89,112l137,40l-22,67l-136,-50l6,143l-71,0l5,-143l-135,50l-21,-67l138,-40l-86,-113z" id="glyph870"/>
-<glyph unicode="@" horiz-adv-x="763" d="M150,82C215,19 300,-13 405,-13C485,-13 557,1 623,29l-16,58C545,59 479,45 402,45C312,45 242,71 190,126C139,178 111,253 111,330C111,494 238,622 401,622C551,622 658,522 658,383C658,290 607,201 553,201C535,201 521,218 521,242C521,251 523,268 527,289l40,205l-64,0l-11,-56C473,482 437,505 386,505C290,505 211,413 211,303C211,210 270,142 351,142C401,142 447,167 476,211C482,173 511,148 550,148C637,148 715,259 715,384C715,554 580,680 398,680C202,680 48,527 48,331C48,237 86,145 150,82M283,304C283,376 334,437 393,437C441,437 472,402 472,347C472,270 425,207 367,207C318,207 283,247 283,304z" id="glyph872"/>
-<glyph unicode="ã" horiz-adv-x="529" d="M133,585l47,0C185,612 198,626 217,626C224,626 231,625 238,622C305,593 324,587 343,587C388,587 419,624 428,687l-47,0C377,663 363,649 344,649C336,649 327,651 309,659C249,684 246,685 225,685C175,685 142,650 133,585M43,140C43,51 110,-7 213,-7C288,-7 340,22 377,84C376,54 376,50 376,39C376,28 376,19 377,0l83,0C457,38 455,90 455,166l0,102C455,341 450,377 435,408C408,465 345,498 260,498C200,498 150,484 96,453l5,-80C151,407 192,421 245,421C327,421 366,382 367,298C336,300 318,301 299,301C135,301 43,243 43,140M139,141C139,203 200,234 320,234C339,234 352,233 369,231C369,182 365,159 354,136C333,92 287,65 233,65C178,65 139,96 139,141z" id="glyph874"/>
-<glyph unicode="b" horiz-adv-x="577" d="M71,0l87,0l0,84C189,26 251,-7 326,-7C455,-7 538,94 538,249C538,400 455,498 328,498C250,498 183,461 159,405C160,413 160,420 161,422C162,439 162,439 162,462l0,258l-91,0M164,244C164,347 225,421 310,421C388,421 442,348 442,245C442,144 385,70 306,70C225,70 164,145 164,244z" id="glyph876"/>
-<glyph unicode="\" horiz-adv-x="435" d="M384,-204l80,0l-338,924l-77,0z" id="glyph878"/>
-<glyph unicode="|" horiz-adv-x="500" d="M205,-167l90,0l0,834l-90,0z" id="glyph880"/>
-<glyph unicode="{" horiz-adv-x="493" d="M193,-58C193,-158 236,-204 330,-204l27,0l17,0l0,65C295,-140 279,-126 279,-56l0,193C279,202 264,232 221,258C265,284 279,312 279,377l0,196C279,642 295,655 374,655l0,65l-16,0C290,720 264,714 237,694C207,672 193,637 193,581l0,-199C193,328 177,301 137,290l0,-64C178,216 193,190 193,132z" id="glyph882"/>
-<glyph unicode="}" horiz-adv-x="493" d="M119,-139l0,-65l16,0C203,-204 229,-198 256,-178C286,-156 300,-121 300,-65l0,199C300,188 316,215 356,226l0,64C315,300 300,326 300,384l0,190C300,674 257,720 163,720l-27,0l-17,0l0,-65C198,656 214,642 214,572l0,-193C214,314 229,284 272,258C228,232 214,204 214,139l0,-196C214,-126 198,-139 119,-139z" id="glyph884"/>
-<glyph unicode="[" horiz-adv-x="355" d="M95,-204l186,0l0,64l-100,0l0,795l100,0l0,65l-186,0z" id="glyph886"/>
-<glyph unicode="]" horiz-adv-x="355" d="M74,-139l0,-65l186,0l0,924l-186,0l0,-64l100,0l0,-795z" id="glyph888"/>
-<glyph unicode="˘" horiz-adv-x="500" d="M250,573C330,573 383,626 386,708l-52,0C328,663 295,633 250,633C206,633 173,663 166,708l-52,0C116,627 170,573 250,573z" id="glyph890"/>
-<glyph unicode="¦" horiz-adv-x="500" d="M205,330l90,0l0,337l-90,0M205,153l0,-320l90,0l0,320z" id="glyph892"/>
-<glyph unicode="•" horiz-adv-x="667" d="M335,200C411,200 473,262 473,338C473,414 411,477 336,477C258,477 196,416 196,338C196,262 258,200 335,200z" id="glyph894"/>
-<glyph unicode="c" horiz-adv-x="427" d="M39,244C39,94 138,-6 287,-6C334,-6 372,2 407,19l-7,83C363,79 336,71 298,71C202,71 135,143 135,248C135,347 203,418 300,418C334,418 362,411 389,395l6,80C362,488 322,495 284,495C214,495 144,465 99,415C59,370 39,312 39,244z" id="glyph896"/>
-<glyph unicode="ˇ" horiz-adv-x="500" d="M205,571l89,0l103,137l-76,0l-71,-92l-72,92l-76,0z" id="glyph898"/>
-<glyph unicode="ç" horiz-adv-x="427" d="M189,-76l15,-17C225,-87 232,-86 240,-86C265,-86 285,-102 285,-123C285,-145 264,-160 233,-160C211,-160 191,-156 168,-146l-17,-34C182,-194 210,-200 244,-200C307,-200 355,-164 355,-117C355,-77 324,-49 280,-49C270,-49 263,-50 243,-53l29,47l18,0C334,-6 372,2 407,19l-7,83C363,79 336,71 298,71C202,71 135,143 135,248C135,347 203,418 300,418C334,418 362,411 389,395l6,80C362,488 322,495 284,495C142,495 39,389 39,244C39,114 115,17 235,-1z" id="glyph900"/>
-<glyph unicode="¸" horiz-adv-x="500" d="M185,-77l16,-16C221,-88 228,-86 236,-86C262,-86 282,-102 282,-123C282,-145 261,-160 230,-160C208,-160 187,-156 165,-146l-17,-34C178,-194 207,-200 240,-200C304,-200 352,-164 352,-117C352,-77 321,-49 276,-49C268,-49 259,-50 240,-54l33,54l-40,0z" id="glyph902"/>
-<glyph unicode="¢" horiz-adv-x="537" d="M312,10l51,0l0,80C401,92 429,99 460,114l-8,82C423,178 397,170 363,167l0,344C395,509 419,503 442,490l6,80C421,580 407,583 363,588l0,77l-51,0l0,-77C178,573 91,476 91,339C91,199 175,104 312,90M312,171C234,191 188,254 188,342C188,426 233,485 312,507z" id="glyph904"/>
-<glyph unicode="ˆ" horiz-adv-x="500" d="M102,571l76,0l72,92l71,-92l76,0l-103,137l-89,0z" id="glyph906"/>
-<glyph unicode=":" horiz-adv-x="267" d="M80,382l107,0l0,107l-107,0M80,0l107,0l0,107l-107,0z" id="glyph908"/>
-<glyph unicode="," horiz-adv-x="267" d="M21,-129l84,0l83,236l-107,0z" id="glyph910"/>
-<glyph unicode="" horiz-adv-x="185" d="M16,-76l61,0l55,147l-76,0z" id="glyph912"/>
-<glyph unicode="" horiz-adv-x="132" d="M12,-51l44,0l39,102l-55,0z" id="glyph914"/>
-<glyph unicode="" horiz-adv-x="185" d="M16,191l61,0l55,147l-76,0z" id="glyph916"/>
-<glyph unicode="" horiz-adv-x="132" d="M12,349l44,0l39,102l-55,0z" id="glyph918"/>
-<glyph unicode="⌘" horiz-adv-x="842" d="M76,142C76,58 143,-11 230,-11C315,-11 383,58 383,142l0,87l76,0l0,-87C459,58 526,-11 613,-11C698,-11 765,58 765,142C765,225 697,295 613,295l-87,0l0,77l87,0C697,372 765,441 765,525C765,609 697,678 613,678C528,678 459,608 459,525l0,-87l-76,0l0,87C383,608 313,678 230,678C145,678 76,608 76,525C76,441 145,372 230,372l86,0l0,-77l-86,0C144,295 76,224 76,142M526,438l0,87C526,572 564,612 613,612C659,612 699,572 699,525C699,479 661,438 613,438M230,438C181,438 143,476 143,525C143,572 181,612 230,612C278,612 316,572 316,525l0,-87M383,295l0,77l76,0l0,-77M526,142l0,87l87,0C659,229 699,191 699,142C699,95 661,55 613,55C564,55 526,96 526,142M143,142C143,191 181,229 230,229l86,0l0,-87C316,96 278,55 230,55C181,55 143,96 143,142z" id="glyph920"/>
-<glyph unicode="⌃" horiz-adv-x="856" d="M194,306l234,233l233,-233l64,64l-297,297l-298,-297z" id="glyph922"/>
-<glyph unicode="©" horiz-adv-x="785" d="M48,333C48,143 204,-13 393,-13C583,-13 737,142 737,334C737,523 583,680 398,680C202,680 48,527 48,333M102,333C102,500 232,631 397,631C553,631 683,496 683,333C683,169 553,36 393,36C233,36 102,170 102,333M203,335C203,216 289,140 424,140C460,140 484,144 516,154l-4,60C477,201 451,196 423,196C336,196 272,256 272,337C272,418 333,474 420,474C452,474 473,468 507,450l6,59C483,522 455,527 417,527C291,527 203,448 203,335z" id="glyph924"/>
-<glyph unicode="¤" horiz-adv-x="537" d="M76,62l79,77C195,113 230,101 270,101C311,101 349,114 385,140l78,-78l43,43l-79,78C454,221 465,254 465,295C465,335 454,368 426,408l78,77l-42,43l-79,-77C345,478 311,489 269,489C227,489 193,477 154,450l-79,78l-43,-43l80,-78C84,368 73,336 73,295C73,255 86,218 111,182l-77,-78M269,170C200,170 144,226 144,295C144,365 200,420 271,420C338,420 394,363 394,295C394,226 338,170 269,170z" id="glyph926"/>
-<glyph unicode="d" horiz-adv-x="580" d="M39,243C39,90 122,-7 253,-7C328,-7 379,20 422,82l0,-82l88,0C505,88 503,154 503,228l0,492l-91,0l0,-240C412,473 413,465 413,456l2,-43C375,470 322,498 253,498C126,498 39,394 39,243M135,243C135,348 193,421 276,421C354,421 414,343 414,244C414,144 354,70 272,70C191,70 135,141 135,243z" id="glyph928"/>
-<glyph unicode="†" horiz-adv-x="537" d="M231,-204l78,0l0,658l182,0l0,71l-184,0l0,195l-79,0l0,-195l-183,0l0,-71l186,0z" id="glyph930"/>
-<glyph unicode="‡" horiz-adv-x="537" d="M45,11l183,0l0,-215l79,0l0,215l184,0l0,71l-182,0l0,372l182,0l0,71l-184,0l0,195l-79,0l0,-195l-183,0l0,-71l186,0l0,-372l-186,0z" id="glyph932"/>
-<glyph unicode="°" horiz-adv-x="375" d="M188,444C268,444 333,508 333,587C333,665 268,729 187,729C108,729 42,665 42,589C42,508 106,444 188,444M188,499C138,499 99,538 99,588C99,635 139,674 187,674C236,674 276,635 276,586C276,539 236,499 188,499z" id="glyph934"/>
-<glyph unicode="¨" horiz-adv-x="500" d="M297,587l87,0l0,97l-87,0M116,587l87,0l0,97l-87,0z" id="glyph936"/>
-<glyph unicode="÷" horiz-adv-x="537" d="M221,444l95,0l0,95l-95,0M39,304l460,0l0,73l-460,0M221,142l95,0l0,95l-95,0z" id="glyph938"/>
-<glyph unicode="$" horiz-adv-x="537" d="M57,24C139,1 167,-4 230,-6l0,-83l51,0l0,84C408,9 486,85 486,193C486,248 464,294 421,327C401,342 347,370 314,381l-29,10l0,204C344,591 390,579 438,555l9,90C411,659 326,674 285,673l0,83l-51,0l0,-84C116,661 47,595 47,493C47,436 68,398 118,364C153,340 189,323 230,312l0,-233C174,80 115,95 64,121M185,433C157,452 144,474 144,503C144,547 177,579 234,591l0,-182C203,422 196,426 185,433M281,81l0,212C354,267 389,232 389,185C389,156 372,125 347,105C328,91 311,85 281,81z" id="glyph940"/>
-<glyph unicode="˙" horiz-adv-x="500" d="M206,587l87,0l0,97l-87,0z" id="glyph942"/>
-<glyph unicode="ı" horiz-adv-x="229" d="M69,0l91,0l0,489l-91,0z" id="glyph944"/>
-<glyph unicode="e" horiz-adv-x="522" d="M39,249C39,89 136,-13 289,-13C344,-13 391,-2 446,23l0,87C395,79 346,64 294,64C204,64 142,124 130,221l352,0C483,228 483,235 483,237C483,405 405,502 270,502C131,502 39,401 39,249M131,292C143,376 195,430 267,430C308,430 345,410 367,376C381,355 386,335 392,292z" id="glyph946"/>
-<glyph unicode="é" horiz-adv-x="522" d="M241,571l64,0l118,137l-100,0M39,249C39,89 136,-13 289,-13C344,-13 391,-2 446,23l0,87C395,79 346,64 294,64C204,64 142,124 130,221l352,0C483,228 483,235 483,237C483,405 405,502 270,502C131,502 39,401 39,249M131,292C143,376 195,430 267,430C308,430 345,410 367,376C381,355 386,335 392,292z" id="glyph948"/>
-<glyph unicode="ê" horiz-adv-x="522" d="M126,571l76,0l72,92l71,-92l76,0l-103,137l-89,0M39,249C39,89 136,-13 289,-13C344,-13 391,-2 446,23l0,87C395,79 346,64 294,64C204,64 142,124 130,221l352,0C483,228 483,235 483,237C483,405 405,502 270,502C131,502 39,401 39,249M131,292C143,376 195,430 267,430C308,430 345,410 367,376C381,355 386,335 392,292z" id="glyph950"/>
-<glyph unicode="ë" horiz-adv-x="522" d="M318,587l87,0l0,97l-87,0M137,587l87,0l0,97l-87,0M39,249C39,89 136,-13 289,-13C344,-13 391,-2 446,23l0,87C395,79 346,64 294,64C204,64 142,124 130,221l352,0C483,228 483,235 483,237C483,405 405,502 270,502C131,502 39,401 39,249M131,292C143,376 195,430 267,430C308,430 345,410 367,376C381,355 386,335 392,292z" id="glyph952"/>
-<glyph unicode="è" horiz-adv-x="522" d="M243,571l64,0l-82,137l-100,0M39,249C39,89 136,-13 289,-13C344,-13 391,-2 446,23l0,87C395,79 346,64 294,64C204,64 142,124 130,221l352,0C483,228 483,235 483,237C483,405 405,502 270,502C131,502 39,401 39,249M131,292C143,376 195,430 267,430C308,430 345,410 367,376C381,355 386,335 392,292z" id="glyph954"/>
-<glyph unicode="8" horiz-adv-x="537" d="M38,176C38,65 134,-12 273,-12C408,-12 499,64 499,178C499,263 447,327 353,358C432,392 477,449 477,515C477,612 392,678 268,678C138,678 53,612 53,511C53,435 107,370 184,354C89,320 38,259 38,176M288,387C193,427 150,467 150,515C150,565 201,605 265,605C329,605 380,565 380,514C380,480 357,440 321,411C311,402 310,401 288,387M141,183C141,235 178,279 252,315C291,301 311,292 331,279C378,250 402,214 402,172C402,110 350,66 276,66C197,66 141,115 141,183z" id="glyph956"/>
-<glyph unicode="" horiz-adv-x="355" d="M39,110C39,41 97,-7 180,-7C261,-7 316,41 316,111C316,158 293,193 247,216C286,240 304,268 304,305C304,365 252,407 177,407C99,407 47,365 47,303C47,263 65,234 105,212C62,189 39,153 39,110M188,242C141,262 120,282 120,305C120,328 145,348 176,348C206,348 231,329 231,305C231,283 215,260 188,242M114,114C114,138 132,161 162,176l2,2C166,179 166,179 169,180C221,160 243,139 243,108C243,77 217,56 181,56C142,56 114,80 114,114z" id="glyph958"/>
-<glyph unicode="₈" horiz-adv-x="248" d="M21,74C21,28 64,-5 126,-5C186,-5 227,27 227,75C227,108 209,131 172,148C203,164 218,184 218,210C218,251 180,279 124,279C65,279 27,251 27,208C27,180 44,157 75,145C39,129 21,105 21,74M132,163C96,177 77,193 77,210C77,227 98,242 123,242C148,242 168,228 168,210C168,195 155,177 136,165M73,77C73,94 87,111 111,122C112,123 113,123 113,124l2,0l2,2C158,111 177,95 177,73C177,50 156,34 127,34C96,34 73,52 73,77z" id="glyph960"/>
-<glyph unicode="" horiz-adv-x="355" d="M180,259C261,259 316,307 316,377C316,424 293,458 247,481C286,506 304,534 304,571C304,631 252,673 177,673C99,673 47,631 47,569C47,529 65,500 105,477C62,455 39,419 39,376C39,307 97,259 180,259M188,507C141,528 120,548 120,571C120,594 145,614 176,614C206,614 231,595 231,571C231,549 215,525 188,507M181,322C142,322 114,346 114,380C114,403 132,427 162,442l2,1C166,445 166,445 169,446C220,427 243,404 243,374C243,343 217,322 181,322z" id="glyph962"/>
-<glyph unicode="⁸" horiz-adv-x="248" d="M126,395C186,395 227,427 227,475C227,508 209,532 172,548C203,565 218,584 218,610C218,651 180,679 124,679C65,679 27,651 27,609C27,581 44,557 75,545C39,530 21,506 21,475C21,428 64,395 126,395M132,564C96,578 77,593 77,610C77,627 98,642 123,642C148,642 168,628 168,610C168,595 155,578 136,566M127,434C96,434 73,452 73,477C73,494 88,512 111,523l2,1C114,524 114,524 115,525C116,525 116,525 117,526C158,512 177,495 177,473C177,450 156,434 127,434z" id="glyph964"/>
-<glyph unicode="…" horiz-adv-x="802" d="M615,0l107,0l0,107l-107,0M347,0l107,0l0,107l-107,0M80,0l107,0l0,107l-107,0z" id="glyph966"/>
-<glyph unicode="—" horiz-adv-x="711" d="M0,209l711,0l0,75l-711,0z" id="glyph968"/>
-<glyph unicode="–" horiz-adv-x="537" d="M43,209l452,0l0,75l-452,0z" id="glyph970"/>
-<glyph unicode="=" horiz-adv-x="537" d="M39,374l460,0l0,73l-460,0M39,234l460,0l0,73l-460,0z" id="glyph972"/>
-<glyph unicode="℮" horiz-adv-x="874" d="M160,81C236,18 329,-13 437,-13C585,-13 699,34 774,130l-100,0C618,62 541,27 445,27C347,27 269,61 211,130l0,184l615,0C826,424 791,512 720,578C648,644 556,678 443,678C331,678 236,646 160,583C85,520 48,437 48,332C48,229 85,146 160,81M211,357l0,171C262,600 337,637 438,637C539,637 617,600 671,528l0,-171z" id="glyph974"/>
-<glyph unicode="ð" horiz-adv-x="579" d="M39,242C39,95 146,-13 290,-13C362,-13 425,12 471,60C522,113 540,166 540,265C540,354 525,424 488,499C457,564 423,609 375,649l94,61l-37,44l-109,-70C270,708 205,725 160,726l-18,-55C212,657 217,655 255,640l-84,-55l31,-46l108,70C355,579 401,506 410,451C364,490 337,500 279,500C142,500 39,389 39,242M136,243C136,351 199,428 289,428C385,428 444,355 444,238C444,134 379,59 290,59C200,59 136,135 136,243z" id="glyph976"/>
-<glyph unicode="!" horiz-adv-x="391" d="M178,185l82,0l12,482l-110,0M168,0l104,0l0,103l-104,0z" id="glyph978"/>
-<glyph unicode="¡" horiz-adv-x="391" d="M123,386l103,0l0,103l-103,0M118,-178l110,0l-12,481l-82,0z" id="glyph980"/>
-<glyph unicode="f" horiz-adv-x="353" d="M118,0l91,0l0,418l133,0l0,71l-133,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0z" id="glyph982"/>
-<glyph unicode="ff" horiz-adv-x="675" d="M118,0l91,0l0,418l232,0l0,-418l91,0l0,418l132,0l0,71l-132,0l0,22C532,552 535,578 540,596C550,628 578,646 618,646C632,646 644,644 664,640l0,75C638,721 622,723 599,723C537,723 493,701 467,656C449,626 441,579 441,510l0,-21l-232,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0z" id="glyph984"/>
-<glyph unicode="ffi" horiz-adv-x="949" d="M118,0l91,0l0,418l232,0l0,-418l91,0l0,418l130,0l0,71l-131,0l0,22C531,550 534,577 539,595C549,627 576,645 615,645C629,645 640,644 660,640l6,75C640,721 622,723 599,723C538,723 492,700 466,656C448,625 439,578 439,509l0,-20l-230,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M758,606l99,0l0,100l-99,0M763,0l91,0l0,489l-91,0z" id="glyph986"/>
-<glyph unicode="ffl" horiz-adv-x="947" d="M118,0l91,0l0,418l232,0l0,-418l91,0l0,418l130,0l0,71l-131,0l0,22C531,550 534,577 539,595C549,627 576,645 615,645C629,645 640,644 660,640l6,75C641,721 623,723 599,723C538,723 492,700 466,656C448,626 439,578 439,509l0,-20l-230,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M763,0l91,0l0,720l-91,0z" id="glyph988"/>
-<glyph unicode="fi" horiz-adv-x="603" d="M118,0l91,0l0,418l133,0l0,71l-133,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M437,606l99,0l0,100l-99,0M443,0l91,0l0,489l-91,0z" id="glyph990"/>
-<glyph unicode="fl" horiz-adv-x="603" d="M118,0l91,0l0,418l133,0l0,71l-133,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M443,0l91,0l0,720l-91,0z" id="glyph992"/>
-<glyph unicode="" horiz-adv-x="699" d="M118,0l91,0l0,418l232,0l0,-221C441,120 446,85 460,58C482,17 528,-6 588,-6C615,-6 643,-1 671,8l0,78C650,75 633,71 612,71C572,71 544,92 537,128C533,147 532,173 532,224l0,194l130,0l0,71l-130,0l0,141l-91,-31l0,-110l-232,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0z" id="glyph994"/>
-<glyph unicode="" horiz-adv-x="603" d="M118,0l91,0l0,418l133,0l0,71l-133,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M437,606l99,0l0,100l-99,0M443,0l91,0l0,489l-91,0z" id="glyph996"/>
-<glyph unicode="5" horiz-adv-x="537" d="M83,16C134,0 175,-7 223,-7C380,-7 483,79 483,211C483,335 389,419 251,419C221,419 200,416 176,409C177,422 179,442 179,460l2,128l281,0l0,79l-369,0l-5,-349C136,334 172,341 214,341C314,341 380,288 380,206C380,126 315,71 222,71C178,71 138,81 86,104z" id="glyph998"/>
-<glyph unicode="" horiz-adv-x="355" d="M64,12C96,1 121,-4 152,-4C245,-4 307,50 307,131C307,207 250,260 167,260C158,260 150,259 135,257l1,17l1,63l158,0l0,63l-226,0l-3,-220C101,193 121,197 146,197C198,197 231,170 231,127C231,86 198,58 151,58C126,58 102,65 66,83z" id="glyph1000"/>
-<glyph unicode="₅" horiz-adv-x="248" d="M40,7C65,0 82,-3 104,-3C174,-3 220,33 220,89C220,140 178,176 116,176C108,176 101,175 89,173l0,15l1,46l121,0l0,39l-167,0l-2,-147C66,134 82,137 100,137C141,137 168,117 168,86C168,57 142,36 104,36C85,36 68,40 41,52z" id="glyph1002"/>
-<glyph unicode="" horiz-adv-x="355" d="M64,277C96,266 121,262 151,262C245,262 307,315 307,396C307,472 250,525 167,525C158,525 150,524 135,522l1,17l1,63l158,0l0,63l-226,0l-3,-220C101,458 121,462 146,462C198,462 231,435 231,392C231,351 198,323 151,323C125,323 102,330 66,348z" id="glyph1004"/>
-<glyph unicode="⁵" horiz-adv-x="248" d="M40,408C65,400 82,397 104,397C174,397 220,433 220,489C220,540 178,576 116,576C108,576 101,575 89,573l0,15l1,46l121,0l0,39l-167,0l-2,-147C66,534 82,537 100,537C141,537 168,517 168,486C168,457 142,436 104,436C85,436 68,440 41,452z" id="glyph1006"/>
-<glyph unicode="⅝" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M64,277C96,266 121,262 151,262C245,262 307,315 307,396C307,472 250,525 167,525C158,525 150,524 135,522l1,17l1,63l158,0l0,63l-226,0l-3,-220C101,458 121,462 146,462C198,462 231,435 231,392C231,351 198,323 151,323C125,323 102,330 66,348M545,110C545,41 603,-7 686,-7C767,-7 822,41 822,111C822,158 799,193 753,216C792,240 810,268 810,305C810,365 758,407 683,407C605,407 553,365 553,303C553,263 571,234 611,212C568,189 545,153 545,110M626,305C626,328 651,348 682,348C712,348 737,329 737,305C737,283 721,260 694,242C647,262 626,282 626,305M620,114C620,138 638,161 668,176l2,2C672,179 672,179 675,180C727,160 749,139 749,108C749,77 723,56 687,56C648,56 620,80 620,114z" id="glyph1008"/>
-<glyph unicode="" horiz-adv-x="248" d="M40,408C65,400 82,397 104,397C174,397 220,433 220,489C220,540 178,576 116,576C108,576 101,575 89,573l0,15l1,46l121,0l0,39l-167,0l-2,-147C66,534 82,537 100,537C141,537 168,517 168,486C168,457 142,436 104,436C85,436 68,440 41,452M0,313l248,0l0,40l-248,0M21,74C21,28 64,-5 126,-5C186,-5 227,27 227,75C227,108 209,131 171,148C203,164 217,184 217,210C217,251 179,279 123,279C65,279 27,251 27,208C27,180 44,157 74,145C39,129 21,105 21,74M132,163C96,177 77,193 77,210C77,227 97,242 122,242C147,242 167,228 167,210C167,195 154,177 135,165C134,164 134,164 132,163M73,77C73,94 87,112 110,122C112,123 113,123 113,124l2,0l2,2C158,112 177,95 177,73C177,50 156,34 127,34C96,34 73,52 73,77z" id="glyph1010"/>
-<glyph unicode="" horiz-adv-x="603" d="M118,0l91,0l0,418l133,0l0,71l-133,0l0,22C209,552 212,578 217,596C227,628 255,646 296,646C310,646 321,644 342,640l0,75C316,721 300,723 276,723C214,723 170,701 144,656C126,626 118,579 118,510l0,-21l-115,0l0,-71l115,0M443,0l91,0l0,720l-91,0z" id="glyph1012"/>
-<glyph unicode="ƒ" horiz-adv-x="537" d="M49,-51l-15,-75C50,-129 62,-130 79,-130C138,-130 177,-115 204,-83C230,-52 243,-12 264,100l59,318l121,0l12,67l-120,0l13,69C358,603 361,608 368,623C383,653 405,667 439,667C453,667 463,666 484,661l13,75C474,742 447,745 424,745C368,745 329,726 298,683C280,657 270,624 257,560l-15,-75l-107,0l-12,-67l107,0l-58,-310C156,21 148,-6 134,-27C123,-44 103,-53 76,-53C70,-53 63,-52 49,-51z" id="glyph1014"/>
-<glyph unicode="4" horiz-adv-x="537" d="M21,146l312,0l0,-146l95,0l0,146l88,0l0,79l-88,0l0,442l-137,0l-270,-442M116,225C268,473 322,569 344,635C333,534 333,534 333,490l0,-265l-195,0z" id="glyph1016"/>
-<glyph unicode="" horiz-adv-x="355" d="M30,84l176,0l0,-84l71,0l0,84l50,0l0,63l-50,0l0,254l-91,0l-156,-261M109,147C112,152 117,161 136,193C178,265 199,304 210,323C209,301 208,300 208,290l-2,-143z" id="glyph1018"/>
-<glyph unicode="₄" horiz-adv-x="248" d="M13,58l134,0l0,-58l49,0l0,58l38,0l0,39l-38,0l0,178l-65,0l-118,-181M66,97C116,176 136,208 149,232C147,217 147,212 147,199l0,-102z" id="glyph1020"/>
-<glyph unicode="" horiz-adv-x="355" d="M206,265l71,0l0,84l50,0l0,63l-50,0l0,255l-91,0l-156,-261l0,-57l176,0M109,412C112,418 117,426 136,458C184,541 199,568 210,589C209,566 209,565 208,556l-2,-144z" id="glyph1022"/>
-<glyph unicode="⁴" horiz-adv-x="248" d="M147,400l49,0l0,59l38,0l0,39l-38,0l0,177l-65,0l-118,-180l0,-36l134,0M66,498C116,576 137,610 149,632C147,617 147,612 147,600l0,-102z" id="glyph1024"/>
-<glyph unicode="⁄" horiz-adv-x="151" d="M-78,-32l365,731l-59,0l-364,-731z" id="glyph1026"/>
-<glyph unicode="g" horiz-adv-x="566" d="M87,-89l-9,-88C144,-201 198,-211 263,-211C380,-211 460,-166 486,-85C499,-45 502,-10 502,85l0,405l-85,0l0,-45C417,435 417,425 418,416C418,415 418,411 417,405C390,462 328,497 252,497C126,497 39,394 39,242C39,97 125,-1 254,-1C324,-1 381,28 417,81C416,65 416,63 416,40C415,-9 411,-35 399,-60C377,-108 328,-134 261,-134C203,-134 150,-120 87,-89M135,243C135,348 192,420 275,420C352,420 413,343 413,247C413,147 353,76 270,76C191,76 135,145 135,243z" id="glyph1028"/>
-<glyph unicode="ß" horiz-adv-x="577" d="M69,0l91,0l0,404C160,503 164,541 177,574C196,623 240,654 290,654C355,654 400,606 400,535C400,458 353,415 269,415l-16,0l0,-74l18,0C376,341 434,291 434,201C434,120 380,65 301,65C276,65 260,68 228,80l0,-80C266,-5 285,-7 311,-7C381,-7 435,13 473,51C509,88 530,142 530,198C530,300 467,377 382,381C454,404 496,461 496,535C496,648 414,726 294,726C200,726 126,681 92,603C73,559 69,522 69,396z" id="glyph1030"/>
-<glyph unicode="`" horiz-adv-x="500" d="M242,571l64,0l-82,137l-100,0z" id="glyph1032"/>
-<glyph unicode=">" horiz-adv-x="500" d="M34,91l433,208l0,77l-433,208l0,-89l337,-157l-337,-158z" id="glyph1034"/>
-<glyph unicode="≥" horiz-adv-x="500" d="M33,154l433,197l0,77l-433,200l0,-86l337,-151l-337,-151M33,41l433,0l0,84l-433,0z" id="glyph1036"/>
-<glyph unicode="«" horiz-adv-x="535" d="M247,247l138,-198l85,0l-126,198l124,194l-87,0M191,49l85,0l-126,198l124,194l-87,0l-134,-194z" id="glyph1038"/>
-<glyph unicode="»" horiz-adv-x="535" d="M258,49l86,0l137,198l-134,194l-86,0l124,-194M64,49l85,0l138,198l-134,194l-87,0l124,-194z" id="glyph1040"/>
-<glyph unicode="‹" horiz-adv-x="341" d="M191,49l85,0l-126,198l124,194l-87,0l-134,-194z" id="glyph1042"/>
-<glyph unicode="›" horiz-adv-x="341" d="M64,49l85,0l138,198l-134,194l-87,0l124,-194z" id="glyph1044"/>
-<glyph unicode="h" horiz-adv-x="567" d="M70,0l91,0l0,194C161,267 163,293 172,321C191,382 242,421 302,421C354,421 390,393 404,340C411,315 413,286 413,212l0,-212l91,0l0,257C504,321 499,359 486,393C460,460 401,498 321,498C247,498 192,468 158,410C160,426 161,453 161,487l0,233l-91,0z" id="glyph1046"/>
-<glyph unicode="˝" horiz-adv-x="500" d="M287,571l57,0l108,137l-93,0M132,571l57,0l108,137l-93,0z" id="glyph1048"/>
-<glyph unicode="-" horiz-adv-x="251" d="M0,209l251,0l0,75l-251,0z" id="glyph1050"/>
-<glyph unicode="" horiz-adv-x="248" d="M0,313l248,0l0,40l-248,0z" id="glyph1052"/>
-<glyph unicode="" horiz-adv-x="248" d="M0,313l248,0l0,40l-248,0z" id="glyph1054"/>
-<glyph unicode="i" horiz-adv-x="229" d="M63,606l99,0l0,100l-99,0M69,0l91,0l0,489l-91,0z" id="glyph1056"/>
-<glyph unicode="í" horiz-adv-x="229" d="M87,571l64,0l108,137l-97,0M69,0l91,0l0,489l-91,0z" id="glyph1058"/>
-<glyph unicode="î" horiz-adv-x="229" d="M-10,571l73,0l58,95l58,-95l73,0l-87,137l-89,0M69,0l91,0l0,489l-91,0z" id="glyph1060"/>
-<glyph unicode="ï" horiz-adv-x="229" d="M144,587l82,0l0,97l-82,0M11,587l82,0l0,97l-82,0M70,0l91,0l0,489l-91,0z" id="glyph1062"/>
-<glyph unicode="ì" horiz-adv-x="229" d="M92,571l64,0l-75,137l-97,0M70,0l91,0l0,489l-91,0z" id="glyph1064"/>
-<glyph unicode="∞" horiz-adv-x="667" d="M173,184C234,184 288,216 336,281C381,216 433,184 495,184C585,184 649,249 649,340C649,432 585,497 494,497C431,497 377,465 332,401C287,464 233,497 174,497C83,497 18,432 18,342C18,249 82,184 173,184M378,341C416,399 445,420 483,420C527,420 560,386 560,341C560,295 527,261 484,261C445,261 413,285 378,341M184,260C140,260 107,295 107,340C107,386 140,420 184,420C221,420 255,394 289,340C251,282 222,260 184,260z" id="glyph1066"/>
-<glyph unicode="∫" horiz-adv-x="500" d="M99,-153l-18,-80C104,-240 122,-242 149,-242C205,-242 247,-224 270,-191C292,-160 295,-137 295,-22l0,532C295,615 295,617 297,629C301,661 320,677 353,677C368,677 379,675 401,668l18,80C384,756 368,758 344,758C278,758 229,726 214,674C207,648 205,623 205,536l0,-575C205,-89 205,-101 203,-114C198,-146 180,-162 148,-162C132,-162 122,-160 99,-153z" id="glyph1068"/>
-<glyph unicode="j" horiz-adv-x="248" d="M81,606l99,0l0,100l-99,0M85,10C85,-62 85,-66 77,-87C67,-114 40,-130 6,-130C2,-130 -9,-129 -18,-128l0,-75C9,-207 20,-208 35,-208C97,-208 146,-176 164,-122C175,-88 176,-74 176,10l0,479l-91,0z" id="glyph1070"/>
-<glyph unicode="k" horiz-adv-x="518" d="M70,0l91,0l0,178C161,220 159,244 158,252C184,225 199,201 218,180l166,-180l128,0l-259,273l228,216l-122,0l-159,-159C181,312 169,299 158,285C158,295 161,295 161,375l0,345l-91,0z" id="glyph1072"/>
-<glyph unicode="l" horiz-adv-x="229" d="M69,0l91,0l0,720l-91,0z" id="glyph1074"/>
-<glyph unicode="<" horiz-adv-x="500" d="M33,299l433,-208l0,89l-337,158l337,157l0,90l-433,-209z" id="glyph1076"/>
-<glyph unicode="≤" horiz-adv-x="500" d="M33,351l433,-197l0,86l-337,151l337,151l0,86l-433,-200M33,41l433,0l0,84l-433,0z" id="glyph1078"/>
-<glyph unicode="¬" horiz-adv-x="500" d="M33,183l343,0l0,-183l90,0l0,267l-433,0z" id="glyph1080"/>
-<glyph unicode="◊" horiz-adv-x="667" d="M334,-26l259,359l-259,360l-260,-360M334,63l-197,270l197,271l197,-271z" id="glyph1082"/>
-<glyph unicode="ł" horiz-adv-x="243" d="M76,0l91,0l0,352l66,44l0,85l-66,-43l0,282l-91,0l0,-319l-67,-43l0,-85l67,43z" id="glyph1084"/>
-<glyph unicode="m" horiz-adv-x="844" d="M75,0l91,0l0,216C166,286 168,301 180,333C200,386 245,421 295,421C334,421 364,397 376,354C382,334 383,312 383,251l0,-251l91,0l0,207C474,275 475,292 483,320C499,380 545,421 598,421C641,421 670,397 682,353C688,332 690,304 690,240l0,-240l91,0l0,257C781,326 777,363 768,392C746,460 691,498 617,498C544,498 488,464 456,400C435,463 385,498 312,498C242,498 184,465 158,410l-5,79l-84,0C73,409 75,352 75,276z" id="glyph1086"/>
-<glyph unicode="¯" horiz-adv-x="500" d="M108,605l284,0l0,57l-284,0z" id="glyph1088"/>
-<glyph unicode="−" horiz-adv-x="537" d="M39,304l460,0l0,73l-460,0z" id="glyph1090"/>
-<glyph unicode="µ" horiz-adv-x="500" d="M130,58C160,9 195,-12 246,-12C303,-12 340,15 369,77l0,-77l90,0l0,480l-90,0l0,-259C369,162 361,130 337,99C315,72 283,56 248,56C218,56 187,67 166,88C138,114 130,145 130,214l0,266l-90,0l0,-649l90,0z" id="glyph1092"/>
-<glyph unicode="×" horiz-adv-x="537" d="M123,142l146,146l146,-146l52,52l-146,146l146,146l-52,52l-146,-146l-146,146l-52,-52l146,-146l-146,-146z" id="glyph1094"/>
-<glyph unicode="n" horiz-adv-x="571" d="M75,0l91,0l0,179C166,268 168,289 177,320C196,382 246,421 306,421C358,421 395,392 409,341C416,316 417,296 417,220l0,-220l91,0l0,228C508,308 505,348 495,379C472,455 411,498 326,498C253,498 196,468 158,412l-4,77l-85,0C72,428 75,346 75,242z" id="glyph1096"/>
-<glyph unicode="9" horiz-adv-x="537" d="M73,11C128,-6 161,-11 206,-11C386,-11 480,116 480,362C480,568 400,680 252,680C128,680 39,588 39,459C39,332 121,243 240,243C303,243 354,267 390,315C386,253 376,208 361,174C329,105 274,67 206,67C165,67 128,76 85,96M257,321C187,321 136,381 136,463C136,544 187,602 258,602C324,602 377,537 377,455C377,378 326,321 257,321z" id="glyph1098"/>
-<glyph unicode="" horiz-adv-x="355" d="M58,9C95,-3 115,-7 144,-7C250,-7 306,71 306,217C306,340 257,409 169,409C94,409 40,352 40,273C40,195 90,140 162,140C190,140 214,148 235,165C226,94 194,56 143,56C119,56 98,62 68,78M172,202C138,202 113,233 113,276C113,318 138,348 172,348C205,348 230,314 230,271C230,231 205,202 172,202z" id="glyph1100"/>
-<glyph unicode="₉" horiz-adv-x="248" d="M35,5C62,-2 77,-5 97,-5C177,-5 219,48 219,148C219,233 183,280 117,280C61,280 21,241 21,188C21,135 58,97 111,97C135,97 153,103 171,118C164,62 139,34 97,34C79,34 63,38 42,48M119,136C91,136 71,158 71,189C71,219 91,241 120,241C146,241 167,217 167,186C167,157 147,136 119,136z" id="glyph1102"/>
-<glyph unicode="" horiz-adv-x="355" d="M58,275C95,263 115,259 144,259C250,259 306,337 306,482C306,606 257,674 169,674C94,674 40,617 40,539C40,461 90,406 162,406C190,406 214,414 235,430C226,360 194,322 143,322C119,322 99,328 68,343M172,468C138,468 113,499 113,541C113,583 138,613 172,613C204,613 230,579 230,537C230,497 205,468 172,468z" id="glyph1104"/>
-<glyph unicode="⁹" horiz-adv-x="248" d="M35,406C62,398 77,396 97,396C177,396 219,449 219,549C219,633 183,680 117,680C61,680 21,641 21,588C21,535 58,497 111,497C135,497 153,503 171,519C164,463 139,435 97,435C79,435 63,439 42,449M119,536C91,536 71,558 71,589C71,619 91,641 120,641C146,641 167,617 167,586C167,557 147,536 119,536z" id="glyph1106"/>
-<glyph unicode="≠" horiz-adv-x="537" d="M141,154l67,-31l52,111l239,0l0,73l-205,0l31,67l174,0l0,73l-140,0l38,80l-67,31l-52,-111l-239,0l0,-73l205,0l-31,-67l-174,0l0,-73l140,0z" id="glyph1108"/>
-<glyph unicode="ñ" horiz-adv-x="571" d="M151,585l47,0C203,612 216,626 235,626C242,626 249,625 256,622C323,593 342,587 361,587C406,587 437,624 446,687l-47,0C395,663 381,649 362,649C354,649 345,651 327,659C267,684 264,685 243,685C193,685 160,650 151,585M75,0l91,0l0,179C166,268 168,289 177,320C196,382 246,421 306,421C358,421 395,392 409,341C416,316 417,296 417,220l0,-220l91,0l0,228C508,308 505,348 495,379C472,455 411,498 326,498C253,498 196,468 158,412l-4,77l-85,0C72,428 75,346 75,242z" id="glyph1110"/>
-<glyph unicode="#" horiz-adv-x="537" d="M78,0l75,0l32,202l129,0l-32,-202l75,0l32,202l89,0l10,64l-89,0l23,147l88,0l10,64l-87,0l30,190l-75,0l-30,-187l-129,0l30,187l-75,0l-30,-190l-89,0l-11,-64l86,0l-23,-147l-86,0l-10,-64l89,0M195,266l23,147l130,0l-24,-147z" id="glyph1112"/>
-<glyph unicode="o" horiz-adv-x="579" d="M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1114"/>
-<glyph unicode="ó" horiz-adv-x="579" d="M263,571l64,0l118,137l-100,0M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1116"/>
-<glyph unicode="ô" horiz-adv-x="579" d="M152,571l76,0l72,92l71,-92l76,0l-103,137l-89,0M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1118"/>
-<glyph unicode="ö" horiz-adv-x="579" d="M343,587l87,0l0,97l-87,0M162,587l87,0l0,97l-87,0M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1120"/>
-<glyph unicode="œ" horiz-adv-x="904" d="M39,248C39,96 141,-13 285,-13C376,-13 451,30 473,95C494,28 567,-13 665,-13C722,-13 772,-2 816,19l0,90C773,78 733,64 684,64C589,64 528,124 520,224l344,0C864,311 856,354 832,398C795,466 730,503 648,503C560,503 497,464 473,395C450,460 373,503 280,503C141,503 39,395 39,248M521,295C528,375 580,431 647,431C716,431 762,378 764,295M135,244C135,355 196,431 284,431C369,431 432,351 432,244C432,137 369,59 283,59C199,59 135,138 135,244z" id="glyph1122"/>
-<glyph unicode="˛" horiz-adv-x="500" d="M303,-97C303,-139 343,-175 392,-175C413,-175 432,-171 448,-163l0,42C436,-125 425,-127 415,-127C392,-127 371,-107 371,-85C371,-59 391,-31 433,0l-52,0C330,-29 303,-62 303,-97z" id="glyph1124"/>
-<glyph unicode="ò" horiz-adv-x="579" d="M268,571l64,0l-82,137l-100,0M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1126"/>
-<glyph unicode="1" horiz-adv-x="537" d="M261,0l95,0l0,667l-89,0l-163,-136l53,-63l67,58C236,537 243,544 246,547C255,555 255,555 261,563z" id="glyph1128"/>
-<glyph unicode="" horiz-adv-x="355" d="M163,0l71,0l0,401l-61,0l-101,-86l41,-50l50,45l0,-68z" id="glyph1130"/>
-<glyph unicode="₁" horiz-adv-x="248" d="M116,0l49,0l0,275l-44,0l-75,-58l29,-31l31,26l7,5l3,3l0,-23l0,-17l0,-14z" id="glyph1132"/>
-<glyph unicode="" horiz-adv-x="355" d="M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68z" id="glyph1134"/>
-<glyph unicode="¹" horiz-adv-x="248" d="M116,400l49,0l0,275l-44,0l-75,-58l29,-31l31,26C112,616 115,619 116,620l0,-23l0,-17l0,-14z" id="glyph1136"/>
-<glyph unicode="․" horiz-adv-x="269" d="M85,0l99,0l0,99l-99,0z" id="glyph1138"/>
-<glyph unicode="⅛" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68M545,110C545,41 603,-7 686,-7C767,-7 822,41 822,111C822,158 799,193 752,216C791,240 809,268 809,305C809,365 757,407 683,407C605,407 553,365 553,303C553,263 571,234 611,212C568,189 545,153 545,110M626,305C626,328 651,348 681,348C712,348 736,329 736,305C736,283 721,261 693,242C647,262 626,282 626,305M620,114C620,140 638,161 675,180C726,160 749,139 749,108C749,77 723,56 687,56C648,56 620,80 620,114z" id="glyph1140"/>
-<glyph unicode="" horiz-adv-x="248" d="M117,400l49,0l0,275l-44,0l-75,-58l29,-31l31,26l7,5l3,3l0,-23l0,-17l0,-14M0,313l248,0l0,40l-248,0M21,74C21,28 64,-5 126,-5C186,-5 227,27 227,75C227,108 209,131 171,148C203,164 217,184 217,210C217,251 179,279 123,279C65,279 27,251 27,208C27,180 44,157 74,145C39,129 21,105 21,74M132,163C96,177 77,193 77,210C77,227 97,242 122,242C147,242 167,228 167,210C167,195 154,177 135,165C134,164 134,164 132,163M73,77C73,94 87,112 110,122C112,123 113,123 113,124l2,0l2,2C158,112 177,95 177,73C177,50 156,34 127,34C96,34 73,52 73,77z" id="glyph1142"/>
-<glyph unicode="½" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68M553,0l258,0l0,63l-157,0l-11,0C753,159 803,231 803,292C803,359 749,406 671,406C633,406 609,400 561,380l8,-70C607,333 633,342 662,342C699,342 727,320 727,290C727,243 674,176 553,71z" id="glyph1144"/>
-<glyph unicode="" horiz-adv-x="248" d="M117,400l49,0l0,275l-44,0l-75,-58l29,-31l31,26l7,5l3,3l0,-23l0,-17l0,-14M0,313l248,0l0,40l-248,0M27,0l191,0l0,39l-117,0l-15,0C105,53 127,72 148,93C195,139 212,167 212,200C212,246 172,277 114,277C86,277 68,273 33,260l6,-43C65,231 86,238 107,238C138,238 160,221 160,199C160,166 120,120 27,46z" id="glyph1146"/>
-<glyph unicode="¼" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68M536,84l176,0l0,-84l71,0l0,84l50,0l0,63l-50,0l0,254l-91,0l-156,-261M615,147C618,152 623,161 642,193C684,265 705,304 716,323C715,301 714,300 714,290l-2,-143z" id="glyph1148"/>
-<glyph unicode="" horiz-adv-x="248" d="M117,400l49,0l0,275l-44,0l-75,-58l29,-31l31,26l7,5l3,3l0,-23l0,-17l0,-14M0,313l248,0l0,40l-248,0M13,58l134,0l0,-58l49,0l0,58l38,0l0,39l-38,0l0,178l-65,0l-118,-181M66,97C116,176 136,208 149,232C147,217 147,212 147,199l0,-102z" id="glyph1150"/>
-<glyph unicode="" horiz-adv-x="355" d="M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68z" id="glyph1152"/>
-<glyph unicode="⅓" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M163,265l71,0l0,402l-61,0l-101,-86l41,-50l50,44l0,-68M552,13C588,1 623,-5 658,-5C747,-5 805,41 805,111C805,157 786,186 741,209C781,228 801,258 801,296C801,365 750,406 665,406C629,406 601,401 563,387l5,-67C606,338 631,345 661,345C701,345 728,325 728,296C728,260 690,240 624,240C620,240 612,240 602,241l0,-65l26,0C695,176 729,156 729,116C729,82 698,58 654,58C625,58 598,65 556,83z" id="glyph1154"/>
-<glyph unicode="" horiz-adv-x="248" d="M117,400l49,0l0,275l-44,0l-75,-58l29,-31l31,26l7,5l3,3l0,-23l0,-17l0,-14M0,313l248,0l0,40l-248,0M27,8C52,0 80,-4 105,-4C171,-4 214,27 214,75C214,108 199,128 162,143C195,156 211,176 211,204C211,250 173,278 109,278C84,278 61,274 35,265l4,-41C65,235 85,239 107,239C138,239 161,224 161,204C161,185 145,172 115,166C100,163 99,163 65,163l0,-41C73,123 78,123 82,123C135,123 162,108 162,78C162,53 137,35 102,35C80,35 59,40 29,52z" id="glyph1156"/>
-<glyph unicode="⌥" horiz-adv-x="915" d="M523,594l316,0l0,73l-316,0M575,0l264,0l0,74l-205,0l-293,593l-265,0l0,-73l206,0z" id="glyph1158"/>
-<glyph unicode="ª" horiz-adv-x="355" d="M153,374C197,374 226,387 252,418l0,-14C252,399 252,392 253,378l60,0C310,407 309,438 309,485C309,496 309,509 310,520l0,17C310,579 307,600 300,618C284,657 241,680 183,680C143,680 111,671 76,652l3,-57C114,618 139,626 173,626C221,626 245,605 246,562C226,564 216,564 206,564C102,564 42,528 42,465C42,410 86,374 153,374M166,425C133,425 110,442 110,467C110,500 148,517 221,517C233,517 237,517 247,515C247,490 245,477 239,465C226,440 198,425 166,425M52,280l261,0l0,47l-261,0z" id="glyph1160"/>
-<glyph unicode="º" horiz-adv-x="407" d="M203,368C297,368 365,433 365,521C365,615 299,680 203,680C110,680 42,614 42,523C42,434 110,368 203,368M204,418C149,418 110,462 110,523C110,585 149,630 204,630C258,630 297,585 297,522C297,462 257,418 204,418M52,280l303,0l0,47l-303,0z" id="glyph1162"/>
-<glyph unicode="ø" horiz-adv-x="579" d="M40,14l46,-42l54,61C189,0 232,-13 288,-13C435,-13 540,93 540,242C540,311 521,368 482,415l56,63l-46,39l-55,-61C393,487 343,502 288,502C144,502 39,393 39,244C39,179 58,121 96,75M158,140C140,182 135,205 135,243C135,352 200,430 290,430C328,430 358,419 378,397M198,94l221,255C437,317 445,283 445,243C445,137 379,59 291,59C248,59 225,68 198,94z" id="glyph1164"/>
-<glyph unicode="õ" horiz-adv-x="579" d="M158,585l47,0C210,612 223,626 242,626C249,626 256,625 263,622C330,593 349,587 368,587C413,587 444,624 453,687l-47,0C402,663 388,649 369,649C361,649 352,651 334,659C274,684 271,685 250,685C200,685 167,650 158,585M39,243C39,96 145,-13 288,-13C434,-13 540,93 540,240C540,395 437,502 288,502C144,502 39,393 39,243M135,244C135,352 200,430 290,430C380,430 444,352 444,240C444,136 379,59 290,59C199,59 135,135 135,244z" id="glyph1166"/>
-<glyph unicode="p" horiz-adv-x="581" d="M166,-5C166,32 164,45 162,73l-1,16C196,24 249,-7 329,-7C456,-7 541,96 541,251C541,399 457,498 331,498C257,498 198,465 161,403l-6,86l-86,0C73,420 75,336 75,275l0,-479l91,0M166,244C166,347 228,421 313,421C391,421 445,349 445,245C445,145 387,70 309,70C228,70 166,146 166,244z" id="glyph1168"/>
-<glyph unicode="¶" horiz-adv-x="537" d="M208,-204l77,0l0,801l89,0l0,-801l77,0l0,801l51,0l0,70l-266,0C182,667 132,656 102,638C53,608 23,548 23,479C23,365 92,297 208,297z" id="glyph1170"/>
-<glyph unicode="(" horiz-adv-x="354" d="M62,261C62,111 113,-39 220,-204l86,0C211,-31 161,128 161,261C161,392 211,553 302,720l-85,0C170,643 150,606 129,557C84,454 62,356 62,261z" id="glyph1172"/>
-<glyph unicode=")" horiz-adv-x="354" d="M52,-204l85,0C184,-127 204,-90 225,-41C270,62 292,160 292,255C292,405 241,555 134,720l-86,0C143,547 193,388 193,255C193,124 143,-37 52,-204z" id="glyph1174"/>
-<glyph unicode="∂" horiz-adv-x="500" d="M26,216C26,92 127,-10 250,-10C324,-10 390,26 430,87C459,131 473,185 473,252C473,376 427,488 346,563C281,623 209,653 90,669l-12,-79C144,582 194,566 259,522C319,481 339,450 373,369C330,417 293,434 234,434C118,434 26,338 26,216M117,212C117,299 176,367 253,367C326,367 381,303 381,217C381,128 323,58 249,58C176,58 117,127 117,212z" id="glyph1176"/>
-<glyph unicode="%" horiz-adv-x="813" d="M162,-41l63,0l424,749l-63,0M182,332C277,332 339,399 339,505C339,616 283,678 182,678C82,678 23,614 23,506C23,398 83,332 182,332M181,389C129,389 98,432 98,503C98,578 129,622 183,622C234,622 264,579 264,504C264,432 233,389 181,389M473,163C473,55 533,-11 631,-11C727,-11 789,56 789,162C789,273 733,335 632,335C532,335 473,271 473,163M548,161C548,235 579,279 633,279C684,279 714,235 714,161C714,89 683,46 631,46C579,46 548,89 548,161z" id="glyph1178"/>
-<glyph unicode="." horiz-adv-x="267" d="M80,0l107,0l0,107l-107,0z" id="glyph1180"/>
-<glyph unicode="" horiz-adv-x="185" d="M55,0l76,0l0,71l-76,0z" id="glyph1182"/>
-<glyph unicode="" horiz-adv-x="132" d="M39,0l54,0l0,51l-54,0z" id="glyph1184"/>
-<glyph unicode="" horiz-adv-x="185" d="M55,267l76,0l0,71l-76,0z" id="glyph1186"/>
-<glyph unicode="" horiz-adv-x="132" d="M39,400l54,0l0,51l-54,0z" id="glyph1188"/>
-<glyph unicode="·" horiz-adv-x="267" d="M80,193l107,0l0,107l-107,0z" id="glyph1190"/>
-<glyph unicode="‰" horiz-adv-x="1199" d="M162,-41l63,0l424,749l-63,0M182,332C277,332 339,399 339,505C339,616 283,678 182,678C82,678 23,614 23,506C23,398 83,332 182,332M181,389C129,389 98,432 98,503C98,578 129,622 183,622C234,622 264,579 264,504C264,432 233,389 181,389M859,163C859,55 919,-11 1017,-11C1113,-11 1175,56 1175,162C1175,273 1119,335 1018,335C918,335 859,271 859,163M473,163C473,55 533,-11 631,-11C727,-11 789,56 789,162C789,273 733,335 632,335C532,335 473,271 473,163M934,161C934,235 965,279 1019,279C1070,279 1100,235 1100,161C1100,89 1069,46 1017,46C965,46 934,89 934,161M548,161C548,235 579,279 633,279C684,279 714,235 714,161C714,89 683,46 631,46C579,46 548,89 548,161z" id="glyph1192"/>
-<glyph unicode="π" horiz-adv-x="606" d="M106,0l90,0l0,398l216,0l0,-398l90,0l0,398l73,0l0,81l-544,0l0,-81l75,0z" id="glyph1194"/>
-<glyph unicode="+" horiz-adv-x="537" d="M232,117l73,0l0,187l194,0l0,73l-194,0l0,186l-73,0l0,-186l-193,0l0,-73l193,0z" id="glyph1196"/>
-<glyph unicode="±" horiz-adv-x="537" d="M232,177l73,0l0,187l194,0l0,73l-194,0l0,186l-73,0l0,-186l-193,0l0,-73l193,0M39,57l460,0l0,73l-460,0z" id="glyph1198"/>
-<glyph unicode="∏" horiz-adv-x="709" d="M38,-158l0,-84l251,0l0,84l-81,0l0,832l293,0l0,-832l-81,0l0,-84l252,0l0,84l-81,0l0,832l81,0l0,84l-634,0l0,-84l80,0l0,-832z" id="glyph1200"/>
-<glyph unicode="q" horiz-adv-x="578" d="M38,242C38,90 121,-7 251,-7C327,-7 383,23 420,85C416,64 415,45 415,8l0,-212l91,0l0,693l-88,0C417,484 417,482 417,480C419,454 419,454 419,428C419,417 419,411 422,397C393,461 332,498 254,498C124,498 38,396 38,242M134,244C134,347 193,421 277,421C354,421 414,344 414,244C414,144 354,70 272,70C191,70 134,142 134,244z" id="glyph1202"/>
-<glyph unicode="?" horiz-adv-x="509" d="M226,186l86,0C312,247 320,265 371,323C443,407 464,448 464,506C464,608 380,678 259,678C206,678 156,669 97,649l7,-93C154,581 201,593 248,593C319,593 365,554 365,495C365,461 349,424 315,387C237,299 226,277 226,186M219,0l102,0l0,104l-102,0z" id="glyph1204"/>
-<glyph unicode="¿" horiz-adv-x="509" d="M188,384l102,0l0,105l-102,0M45,-17C45,-119 129,-189 250,-189C303,-189 354,-180 412,-160l-7,93C355,-92 308,-104 261,-104C190,-104 144,-65 144,-6C144,28 161,64 194,102C273,190 283,212 283,303l-86,0C197,242 189,224 138,166C66,82 45,41 45,-17z" id="glyph1206"/>
-<glyph unicode=""" horiz-adv-x="325" d="M199,453l68,0l16,267l-100,0M57,453l69,0l15,267l-99,0z" id="glyph1208"/>
-<glyph unicode="„" horiz-adv-x="455" d="M242,-129l84,0l83,236l-108,0M60,-129l84,0l83,236l-107,0z" id="glyph1210"/>
-<glyph unicode="“" horiz-adv-x="455" d="M242,485l107,0l60,235l-84,0M60,485l107,0l60,235l-84,0z" id="glyph1212"/>
-<glyph unicode="”" horiz-adv-x="455" d="M229,485l84,0l83,235l-108,0M47,485l84,0l83,235l-107,0z" id="glyph1214"/>
-<glyph unicode="‘" horiz-adv-x="273" d="M60,485l107,0l60,235l-84,0z" id="glyph1216"/>
-<glyph unicode="’" horiz-adv-x="273" d="M47,485l84,0l83,235l-107,0z" id="glyph1218"/>
-<glyph unicode="‚" horiz-adv-x="273" d="M47,-128l84,0l83,235l-107,0z" id="glyph1220"/>
-<glyph unicode="'" horiz-adv-x="183" d="M57,453l69,0l15,267l-99,0z" id="glyph1222"/>
-<glyph unicode="r" horiz-adv-x="360" d="M75,0l91,0l0,192C166,265 168,286 177,313C197,377 244,415 303,415C318,415 328,413 346,406l0,83C325,495 315,496 297,496C235,496 186,463 158,402l-5,87l-84,0C73,398 75,334 75,298z" id="glyph1224"/>
-<glyph unicode="√" horiz-adv-x="667" d="M161,0l115,0l200,746l191,0l0,84l-269,0l-102,-386C254,284 253,283 223,117l-7,0C205,191 196,245 192,258l-32,116l-160,0l0,-84l87,0z" id="glyph1226"/>
-<glyph unicode="®" horiz-adv-x="785" d="M48,333C48,143 204,-13 393,-13C583,-13 737,142 737,334C737,523 583,680 398,680C202,680 48,527 48,333M102,333C102,500 232,631 397,631C553,631 683,496 683,333C683,169 553,36 393,36C233,36 102,170 102,333M265,143l65,0l0,166l29,0C403,309 413,302 434,257l52,-114l75,0l-71,142C478,310 467,323 450,332C498,344 526,376 526,421C526,464 499,501 457,514C432,522 414,524 365,524l-100,0M330,363l0,107l37,0C432,470 459,454 459,417C459,379 431,363 362,363z" id="glyph1228"/>
-<glyph unicode="˚" horiz-adv-x="500" d="M250,546C303,546 347,590 347,643C347,696 303,740 252,740C197,740 153,697 153,644C153,590 196,546 250,546M250,595C223,595 202,617 202,643C202,670 224,691 251,691C276,691 298,669 298,643C298,617 276,595 250,595z" id="glyph1230"/>
-<glyph unicode="s" horiz-adv-x="378" d="M41,19C84,-1 121,-9 168,-9C275,-9 346,51 346,140C346,201 316,237 236,276l-37,18C152,317 131,338 131,365C131,402 163,426 213,426C248,426 278,418 312,401l7,77C277,492 243,498 205,498C103,498 35,442 35,356C35,321 48,291 71,268C89,251 101,243 147,220l38,-19C215,186 215,186 226,178C241,167 250,150 250,132C250,95 211,68 156,68C121,68 87,78 41,100z" id="glyph1232"/>
-<glyph unicode="š" horiz-adv-x="378" d="M149,571l89,0l103,137l-76,0l-71,-92l-72,92l-76,0M41,19C84,-1 121,-9 168,-9C275,-9 346,51 346,140C346,201 316,237 236,276l-37,18C152,317 131,338 131,365C131,402 163,426 213,426C248,426 278,418 312,401l7,77C277,492 243,498 205,498C103,498 35,442 35,356C35,321 48,291 71,268C89,251 101,243 147,220l38,-19C215,186 215,186 226,178C241,167 250,150 250,132C250,95 211,68 156,68C121,68 87,78 41,100z" id="glyph1234"/>
-<glyph unicode="§" horiz-adv-x="537" d="M64,-99l-8,-88C108,-205 159,-213 219,-213C372,-213 472,-139 472,-25C472,38 446,77 384,108C453,143 484,188 484,252C484,296 467,335 435,363C411,384 395,394 337,418l-70,29C175,485 148,511 148,558C148,615 203,653 288,653C335,653 381,644 431,625l9,83C394,722 339,729 288,729C154,729 61,657 61,555C61,522 71,490 90,465C104,446 118,435 152,417C115,403 100,393 84,370C64,342 53,307 53,273C53,229 71,188 103,158C121,141 160,120 202,103l58,-24C349,42 377,18 377,-32C377,-96 319,-134 224,-134C171,-134 119,-122 64,-99M182,207C145,229 127,256 127,292C127,330 144,361 184,396l98,-43C380,310 405,286 405,234C405,195 390,167 351,134l-91,36C236,179 198,197 182,207z" id="glyph1236"/>
-<glyph unicode=";" horiz-adv-x="267" d="M71,382l107,0l0,107l-107,0M20,-129l85,0l82,236l-107,0z" id="glyph1238"/>
-<glyph unicode="7" horiz-adv-x="537" d="M121,0l106,0l250,588l0,79l-426,0l0,-79l278,0C369,588 382,589 385,589C367,556 339,496 322,458z" id="glyph1240"/>
-<glyph unicode="" horiz-adv-x="355" d="M81,0l78,0l144,342l0,57l-257,0l0,-64l164,0l16,0C207,293 206,291 198,273z" id="glyph1242"/>
-<glyph unicode="₇" horiz-adv-x="248" d="M54,0l54,0l109,237l0,36l-191,0l0,-39l122,0l12,0l5,0C154,214 148,200 142,188z" id="glyph1244"/>
-<glyph unicode="" horiz-adv-x="355" d="M81,265l78,0l144,343l0,57l-257,0l0,-64l164,0l16,0C207,559 206,557 198,539z" id="glyph1246"/>
-<glyph unicode="⁷" horiz-adv-x="248" d="M54,400l54,0l109,237l0,36l-191,0l0,-39l122,0l12,0l5,0C154,614 148,600 142,588z" id="glyph1248"/>
-<glyph unicode="⅞" horiz-adv-x="862" d="M220,-32l57,0l366,731l-59,0M81,265l78,0l144,343l0,57l-257,0l0,-64l164,0l16,0C207,559 206,557 198,539M545,110C545,41 603,-7 686,-7C767,-7 822,41 822,111C822,158 799,193 753,216C792,240 810,268 810,305C810,365 758,407 683,407C605,407 553,365 553,303C553,263 571,234 611,212C568,189 545,154 545,110M626,305C626,328 651,348 682,348C712,348 737,329 737,305C737,284 721,259 694,242C648,262 626,282 626,305M620,114C620,140 639,162 675,180C727,160 749,139 749,108C749,77 723,56 687,56C648,56 620,80 620,114z" id="glyph1250"/>
-<glyph unicode="" horiz-adv-x="248" d="M54,400l54,0l110,237l0,36l-192,0l0,-39l123,0l11,0l6,0C158,619 150,602 143,588M0,313l248,0l0,40l-248,0M21,74C21,28 64,-5 126,-5C186,-5 227,27 227,75C227,108 209,131 171,148C203,164 217,184 217,210C217,251 179,279 123,279C65,279 27,251 27,208C27,180 44,157 74,145C39,129 21,105 21,74M132,163C96,177 77,193 77,210C77,227 97,242 122,242C147,242 167,228 167,210C167,195 154,177 135,165C134,164 134,164 132,163M73,77C73,94 87,112 110,122C112,123 113,123 113,124l2,0l2,2C158,112 177,95 177,73C177,50 156,34 127,34C96,34 73,52 73,77z" id="glyph1252"/>
-<glyph unicode="⇧" horiz-adv-x="931" d="M273,0l385,0l0,333l196,0l-388,388l-389,-388l196,0M339,66l0,326l-110,0l237,236l236,-236l-110,0l0,-326z" id="glyph1254"/>
-<glyph unicode="6" horiz-adv-x="537" d="M278,-12C405,-12 494,80 494,211C494,335 411,424 295,424C229,424 170,395 144,350l0,16C144,414 160,478 181,514C212,568 266,600 326,600C367,600 406,591 448,571l12,85C411,671 369,678 322,678C146,678 52,551 52,312C52,101 131,-12 278,-12M155,212C155,291 206,346 277,346C346,346 397,286 397,206C397,125 346,66 277,66C208,66 155,130 155,212z" id="glyph1256"/>
-<glyph unicode="" horiz-adv-x="355" d="M185,-7C261,-7 315,50 315,130C315,206 264,262 194,262C166,262 142,254 119,236C129,308 160,345 212,345C236,345 257,339 287,324l10,68C264,403 238,407 209,407C105,407 48,330 48,188C48,62 96,-7 185,-7M125,131C125,171 149,200 184,200C217,200 242,169 242,127C242,85 218,54 184,54C151,54 125,87 125,131z" id="glyph1258"/>
-<glyph unicode="₆" horiz-adv-x="248" d="M128,-5C185,-5 225,34 225,89C225,140 187,178 136,178C111,178 93,171 75,156C81,212 106,240 149,240C167,240 183,236 204,227l7,42C187,276 168,279 147,279C69,279 27,226 27,128C27,42 63,-5 128,-5M79,89C79,118 99,139 127,139C155,139 175,116 175,86C175,56 155,34 128,34C100,34 79,58 79,89z" id="glyph1260"/>
-<glyph unicode="" horiz-adv-x="355" d="M185,259C261,259 315,316 315,396C315,473 264,528 194,528C166,528 142,520 119,502C129,574 160,611 212,611C236,611 257,605 287,590l10,68C264,669 238,673 209,673C105,673 48,596 48,454C48,328 96,259 185,259M184,320C151,320 125,353 125,397C125,437 149,466 184,466C217,466 242,435 242,393C242,351 218,320 184,320z" id="glyph1262"/>
-<glyph unicode="⁶" horiz-adv-x="248" d="M128,395C185,395 225,434 225,489C225,540 187,578 136,578C111,578 94,572 75,556C81,612 106,640 149,640C167,640 183,636 204,627l7,42C187,676 168,679 147,679C69,679 27,626 27,528C27,442 63,395 128,395M128,434C100,434 79,458 79,489C79,518 99,539 127,539C155,539 175,516 175,486C175,456 155,434 128,434z" id="glyph1264"/>
-<glyph unicode="/" horiz-adv-x="435" d="M-29,-204l80,0l335,924l-77,0z" id="glyph1266"/>
-<glyph unicode=" " horiz-adv-x="250" id="glyph1268"/>
-<glyph unicode="£" horiz-adv-x="537" d="M61,0l419,0l0,79l-235,0l0,245l152,0l0,53l-155,0l0,18C242,439 246,479 253,502C270,559 320,594 384,594C416,594 439,588 483,570l8,83C451,666 416,672 374,672C296,672 228,641 190,588C158,543 149,502 149,400l0,-23l-79,0l0,-53l80,0l0,-245l-89,0z" id="glyph1270"/>
-<glyph unicode="∑" horiz-adv-x="667" d="M26,-148l0,-94l588,0l0,234l-85,0l-5,-150l-397,0l252,435l-252,397l388,0l9,-151l81,0l0,235l-579,0l0,-92l247,-389z" id="glyph1272"/>
-<glyph unicode="t" horiz-adv-x="367" d="M129,58C151,17 197,-6 256,-6C282,-6 307,-2 340,8l0,78C316,75 300,71 281,71C241,71 213,92 206,128C202,147 201,173 201,224l0,194l129,0l0,71l-129,0l0,141l-91,-31l0,-110l-113,0l0,-71l113,0l0,-221C110,120 115,85 129,58z" id="glyph1274"/>
-<glyph unicode="þ" horiz-adv-x="580" d="M165,-5C165,32 163,45 161,73l-1,16C195,23 248,-7 328,-7C455,-7 540,96 540,251C540,399 456,498 330,498C256,498 200,467 159,403C163,433 165,457 165,489l0,231l-90,0l0,-924l90,0M165,243C165,346 227,420 312,420C390,420 444,349 444,245C444,145 386,70 308,70C227,70 165,145 165,243z" id="glyph1276"/>
-<glyph unicode="3" horiz-adv-x="537" d="M53,18C108,1 170,-9 226,-9C375,-9 471,65 471,178C471,274 403,342 303,347C398,355 463,417 463,500C463,556 438,605 393,637C355,664 306,676 237,676C179,676 129,667 74,647l6,-82C135,588 181,598 232,598C311,598 366,557 366,499C366,446 326,410 251,395C218,389 199,387 142,387l0,-81C157,307 164,307 173,307C213,307 247,304 271,297C333,280 368,240 368,186C368,118 306,69 220,69C169,69 120,80 57,106z" id="glyph1278"/>
-<glyph unicode="" horiz-adv-x="355" d="M46,13C82,1 117,-5 152,-5C241,-5 299,41 299,111C299,157 280,186 235,209C275,228 295,258 295,296C295,365 244,406 159,406C123,406 95,401 57,387l5,-67C100,338 125,345 155,345C195,345 222,325 222,296C222,260 184,240 118,240C114,240 106,240 96,241l0,-65l26,0C189,176 223,156 223,116C223,82 192,58 148,58C119,58 92,65 50,83z" id="glyph1280"/>
-<glyph unicode="₃" horiz-adv-x="248" d="M27,8C51,0 79,-4 105,-4C171,-4 214,27 214,75C214,108 199,128 162,143C195,156 211,176 211,204C211,250 173,278 109,278C84,278 61,274 35,265l4,-41C65,235 85,239 107,239C138,239 161,224 161,204C161,185 145,172 115,166C100,163 99,163 65,163l0,-41C73,123 78,123 82,123C135,123 162,108 162,78C162,53 137,35 102,35C80,35 59,40 29,52z" id="glyph1282"/>
-<glyph unicode="" horiz-adv-x="355" d="M46,279C83,266 117,260 152,260C241,260 299,306 299,377C299,423 280,452 235,475C275,494 295,523 295,562C295,631 244,672 159,672C123,672 94,666 57,653l5,-67C100,604 125,611 156,611C195,611 222,591 222,562C222,526 184,506 118,506l-22,0l0,-65C111,443 119,443 123,443C189,443 223,422 223,382C223,348 192,323 148,323C118,323 93,330 50,349z" id="glyph1284"/>
-<glyph unicode="³" horiz-adv-x="248" d="M27,409C51,401 79,397 105,397C171,397 214,428 214,476C214,508 199,528 162,543C194,556 211,577 211,605C211,651 173,679 109,679C84,679 62,675 35,666l4,-42C65,635 85,640 107,640C138,640 161,625 161,604C161,578 131,563 80,563l-15,0l0,-40l17,0C135,523 162,508 162,479C162,454 137,436 102,436C80,436 59,441 29,453z" id="glyph1286"/>
-<glyph unicode="⅜" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M46,279C83,266 117,260 152,260C241,260 299,306 299,377C299,423 280,452 235,475C275,494 295,523 295,562C295,631 244,672 159,672C123,672 94,666 57,653l5,-67C100,604 125,611 156,611C195,611 222,591 222,562C222,526 184,506 118,506l-22,0l0,-65C111,443 119,443 123,443C189,443 223,422 223,382C223,348 192,323 148,323C118,323 93,330 50,349M545,110C545,41 603,-7 685,-7C766,-7 821,41 821,111C821,158 798,193 752,216C791,240 809,268 809,305C809,365 757,407 683,407C605,407 553,365 553,303C553,263 571,235 610,212C568,189 545,153 545,110M626,305C626,328 651,348 681,348C712,348 736,329 736,305C736,283 721,261 693,242C648,262 626,282 626,305M620,114C620,140 638,161 674,180C726,160 748,139 748,108C748,77 723,56 686,56C648,56 620,80 620,114z" id="glyph1288"/>
-<glyph unicode="" horiz-adv-x="248" d="M27,409C52,401 79,397 105,397C171,397 214,428 214,476C214,508 199,528 162,543C194,556 211,577 211,605C211,651 173,679 109,679C84,679 62,675 35,666l4,-42C65,635 85,640 107,640C138,640 161,625 161,604C161,578 131,563 80,563l-15,0l0,-40l17,0C135,523 162,508 162,479C162,454 137,436 102,436C80,436 59,441 29,453M0,313l248,0l0,40l-248,0M21,74C21,28 64,-5 126,-5C186,-5 227,27 227,75C227,108 209,131 171,148C203,164 217,184 217,210C217,251 179,279 123,279C65,279 27,251 27,208C27,180 44,157 74,145C39,129 21,105 21,74M132,163C96,177 77,193 77,210C77,227 97,242 122,242C147,242 167,228 167,210C167,195 154,177 135,165C134,164 134,164 132,163M73,77C73,94 87,112 110,122C112,123 113,123 113,124l2,0l2,2C158,112 177,95 177,73C177,50 156,34 127,34C96,34 73,52 73,77z" id="glyph1290"/>
-<glyph unicode="¾" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M46,279C83,266 117,260 152,260C241,260 299,306 299,377C299,423 280,452 235,475C275,494 295,523 295,562C295,631 244,672 159,672C123,672 94,666 57,653l5,-67C100,604 125,611 156,611C195,611 222,591 222,562C222,526 184,506 118,506l-22,0l0,-65C111,443 119,443 123,443C189,443 223,422 223,382C223,348 192,323 148,323C118,323 93,330 50,349M536,84l176,0l0,-84l71,0l0,84l50,0l0,63l-50,0l0,254l-91,0l-156,-261M615,147C618,152 623,161 642,193C684,265 705,304 716,323C715,301 714,300 714,290l-2,-143z" id="glyph1292"/>
-<glyph unicode="" horiz-adv-x="248" d="M27,409C52,401 79,397 105,397C171,397 214,428 214,476C214,508 199,528 162,543C194,556 211,577 211,605C211,651 173,679 109,679C84,679 62,675 35,666l4,-42C65,635 85,640 107,640C138,640 161,625 161,604C161,578 131,563 80,563l-15,0l0,-40l17,0C135,523 162,508 162,479C162,454 137,436 102,436C80,436 59,441 29,453M0,313l248,0l0,40l-248,0M13,58l134,0l0,-58l49,0l0,58l38,0l0,39l-38,0l0,178l-65,0l-118,-181M66,97C116,176 136,208 149,232C147,217 147,212 147,199l0,-102z" id="glyph1294"/>
-<glyph unicode="" horiz-adv-x="355" d="M46,279C83,266 117,260 152,260C241,260 299,306 299,377C299,423 280,452 235,475C275,494 295,523 295,562C295,631 244,672 159,672C123,672 94,666 57,653l5,-67C100,604 125,611 156,611C195,611 222,591 222,562C222,526 184,506 118,506l-22,0l0,-65C111,443 119,443 123,443C189,443 223,422 223,382C223,348 192,323 148,323C118,323 93,330 50,349z" id="glyph1296"/>
-<glyph unicode="˜" horiz-adv-x="500" d="M102,585l47,0C154,612 167,626 186,626C193,626 200,625 207,622C274,593 293,587 312,587C357,587 388,624 397,687l-47,0C346,663 332,649 313,649C305,649 296,651 278,659C218,684 215,685 194,685C144,685 111,650 102,585z" id="glyph1298"/>
-<glyph unicode="™" horiz-adv-x="861" d="M365,287l65,0l0,213C430,515 428,581 426,610C443,565 461,519 481,471l77,-184l60,0l77,184C735,566 737,579 749,615l-1,-111l0,-217l65,0l0,381l-102,0l-78,-189C607,417 603,404 590,366C584,385 580,396 573,413C564,435 555,457 546,478l-80,190l-101,0M128,287l65,0l0,327l125,0l0,54l-318,0l0,-54l128,0z" id="glyph1300"/>
-<glyph unicode="2" horiz-adv-x="537" d="M53,0l425,0l0,79l-261,0C181,79 163,78 146,75C190,107 236,147 291,202C418,331 464,408 464,492C464,601 375,675 245,675C184,675 141,665 69,636l10,-87C132,581 182,597 230,597C306,597 361,552 361,490C361,403 268,286 53,101z" id="glyph1302"/>
-<glyph unicode="" horiz-adv-x="355" d="M47,0l257,0l0,63l-156,0l-11,0C246,158 296,231 296,292C296,359 242,406 164,406C127,406 103,400 55,380l8,-70C100,333 127,342 155,342C193,342 220,320 220,290C220,243 168,177 47,71z" id="glyph1304"/>
-<glyph unicode="₂" horiz-adv-x="248" d="M27,0l191,0l0,39l-132,0C105,53 127,72 148,93C195,139 212,167 212,200C212,246 172,277 114,277C86,277 68,273 33,260l6,-43C65,231 86,238 107,238C138,238 160,221 160,199C160,166 120,120 27,46z" id="glyph1306"/>
-<glyph unicode="" horiz-adv-x="355" d="M47,265l257,0l0,63l-167,0C245,422 296,496 296,558C296,625 242,672 164,672C127,672 104,666 55,646l8,-71C101,599 127,608 155,608C193,608 220,586 220,556C220,508 168,443 47,336z" id="glyph1308"/>
-<glyph unicode="²" horiz-adv-x="248" d="M27,400l191,0l0,39l-132,0C104,453 127,472 148,493C195,540 212,568 212,600C212,647 172,678 114,678C87,678 67,674 33,661l6,-44C65,632 86,639 107,639C138,639 160,622 160,600C160,567 121,521 27,446z" id="glyph1310"/>
-<glyph unicode="‥" horiz-adv-x="537" d="M354,0l99,0l0,99l-99,0M85,0l99,0l0,99l-99,0z" id="glyph1312"/>
-<glyph unicode="" horiz-adv-x="355" d="M47,265l257,0l0,63l-156,0l-11,0C245,422 296,496 296,558C296,625 242,672 164,672C127,672 104,666 55,646l8,-71C101,599 127,608 155,608C193,608 220,586 220,556C220,508 168,443 47,336z" id="glyph1314"/>
-<glyph unicode="⅔" horiz-adv-x="862" d="M219,-32l58,0l365,731l-59,0M47,265l257,0l0,63l-156,0l-11,0C245,422 296,496 296,558C296,625 242,672 164,672C127,672 104,666 55,646l8,-71C101,599 127,608 155,608C193,608 220,586 220,556C220,508 168,443 47,336M552,13C588,1 623,-5 658,-5C747,-5 805,41 805,111C805,157 786,186 741,209C781,228 801,258 801,296C801,365 750,406 665,406C629,406 601,401 563,387l5,-67C606,338 631,345 661,345C701,345 728,325 728,296C728,260 690,240 624,240C620,240 612,240 602,241l0,-65l26,0C695,176 729,156 729,116C729,82 698,58 654,58C625,58 598,65 556,83z" id="glyph1316"/>
-<glyph unicode="" horiz-adv-x="248" d="M27,400l191,0l0,39l-117,0l-15,0C104,453 127,472 148,493C195,540 212,568 212,600C212,647 172,678 114,678C87,678 67,674 33,661l6,-44C65,632 86,639 107,639C138,639 160,622 160,600C160,567 121,521 27,446M0,313l248,0l0,40l-248,0M27,8C52,0 80,-4 105,-4C171,-4 214,27 214,75C214,108 199,128 162,143C195,156 211,176 211,204C211,250 173,278 109,278C84,278 61,274 35,265l4,-41C65,235 85,239 107,239C138,239 161,224 161,204C161,185 145,172 115,166C100,163 99,163 65,163l0,-41C73,123 78,123 82,123C135,123 162,108 162,78C162,53 137,35 102,35C80,35 59,40 29,52z" id="glyph1318"/>
-<glyph unicode="u" horiz-adv-x="566" d="M87,81C114,25 172,-7 244,-7C313,-7 369,21 408,76l5,-76l83,0C491,88 490,126 490,181l0,308l-91,0l0,-215C399,194 396,177 379,142C355,94 312,65 262,65C217,65 183,88 167,131C157,157 154,189 154,262l0,227l-91,0l0,-259C63,163 71,114 87,81z" id="glyph1320"/>
-<glyph unicode="ú" horiz-adv-x="566" d="M246,571l64,0l118,137l-100,0M87,81C114,25 172,-7 244,-7C313,-7 369,21 408,76l5,-76l83,0C491,88 490,126 490,181l0,308l-91,0l0,-215C399,194 396,177 379,142C355,94 312,65 262,65C217,65 183,88 167,131C157,157 154,189 154,262l0,227l-91,0l0,-259C63,163 71,114 87,81z" id="glyph1322"/>
-<glyph unicode="û" horiz-adv-x="566" d="M136,571l76,0l72,92l71,-92l76,0l-103,137l-89,0M87,81C114,25 172,-7 244,-7C313,-7 369,21 408,76l5,-76l83,0C491,88 490,126 490,181l0,308l-91,0l0,-215C399,194 396,177 379,142C355,94 312,65 262,65C217,65 183,88 167,131C157,157 154,189 154,262l0,227l-91,0l0,-259C63,163 71,114 87,81z" id="glyph1324"/>
-<glyph unicode="ü" horiz-adv-x="566" d="M330,587l87,0l0,97l-87,0M149,587l87,0l0,97l-87,0M87,81C114,25 172,-7 244,-7C313,-7 369,21 408,76l5,-76l83,0C491,88 490,126 490,181l0,308l-91,0l0,-215C399,194 396,177 379,142C355,94 312,65 262,65C217,65 183,88 167,131C157,157 154,189 154,262l0,227l-91,0l0,-259C63,163 71,114 87,81z" id="glyph1326"/>
-<glyph unicode="ù" horiz-adv-x="566" d="M258,571l64,0l-82,137l-100,0M87,81C114,25 172,-7 244,-7C313,-7 369,21 408,76l5,-76l83,0C491,88 490,126 490,181l0,308l-91,0l0,-215C399,194 396,177 379,142C355,94 312,65 262,65C217,65 183,88 167,131C157,157 154,189 154,262l0,227l-91,0l0,-259C63,163 71,114 87,81z" id="glyph1328"/>
-<glyph unicode="_" horiz-adv-x="500" d="M0,-59l0,-82l500,0l0,82z" id="glyph1330"/>
-<glyph unicode=" " horiz-adv-x="250" id="glyph1332"/>
-<glyph unicode="" horiz-adv-x="251" d="M0,209l251,0l0,75l-251,0z" id="glyph1334"/>
-<glyph unicode="Ω" horiz-adv-x="667" d="M29,0l264,0l0,73C177,137 121,229 121,353C121,434 145,497 196,545C235,582 284,602 335,602C391,602 439,579 481,533C526,483 547,428 547,354C547,276 523,207 477,152C450,120 425,101 375,73l0,-73l264,0l0,81l-166,0C587,149 639,238 639,364C639,545 507,683 334,683C161,683 29,545 29,365C29,238 81,150 195,81l-166,0z" id="glyph1336"/>
-<glyph unicode="′" horiz-adv-x="183" d="M57,453l69,0l15,267l-99,0z" id="glyph1338"/>
-<glyph unicode="″" horiz-adv-x="325" d="M199,453l68,0l16,267l-100,0M57,453l69,0l15,267l-99,0z" id="glyph1340"/>
-<glyph unicode="℗" horiz-adv-x="785" d="M48,333C48,143 204,-13 393,-13C583,-13 737,142 737,334C737,523 583,680 398,680C202,680 48,527 48,333M102,333C102,500 232,631 397,631C553,631 683,496 683,333C683,169 553,36 393,36C233,36 102,170 102,333M282,143l65,0l0,166l35,0C515,309 543,373 543,421C543,464 516,501 474,514C449,522 431,524 382,524l-100,0M347,363l0,107l37,0C449,470 476,454 476,417C476,379 448,363 379,363z" id="glyph1342"/>
-<glyph unicode="①" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M390,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1344"/>
-<glyph unicode="②" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M304,142l214,0l0,55l-132,0C430,280 510,329 510,452C510,527 470,574 406,574C367,574 328,558 313,546C315,527 317,507 318,487C325,494 360,518 395,518C420,518 438,491 438,454C438,361 350,279 304,207z" id="glyph1346"/>
-<glyph unicode="③" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M312,151C322,146 351,135 387,135C470,135 521,179 521,256C521,315 495,350 450,362C491,374 519,411 519,461C519,530 473,574 400,574C364,574 334,561 323,553l3,-58C335,502 362,518 392,518C426,518 448,494 448,456C448,409 415,390 376,390l-21,0l0,-56l26,0C422,334 449,312 449,259C449,218 421,191 379,191C352,191 321,206 314,211z" id="glyph1348"/>
-<glyph unicode="④" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M279,235l135,0l0,-93l67,0l0,93l44,0l0,55l-44,0l0,277l-91,0l-111,-274M347,290l67,187l0,-187z" id="glyph1350"/>
-<glyph unicode="⑤" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M312,153C332,146 363,136 401,136C481,136 533,190 533,284C533,368 484,415 425,415C405,415 391,413 381,410l0,97l134,0l0,60l-196,0l0,-221C331,351 352,360 384,360C438,360 462,323 462,281C462,232 435,198 389,198C356,198 336,207 316,218z" id="glyph1352"/>
-<glyph unicode="⑥" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M402,135C468,135 512,190 512,275C512,361 475,413 410,413C387,413 367,395 357,374C359,431 373,518 437,518C458,518 477,508 489,501C490,513 495,547 497,560C484,565 458,574 429,574C341,574 292,489 292,338C292,195 332,135 402,135M402,190C376,190 363,230 363,257C363,332 377,357 402,357C426,357 441,324 441,274C441,225 424,190 402,190z" id="glyph1354"/>
-<glyph unicode="⑦" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M328,142l76,0l114,368l0,57l-212,0l0,-56l142,0z" id="glyph1356"/>
-<glyph unicode="⑧" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M295,251C295,182 342,135 410,135C479,135 525,181 525,253C525,309 502,344 455,368C494,386 523,429 523,473C523,533 476,574 411,574C341,574 295,533 295,467C295,430 309,392 363,363C320,341 295,307 295,251M415,390C386,408 363,432 363,463C363,494 384,519 408,519C435,519 452,497 452,465C452,427 428,399 415,390M366,254C366,293 379,314 404,335C437,315 453,291 453,253C453,215 436,190 412,190C387,190 366,218 366,254z" id="glyph1358"/>
-<glyph unicode="⑨" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M320,148C332,143 357,135 387,135C473,135 524,220 524,371C524,514 483,574 413,574C347,574 304,518 304,433C304,347 341,295 406,295C428,295 449,312 458,334C458,279 441,191 379,191C357,191 339,200 327,207C325,201 322,168 320,148M413,351C389,351 375,383 375,434C375,483 391,519 413,519C441,519 453,479 453,442C453,409 447,351 413,351z" id="glyph1360"/>
-<glyph unicode="⑩" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M505,135C581,135 618,216 618,353C618,490 581,574 505,574C429,574 392,492 392,355C392,218 429,135 505,135M258,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M505,190C475,190 463,250 463,353C463,456 475,519 505,519C535,519 547,458 547,355C547,252 535,190 505,190z" id="glyph1362"/>
-<glyph unicode="⑪" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M485,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M278,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1364"/>
-<glyph unicode="⑫" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M396,142l214,0l0,55l-132,0C522,280 602,329 602,452C602,527 562,574 498,574C459,574 420,558 405,546C407,527 409,507 410,487C417,494 452,518 487,518C512,518 530,491 530,454C530,361 442,279 396,207M256,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1366"/>
-<glyph unicode="⑬" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M393,151C403,146 432,135 468,135C551,135 602,179 602,256C602,315 576,350 531,362C572,374 600,411 600,461C600,530 554,574 481,574C445,574 415,561 404,553l3,-58C416,502 443,518 473,518C507,518 529,494 529,456C529,409 496,390 457,390l-21,0l0,-56l26,0C503,334 530,312 530,259C530,218 502,191 460,191C433,191 402,206 395,211M263,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1368"/>
-<glyph unicode="⑭" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M373,235l135,0l0,-93l67,0l0,93l43,0l0,55l-43,0l0,277l-92,0l-110,-274M253,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M441,290l67,187l0,-187z" id="glyph1370"/>
-<glyph unicode="⑮" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M391,153C411,146 442,136 480,136C560,136 612,190 612,284C612,368 563,415 504,415C484,415 470,413 460,410l0,97l134,0l0,60l-196,0l0,-221C410,351 431,360 463,360C517,360 541,323 541,281C541,232 514,198 468,198C435,198 415,207 395,218M254,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1372"/>
-<glyph unicode="⑯" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M387,338C387,195 427,135 497,135C563,135 607,190 607,275C607,361 570,413 505,413C482,413 462,395 452,374C454,431 468,518 532,518C553,518 572,508 584,501C585,513 590,547 592,560C579,565 553,574 524,574C436,574 387,489 387,338M248,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M458,257C458,332 472,357 497,357C521,357 536,324 536,274C536,225 519,190 497,190C471,190 458,230 458,257z" id="glyph1374"/>
-<glyph unicode="⑰" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M416,142l77,0l113,368l0,57l-211,0l0,-56l142,0M263,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58z" id="glyph1376"/>
-<glyph unicode="⑱" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M380,251C380,182 427,135 494,135C563,135 609,181 609,253C609,309 587,344 540,368C578,386 608,429 608,473C608,533 561,574 496,574C425,574 380,533 380,467C380,430 394,392 448,363C404,341 380,307 380,251M246,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M500,390C471,408 447,432 447,463C447,494 468,519 493,519C519,519 537,497 537,465C537,427 513,399 500,390M451,254C451,293 464,314 489,335C521,315 538,291 538,253C538,215 521,190 496,190C471,190 451,218 451,254z" id="glyph1378"/>
-<glyph unicode="⑲" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M409,148C421,143 446,135 476,135C562,135 613,220 613,371C613,514 572,574 502,574C436,574 393,518 393,433C393,347 430,295 495,295C517,295 538,312 547,334C547,279 530,191 468,191C446,191 428,200 416,207C414,201 411,168 409,148M261,142l70,0l0,425l-51,0l-91,-92l25,-45l47,58M502,351C478,351 464,383 464,434C464,483 480,519 502,519C530,519 542,479 542,442C542,409 536,351 502,351z" id="glyph1380"/>
-<glyph unicode="⑳" horiz-adv-x="820" d="M44,354C44,152 208,-12 410,-12C612,-12 776,152 776,354C776,556 612,720 410,720C208,720 44,556 44,354M96,354C96,530 236,673 410,673C584,673 724,530 724,354C724,178 584,35 410,35C236,35 96,178 96,354M423,355C423,218 460,135 536,135C612,135 649,216 649,353C649,490 612,574 536,574C460,574 423,492 423,355M186,142l214,0l0,55l-132,0C290,226 311,256 332,288C349,315 392,389 392,452C392,527 352,574 288,574C249,574 210,558 195,546C197,527 199,507 200,487C207,494 242,518 277,518C302,518 320,491 320,454C320,413 299,370 275,332C247,286 216,248 186,207M536,190C506,190 494,250 494,353C494,456 506,519 536,519C566,519 578,458 578,355C578,252 566,190 536,190z" id="glyph1382"/>
-<glyph unicode="v" horiz-adv-x="472" d="M186,0l104,0l176,489l-90,0l-115,-326l-12,-37C245,113 243,103 240,85C237,108 238,112 204,207l-100,282l-98,0z" id="glyph1384"/>
-<glyph unicode="w" horiz-adv-x="792" d="M167,0l104,0l81,253C374,322 383,356 396,411C407,361 422,309 441,251l84,-251l105,0l156,489l-90,0l-82,-266C600,177 585,122 579,82C568,131 552,188 541,220l-89,269l-106,0l-96,-305C235,137 233,130 226,99l-4,-17C217,118 208,150 185,226l-80,263l-99,0z" id="glyph1386"/>
-<glyph unicode="x" horiz-adv-x="475" d="M6,0l106,0l92,143C217,164 220,168 223,173C227,181 230,187 234,200C240,184 252,163 266,141l91,-141l112,0l-174,257l156,232l-100,0l-76,-120C252,332 248,325 242,307C236,324 224,346 210,368l-80,121l-111,0l162,-232z" id="glyph1388"/>
-<glyph unicode="y" horiz-adv-x="471" d="M41,-126l-5,-74C61,-205 73,-207 92,-207C149,-207 189,-188 221,-145C246,-113 258,-88 291,5l174,484l-90,0l-115,-332C249,125 248,122 246,116C243,105 242,97 239,79C238,100 229,135 213,180l-109,309l-98,0l188,-509C184,-54 167,-86 149,-108C134,-125 111,-135 84,-135C68,-135 59,-133 41,-126z" id="glyph1390"/>
-<glyph unicode="ý" horiz-adv-x="471" d="M203,571l64,0l118,137l-100,0M41,-126l-5,-74C61,-205 73,-207 92,-207C149,-207 189,-188 221,-145C246,-113 258,-88 291,5l174,484l-90,0l-115,-332C249,125 248,122 246,116C243,105 242,97 239,79C238,100 229,135 213,180l-109,309l-98,0l188,-509C184,-54 167,-86 149,-108C134,-125 111,-135 84,-135C68,-135 59,-133 41,-126z" id="glyph1392"/>
-<glyph unicode="ÿ" horiz-adv-x="471" d="M288,587l87,0l0,97l-87,0M107,587l87,0l0,97l-87,0M41,-126l-5,-74C61,-205 73,-207 92,-207C149,-207 189,-188 221,-145C246,-113 258,-88 291,5l174,484l-90,0l-115,-332C249,125 248,122 246,116C243,105 242,97 239,79C238,100 229,135 213,180l-109,309l-98,0l188,-509C184,-54 167,-86 149,-108C134,-125 111,-135 84,-135C68,-135 59,-133 41,-126z" id="glyph1394"/>
-<glyph unicode="¥" horiz-adv-x="537" d="M224,0l95,0l0,246l173,0l0,53l-164,0l45,81l129,0l0,53l-99,0l130,234l-114,0l-128,-253C282,395 277,382 272,367C267,384 263,393 251,416l-128,251l-118,0l132,-234l-101,0l0,-53l131,0l46,-81l-167,0l0,-53l178,0z" id="glyph1396"/>
-<glyph unicode="z" horiz-adv-x="475" d="M36,0l397,0l0,71l-222,0C158,71 150,70 135,66C141,73 145,78 147,81C164,99 169,105 186,125l236,288l0,76l-375,0l0,-71l205,0C274,418 307,419 322,420l-9,-9C290,388 288,383 267,358l-231,-284z" id="glyph1398"/>
-<glyph unicode="ž" horiz-adv-x="475" d="M203,571l89,0l103,137l-76,0l-71,-92l-72,92l-76,0M36,0l397,0l0,71l-222,0C158,71 150,70 135,66C141,73 145,78 147,81C164,99 169,105 186,125l236,288l0,76l-375,0l0,-71l205,0C274,418 307,419 322,420l-9,-9C290,388 288,383 267,358l-231,-284z" id="glyph1400"/>
-<glyph unicode="0" horiz-adv-x="537" d="M77,119C111,36 182,-13 268,-13C350,-13 423,33 456,107C483,166 495,232 495,327C495,428 483,501 455,561C422,632 350,678 272,678C182,678 113,633 77,551C53,495 42,430 42,337C42,245 53,177 77,119M179,122C154,167 139,247 139,334C139,392 145,445 157,491C176,563 215,600 272,600C351,600 398,501 398,333C398,157 354,65 269,65C230,65 201,84 179,122z" id="glyph1402"/>
-<glyph unicode="" horiz-adv-x="355" d="M177,-7C266,-7 314,65 314,198C314,256 307,300 291,335C271,379 227,408 180,408C88,408 41,338 41,203C41,67 89,-7 177,-7M178,56C137,56 114,109 114,202C114,295 137,345 179,345C218,345 241,292 241,201C241,107 219,56 178,56z" id="glyph1404"/>
-<glyph unicode="₀" horiz-adv-x="248" d="M123,-5C189,-5 225,44 225,135C225,229 190,279 125,279C57,279 22,231 22,139C22,46 58,-5 123,-5M124,34C91,34 72,72 72,137C72,204 90,240 125,240C156,240 175,202 175,137C175,70 157,34 124,34z" id="glyph1406"/>
-<glyph unicode="" horiz-adv-x="355" d="M177,258C266,258 314,330 314,463C314,522 307,566 291,601C271,645 227,674 180,674C88,674 41,604 41,468C41,332 89,258 177,258M178,321C137,321 114,374 114,468C114,560 137,611 179,611C218,611 241,558 241,467C241,372 219,321 178,321z" id="glyph1408"/>
-<glyph unicode="" horiz-adv-x="537" d="M53,6l44,-32l37,62C170,4 216,-13 268,-13C350,-13 423,33 456,107C483,166 495,232 495,327C495,428 483,501 455,561l-14,25l51,81l-45,29l-43,-68C368,659 321,678 272,678C182,678 113,633 77,551C53,495 42,430 42,337C42,245 53,177 77,119C83,104 90,91 98,78M157,177C145,220 139,275 139,334C139,392 145,445 157,491C176,563 215,600 272,600C306,600 335,581 356,546M182,116l199,369C392,444 398,393 398,333C398,157 354,65 269,65C232,65 204,82 182,116z" id="glyph1410"/>
-<glyph unicode="⁰" horiz-adv-x="248" d="M123,395C189,395 225,444 225,535C225,630 190,680 125,680C57,680 22,632 22,539C22,446 58,395 123,395M124,434C91,434 72,472 72,538C72,605 90,641 125,641C156,641 175,603 175,538C175,470 157,434 124,434z" id="glyph1412"/>
-</font>
-
- <pattern y="792" width="69" height="69" patternUnits="userSpaceOnUse" id="Polka_Dot_Pattern" viewBox="2.125 -70.896 69 69" overflow="visible">
- <g id="g1415">
- <polygon fill="none" points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 " id="polygon1417"/>
- <polygon fill="#F7BC60" points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 " id="polygon1419"/>
- <g id="g1421">
- <path fill="#FFFFFF" d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1423"/>
- <path fill="#FFFFFF" d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1425"/>
- <path fill="#FFFFFF" d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1427"/>
- <path fill="#FFFFFF" d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1429"/>
- <path fill="#FFFFFF" d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1431"/>
- <path fill="#FFFFFF" d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1433"/>
- <path fill="#FFFFFF" d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1435"/>
- <path fill="#FFFFFF" d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1437"/>
- <path fill="#FFFFFF" d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1439"/>
- </g>
- <g id="g1441">
- <path fill="#FFFFFF" d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1443"/>
- </g>
- <path fill="#FFFFFF" d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1445"/>
- <g id="g1447">
- <g id="g1449">
- <path fill="#FFFFFF" d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1451"/>
- <path fill="#FFFFFF" d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1453"/>
- <path fill="#FFFFFF" d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1455"/>
- <path fill="#FFFFFF" d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1457"/>
- <path fill="#FFFFFF" d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1459"/>
- <path fill="#FFFFFF" d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1461"/>
- <path fill="#FFFFFF" d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1463"/>
- <path fill="#FFFFFF" d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1465"/>
- <path fill="#FFFFFF" d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1467"/>
- <path fill="#FFFFFF" d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1469"/>
- </g>
- <g id="g1471">
- <path fill="#FFFFFF" d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1473"/>
- <path fill="#FFFFFF" d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1475"/>
- <path fill="#FFFFFF" d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1477"/>
- <path fill="#FFFFFF" d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1479"/>
- <path fill="#FFFFFF" d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1481"/>
- <path fill="#FFFFFF" d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1483"/>
- <path fill="#FFFFFF" d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1485"/>
- <path fill="#FFFFFF" d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1487"/>
- <path fill="#FFFFFF" d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1489"/>
- <path fill="#FFFFFF" d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1491"/>
- </g>
- <g id="g1493">
- <path fill="#FFFFFF" d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1495"/>
- <path fill="#FFFFFF" d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1497"/>
- <path fill="#FFFFFF" d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1499"/>
- <path fill="#FFFFFF" d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1501"/>
- <path fill="#FFFFFF" d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1503"/>
- <path fill="#FFFFFF" d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1505"/>
- <path fill="#FFFFFF" d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1507"/>
- <path fill="#FFFFFF" d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1509"/>
- <path fill="#FFFFFF" d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1511"/>
- <path fill="#FFFFFF" d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1513"/>
- </g>
- <g id="g1515">
- <path fill="#FFFFFF" d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1517"/>
- <path fill="#FFFFFF" d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1519"/>
- <path fill="#FFFFFF" d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025" id="path1521"/>
- <path fill="#FFFFFF" d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005
Follow ups
