From: Daniel Veillard Date: Wed, 29 Mar 2006 14:35:52 +0000 (+0000) Subject: * doc/*: rebuilt X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=85c23ead9e8ee7354f616102462a3283ef91f90d;p=libvirt.git * doc/*: rebuilt Daniel --- diff --git a/ChangeLog b/ChangeLog index 4df5372fa0..9bdaabefb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Mar 29 16:36:24 CEST 2006 Daniel Veillard + + * doc/*: rebuilt + Wed Mar 29 13:34:25 EST 2006 Daniel Veillard * python/libvir.c: fixed a bug in the new wrapper diff --git a/docs/APIchunk0.html b/docs/APIchunk0.html index cd660cc403..2b79cfcf91 100644 --- a/docs/APIchunk0.html +++ b/docs/APIchunk0.html @@ -4,10 +4,13 @@ d-m n-s t-z -

Letter A:

ABI
_virDomainInfo
-
APIs
virConnectOpenReadOnly
+

Letter A:

APIs
virConnectOpenReadOnly
After
virDomainSave
-

Letter C:

CPU
virDomainSuspend
+

Letter C:

CPU
_virDomainInfo
+_virNodeInfo
+virDomainSuspend
+
CPUs
_virDomainInfo
+_virNodeInfo
Collect
virConnectListDomains
Copy
virConnCopyLastError
virCopyLastError
@@ -17,6 +20,7 @@ virDomainSetMaxMemory
Dynamically
virDomainSetMaxMemory

Letter E:

Extract
virDomainGetInfo
+virNodeGetInfo

Letter F:

Free
virDomainFree

Letter G:

Get
virConnectGetType
virConnectGetVersion
@@ -29,7 +33,6 @@ virConnectGetVersion
virConnectOpen

Letter I:

IDs
virConnectListDomains
-
Informations
_virDomainInfo
Initialize
virInitialize

Letter K:

KBytes
_virDomainInfo

Letter L:

Launch
virDomainCreateLinux
@@ -52,6 +55,7 @@ virGetLastError
virGetVersion
virSetErrorFunc
+
NUMA
_virNodeInfo
Note
virDomainGetInfo
virDomainShutdown

Letter O:

OUT
virConnectGetVersion
@@ -76,8 +80,7 @@
Simpler
virConnGetLastError
virGetLastError
Suspends
virDomainSuspend
-

Letter T:

TODO:
_virDomainInfo
-virDomainShutdown
+

Letter T:

TODO:
virDomainShutdown
This
virConnectClose
virConnectGetVersion
virConnectOpen
@@ -102,7 +105,8 @@ virDomainGetXMLDesc
Xen
virGetVersion

Letter a:

about
virDomainGetInfo
-
access
_virDomainInfo
+virNodeGetInfo
+
access
_virNodeInfo
virConnectGetVersion
virDomainCreateLinux
virDomainDestroy
@@ -111,11 +115,11 @@ virDomainSuspend
accesses
virConnGetLastError
virGetLastError
-
active
virConnectListDomains
+
active
_virNodeInfo
+virConnectListDomains
virConnectNumOfDomains
virDomainSuspend
-
add
_virDomainInfo
-virDomainShutdown
+
add
virDomainShutdown
after
virDomainSave
virDomainShutdown
against
virGetVersion
@@ -125,6 +129,7 @@ virDomainGetMaxMemory
virDomainSetMaxMemory
virDomainSuspend
+virNodeGetInfo
allowed
_virDomainInfo
already
virDomainDestroy
amount
virDomainGetMaxMemory
@@ -134,8 +139,7 @@ virDomainGetMaxMemory
virDomainSetMaxMemory
applications
virInitialize
-
are
_virDomainInfo
-virConnectClose
+
are
virConnectClose
virConnectOpenReadOnly
virDomainDestroy
virSetErrorFunc
@@ -144,8 +148,7 @@
array
virConnectListDomains
virDomainGetUUID
assumed
virGetVersion
-
available
_virDomainInfo
-_virError
+
available
_virError
virConnectOpenReadOnly
availble
virGetVersion
avoid
virInitialize
@@ -159,7 +162,6 @@
being
virDomainShutdown
virErrorFunc
virResetError
-
below
_virDomainInfo
better
virInitialize
block
_virDomainKernel
but
virConnGetLastError
@@ -167,8 +169,7 @@ virDomainSuspend
virGetLastError
bytes
virDomainGetUUID
-

Letter c:

call
_virDomainInfo
-virConnectGetVersion
+

Letter c:

call
virConnectGetVersion
virDomainDestroy
virDomainSave
virInitialize
@@ -183,8 +184,7 @@
caller
virDomainGetOSType
virDomainGetXMLDesc
calling
virDomainResume
-
can
_virDomainInfo
-virConnectGetVersion
+
can
virConnectGetVersion
virDomainGetInfo
capacities
virConnectGetVersion
caught
virConnCopyLastError
@@ -194,10 +194,9 @@ virGetLastError
virResetLastError
virSetErrorFunc
+
cell
_virNodeInfo
change
virDomainSetMaxMemory
-
check
_virDomainInfo
clean
virResetError
-
clients
_virDomainInfo
closes
virConnectClose
code
_virError
virConnCopyLastError
@@ -206,8 +205,7 @@
collect
virConnectListDomains
command
_virDomainKernel
compiled
virGetVersion
-
connection
_virDomainInfo
-_virError
+
connection
_virError
virConnCopyLastError
virConnGetLastError
virConnResetLastError
@@ -225,6 +223,7 @@ virDomainLookupByName
virDomainLookupByUUID
virDomainRestore
+virNodeGetInfo
virSetErrorFunc
consequent
_virError
content
virConnCopyLastError
@@ -233,6 +232,7 @@
control
virConnectOpenReadOnly
copy
virConnCopyLastError
virCopyLastError
+
core
_virNodeInfo
could
virSetErrorFunc
currently
virConnectOpen
virConnectOpenReadOnly
@@ -240,4 +240,4 @@ d-m n-s t-z -

+

diff --git a/docs/APIchunk1.html b/docs/APIchunk1.html index bae1da0356..8db336fee2 100644 --- a/docs/APIchunk1.html +++ b/docs/APIchunk1.html @@ -25,9 +25,9 @@
down
virDomainDestroy

Letter e:

encoded
virDomainGetXMLDesc
especially
virConnectClose
+
expected
_virNodeInfo
extra
_virError
-
extracted
_virDomainInfo
-virConnectGetVersion
+
extracted
virConnectGetVersion
virDomainGetInfo
extraction
virDomainGetXMLDesc

Letter f:

failure
virDomainCreateLinux
@@ -44,6 +44,7 @@ virDomainShutdown
virDomainSuspend
virGetVersion
+virNodeGetInfo
file
virDomainSave
filename
_virDomainKernel
find
virDomainLookupByID
@@ -51,6 +52,7 @@ virConnectOpenReadOnly
flags
virDomainGetXMLDesc
for
_virDomainInfo
+_virNodeInfo
virConnGetLastError
virConnectGetVersion
virDomainGetID
@@ -75,11 +77,10 @@
freed
virDomainDestroy
virDomainFree
virDomainGetOSType
-
from
_virDomainInfo
-virDomainResume
+
frequency
_virNodeInfo
+
from
virDomainResume
frozen
virDomainResume
virDomainSuspend
-
full
_virDomainInfo
function
virConnSetErrorFunc
virConnectClose
virConnectOpen
@@ -112,14 +113,17 @@ virSetErrorFunc
handling
virConnSetErrorFunc
virSetErrorFunc
+
hardware
virNodeGetInfo
have
virGetVersion
how
_virError
human-readable
_virError

Letter i:

ignore
virDomainShutdown
image
_virDomainKernel
+
indicating
_virNodeInfo
information
_virError
virDomainGetInfo
virGetVersion
+virNodeGetInfo
informations
virDomainGetInfo
informative
_virError
init
_virDomainKernel
@@ -164,12 +168,10 @@ virResetLastError
virSetErrorFunc
lifetime
virDomainGetName
-
limited
_virDomainInfo
-virDomainGetInfo
+
limited
virDomainGetInfo
line
_virDomainKernel
list
virConnectListDomains
listed
virDomainSave
-
long
_virDomainInfo
lookup
virDomainLookupByName
virDomainLookupByUUID

Letter m:

major
virConnectGetVersion
@@ -187,7 +189,10 @@ virDomainShutdown
virDomainSuspend
virGetLastError
+
megabytes
_virNodeInfo
+
mem
_virNodeInfo
memory
_virDomainInfo
+_virNodeInfo
virDomainGetMaxMemory
virDomainSave
virDomainSetMaxMemory
@@ -200,6 +205,7 @@
minor
LIBVIR_VERSION_NUMBER
virConnectGetVersion
virGetVersion
+
model
_virNodeInfo
monitoring
virConnectClose
multithreaded
virConnGetLastError
virGetLastError
@@ -210,4 +216,4 @@ d-m n-s t-z -

+

diff --git a/docs/APIchunk2.html b/docs/APIchunk2.html index f231f4a23f..1973107b1f 100644 --- a/docs/APIchunk2.html +++ b/docs/APIchunk2.html @@ -7,6 +7,7 @@

Letter n:

name
virConnectGetType
virDomainGetName
virDomainLookupByName
+
nanoseconds
_virDomainInfo
need
virConnCopyLastError
virConnectClose
virCopyLastError
@@ -17,6 +18,8 @@ virDomainLookupByID
virDomainLookupByName
virDomainLookupByUUID
+
node
_virNodeInfo
+virNodeGetInfo
none
virConnGetLastError
virGetLastError
not
virConnGetLastError
@@ -30,7 +33,9 @@ virDomainShutdown
virGetLastError
virGetVersion
-
number
_virError
+
number
_virDomainInfo
+_virError
+_virNodeInfo
virConnectListDomains
virConnectNumOfDomains
virDomainGetID
@@ -57,8 +62,7 @@ virGetLastError
one
_virDomainInfo
virDomainCreateLinux
-
only
_virDomainInfo
-virConnectGetVersion
+
only
virConnectGetVersion
virDomainGetInfo
operation
virDomainGetOSType
option
virDomainShutdown
@@ -72,8 +76,7 @@ virCopyLastError
virGetVersion
output
virDomainSave
-

Letter p:

padding
_virDomainInfo
-
parameter
virConnCopyLastError
+

Letter p:

parameter
virConnCopyLastError
virCopyLastError
parameters
_virDomainKernel
part
_virError
@@ -83,6 +86,7 @@ virConnectOpenReadOnly
path
virDomainRestore
virDomainSave
+
per
_virNodeInfo
physical
virDomainGetMaxMemory
virDomainSetMaxMemory
pointed
virResetError
@@ -107,12 +111,12 @@ virDomainLookupByUUID
virDomainRestore
virGetLastError
+virNodeGetInfo
virResetError
virSetErrorFunc
pointing
_virDomainKernel
potential
virInitialize
printing
virSetErrorFunc
-
private
_virDomainInfo
priviledged
virConnectGetVersion
virDomainCreateLinux
virDomainDestroy
@@ -122,13 +126,11 @@
problem
virDomainSave
process
virDomainResume
virDomainSuspend
-
protection
_virDomainInfo
provided
virConnSetErrorFunc
virErrorFunc
virSetErrorFunc
providing
LIBVIR_VERSION_NUMBER
public
virDomainGetName
-
publicly
_virDomainInfo

Letter r:

race
virInitialize
raised
_virError
virErrorFunc
@@ -195,9 +197,11 @@ virDomainShutdown
shutdown
virDomainDestroy
similar
virDomainCreateLinux
-
size
virConnectListDomains
+
size
_virNodeInfo
+virConnectListDomains
virDomainGetMaxMemory
virDomainSetMaxMemory
+
socket
_virNodeInfo
software
virConnectGetType
startup
virInitialize
state
_virDomainInfo
@@ -211,14 +215,15 @@
store
virConnectListDomains
virConnectOpen
string
_virError
+_virNodeInfo
virConnectGetType
virDomainGetName
virDomainGetOSType
virDomainLookupByUUID
-
structure
_virDomainInfo
-virDomainDestroy
+
structure
virDomainDestroy
virDomainFree
virDomainGetInfo
+virNodeGetInfo
success
virConnectClose
virDomainDestroy
virDomainFree
@@ -231,6 +236,7 @@ virDomainShutdown
virDomainSuspend
virInitialize
+virNodeGetInfo
successful
virDomainSave
suitable
virConnGetLastError
virGetLastError
@@ -241,4 +247,4 @@ d-m n-s t-z -

+

diff --git a/docs/APIconstructors.html b/docs/APIconstructors.html index 24d1a249b7..7d01c59f76 100644 --- a/docs/APIconstructors.html +++ b/docs/APIconstructors.html @@ -10,4 +10,4 @@ virDomainLookupByUUID

Type virErrorPtr:

virConnGetLastError
virGetLastError
-

+

diff --git a/docs/APIfiles.html b/docs/APIfiles.html index e2af14b9d4..ce70802c0c 100644 --- a/docs/APIfiles.html +++ b/docs/APIfiles.html @@ -19,6 +19,7 @@ VIR_DOMAIN_SHUTOFF
_virDomainInfo
_virDomainKernel
+_virNodeInfo
virConnect
virConnectClose
virConnectGetType
@@ -59,7 +60,11 @@ virDomainSuspend
virGetVersion
virInitialize
-

Module virterror:

VIR_ERR_DRIVER_FULL
+virNodeGetInfo
+virNodeInfo
+virNodeInfoPtr
+

Module virterror:

VIR_ERR_CALL_FAILED
+VIR_ERR_DRIVER_FULL
VIR_ERR_ERROR
VIR_ERR_GET_FAILED
VIR_ERR_HTTP_ERROR
@@ -112,4 +117,4 @@ virResetError
virResetLastError
virSetErrorFunc
-

+

diff --git a/docs/APIfunctions.html b/docs/APIfunctions.html index 05d107b4fa..4f6834dd3f 100644 --- a/docs/APIfunctions.html +++ b/docs/APIfunctions.html @@ -21,6 +21,7 @@ virDomainLookupByName
virDomainLookupByUUID
virDomainRestore
+virNodeGetInfo

Type virDomainInfoPtr:

virDomainGetInfo

Type virDomainPtr:

virDomainDestroy
virDomainFree
@@ -43,7 +44,8 @@ virDefaultErrorFunc
virErrorFunc
virResetError
+

Type virNodeInfoPtr:

virNodeGetInfo

Type void *:

virConnSetErrorFunc
virErrorFunc
virSetErrorFunc
-

+

diff --git a/docs/APIsymbols.html b/docs/APIsymbols.html index 8d6ba646aa..7c7e8f7bb4 100644 --- a/docs/APIsymbols.html +++ b/docs/APIsymbols.html @@ -17,6 +17,7 @@ VIR_DOMAIN_RUNNING
VIR_DOMAIN_SHUTDOWN
VIR_DOMAIN_SHUTOFF
+VIR_ERR_CALL_FAILED
VIR_ERR_DRIVER_FULL
VIR_ERR_ERROR
VIR_ERR_GET_FAILED
@@ -56,6 +57,7 @@

Letter _:

_virDomainInfo
_virDomainKernel
_virError
+_virNodeInfo

Letter v:

virConnCopyLastError
virConnGetLastError
virConnResetLastError
@@ -109,7 +111,10 @@ virGetLastError
virGetVersion
virInitialize
+virNodeGetInfo
+virNodeInfo
+virNodeInfoPtr
virResetError
virResetLastError
virSetErrorFunc
-

+

diff --git a/docs/html/book1.html b/docs/html/book1.html index 276b5a2344..8514edf561 100644 --- a/docs/html/book1.html +++ b/docs/html/book1.html @@ -1,3 +1,3 @@ -Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

+Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

diff --git a/docs/html/index.html b/docs/html/index.html index 276b5a2344..8514edf561 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -1,3 +1,3 @@ -Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

+Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

diff --git a/docs/html/libvirt-lib.html b/docs/html/libvirt-lib.html index 276b5a2344..8514edf561 100644 --- a/docs/html/libvirt-lib.html +++ b/docs/html/libvirt-lib.html @@ -1,3 +1,3 @@ -Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

+Reference Manual for libvirt

Reference Manual for libvirt

Table of Contents

  • libvirt: core interfaces for the libvirt library
  • virterror: error handling interfaces for the libvirt library

diff --git a/docs/html/libvirt-libvirt.html b/docs/html/libvirt-libvirt.html index d260f3675f..f2a2977a5b 100644 --- a/docs/html/libvirt-libvirt.html +++ b/docs/html/libvirt-libvirt.html @@ -14,6 +14,8 @@ The content of this structure is not made public by the API.
Typedef virDomain * virDomainPtr
 
Enum virDomainRestart
 
Enum virDomainState
+
Structure virNodeInfo
struct _virNodeInfo +
Typedef virNodeInfo * virNodeInfoPtr
 
int	virConnectClose			(virConnectPtr conn)
const char *	virConnectGetType	(virConnectPtr conn)
int	virConnectGetVersion		(virConnectPtr conn, 
unsigned long * hvVer)
@@ -42,6 +44,7 @@ The content of this structure is not made public by the API.
int	virDomainSuspend		(virDomainPtr domain)
int	virGetVersion			(unsigned long * libVer, 
const char * type,
unsigned long * typeVer)
int	virInitialize			(void)
+
int	virNodeGetInfo			(virConnectPtr conn, 
virNodeInfoPtr info)

Description

Macro: LIBVIR_VERSION_NUMBER

#define LIBVIR_VERSION_NUMBER

Macro providing the version of the library as version * 1,000,000 + minor * 1000 + micro

Structure virConnect

Structure virConnect
struct _virConnect { @@ -63,8 +66,8 @@ The content of this structure is not made public by the API. unsigned char state : the running state, one of virDomainFlag unsigned long maxMem : the maximum memory in KBytes allowed unsigned long memory : the memory in KBytes used by the domain - unsigned short nrVirtCpu : * Informations below are only available - unsigned long long cpuTime : * TODO: * - check what can be extracted + unsigned short nrVirtCpu : the number of virtual CPUs for the doma + unsigned long long cpuTime : the CPU time used in nanoseconds }
a virDomainInfoPtr is a pointer to a virDomainInfo structure.

Structure virDomainKernel

Structure virDomainKernel
struct _virDomainKernel { @@ -91,7 +94,18 @@ The content of this structure is not made public by the API. VIR_DOMAIN_SHUTOFF = 5 : the domain is shut off VIR_DOMAIN_CRASHED = 6 : the domain is crashed } -

Function: virConnectClose

int	virConnectClose			(virConnectPtr conn)
+

Structure virNodeInfo

Structure virNodeInfo
struct _virNodeInfo { + charmodel[32] model : string indicating the CPU model + unsigned long memory : memory size in megabytes + unsigned int cpus : the number of active CPUs + unsigned int mhz : expected CPU frequency + unsigned int nodes : the number of NUMA cell, 1 for uniform + unsigned int sockets : number of CPU socket per node + unsigned int cores : number of core per socket + unsigned int threads : number of threads per core +}
+ a virNodeInfoPtr is a pointer to a virNodeInfo structure. +

Function: virConnectClose

int	virConnectClose			(virConnectPtr conn)

This function closes the connection to the Hypervisor. This should not be called if further interaction with the Hypervisor are needed especially if there is running domain which need further monitoring by the application.

conn:pointer to the hypervisor connection
Returns:0 in case of success or -1 in case of error.

Function: virConnectGetType

const char *	virConnectGetType	(virConnectPtr conn)

Get the name of the Hypervisor software used.

@@ -147,4 +161,6 @@ The content of this structure is not made public by the API.

Provides two information back, @libVer is the version of the library while @typeVer will be the version of the hypervisor type @type against which the library was compiled. If @type is NULL, "Xen" is assumed, if @type is unknown or not availble, an error code will be returned and @typeVer will be 0.

libVer:return value for the library version (OUT)
type:hypervisor type
typeVer:return value for the version of the hypervisor (OUT)
Returns:-1 in case of failure, 0 otherwise, and values for @libVer and @typeVer have the format major * 1,000,000 + minor * 1,000 + release.

Function: virInitialize

int	virInitialize			(void)

Initialize the library. It's better to call this routine at startup in multithreaded applications to avoid potential race when initializing the library.

-
Returns:0 in case of success, -1 in case of error

+
Returns:0 in case of success, -1 in case of error

Function: virNodeGetInfo

int	virNodeGetInfo			(virConnectPtr conn, 
virNodeInfoPtr info)
+

Extract hardware information about the node.

+
conn:pointer to the hypervisor connection
info:pointer to a virNodeInfo structure allocated by the user
Returns:0 in case of success and -1 in case of failure.

diff --git a/docs/html/libvirt-virterror.html b/docs/html/libvirt-virterror.html index f039897366..95b0d877fd 100644 --- a/docs/html/libvirt-virterror.html +++ b/docs/html/libvirt-virterror.html @@ -72,6 +72,7 @@ void virErrorFunc (void * userData,
VIR_ERR_NO_DEVICE = 23 : missing domain devices information VIR_ERR_NO_XENSTORE = 24 : could not open Xen Store control VIR_ERR_DRIVER_FULL = 25 : too many drivers registered + VIR_ERR_CALL_FAILED = 26 : not supported by the drivers }

Function: virConnCopyLastError

int	virConnCopyLastError		(virConnectPtr conn, 
virErrorPtr to)

Copy the content of the last error caught on that connection One will need to free the result with virResetError()

@@ -96,4 +97,4 @@ void virErrorFunc (void * userData,
Function: virSetErrorFunc
void	virSetErrorFunc			(void * userData, 
virErrorFunc handler)

Set a library global error handling function, if @handler is NULL, it will reset to default printing on stderr. The error raised there are those for which no handler at the connection level could caught.

-
userData:pointer to the user data provided in the handler callback
handler:the function to get called in case of error or NULL

+
userData:pointer to the user data provided in the handler callback
handler:the function to get called in case of error or NULL

diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 98046f026b..15186f30e7 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -22,10 +22,12 @@ + + @@ -36,6 +38,7 @@ + @@ -47,6 +50,7 @@ + @@ -69,6 +73,7 @@ error handling interfaces for the libvirt library Provides the interfaces of the libvirt library to handle errors raised while using the library. Daniel Veillard <veillard@redhat.com> + @@ -144,7 +149,8 @@ - + + @@ -191,14 +197,8 @@ - - + + a virDomainInfoPtr is a pointer to a virDomainInfo structure. @@ -234,6 +234,19 @@ + + + + + + + + + + + + a virNodeInfoPtr is a pointer to a virNodeInfo structure. + Copy the content of the last error caught on that connection One will need to free the result with virResetError() @@ -432,6 +445,12 @@ Initialize the library. It's better to call this routine at startup in multithreaded applications to avoid potential race when initializing the library. + + Extract hardware information about the node. + + + + Reset the error being pointed to diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index 32762087ab..61f80078ac 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -18,6 +18,7 @@ + @@ -57,6 +58,7 @@ + @@ -110,6 +112,9 @@ + + + @@ -135,6 +140,7 @@ + @@ -176,6 +182,7 @@ + @@ -231,6 +238,9 @@ + + + @@ -293,6 +303,7 @@ + @@ -324,6 +335,9 @@ + + + @@ -351,6 +365,7 @@ + @@ -391,8 +406,12 @@ + + + + @@ -451,9 +470,6 @@ - - - @@ -463,8 +479,14 @@ + + + + + + @@ -491,6 +513,7 @@ + @@ -520,9 +543,6 @@ - - - @@ -565,6 +585,9 @@ + + + @@ -628,7 +651,6 @@ - @@ -680,9 +702,10 @@ + - + @@ -695,12 +718,12 @@ + - @@ -721,6 +744,7 @@ + @@ -744,7 +768,6 @@ - @@ -762,7 +785,6 @@ - @@ -790,9 +812,6 @@ - - - @@ -811,7 +830,6 @@ - @@ -837,7 +855,6 @@ - @@ -853,18 +870,15 @@ + + + - - - - - - @@ -884,7 +898,6 @@ - @@ -903,6 +916,7 @@ + @@ -922,6 +936,9 @@ + + + @@ -980,11 +997,13 @@ + + + - @@ -1008,6 +1027,7 @@ + @@ -1027,6 +1047,7 @@ + @@ -1060,17 +1081,16 @@ + + + - - - - @@ -1127,6 +1147,9 @@ + + + @@ -1144,10 +1167,14 @@ + + + + @@ -1236,7 +1263,6 @@ - @@ -1248,9 +1274,6 @@ - - - @@ -1278,8 +1301,15 @@ + + + + + + + @@ -1303,6 +1333,9 @@ + + + @@ -1324,6 +1357,9 @@ + + + @@ -1340,6 +1376,10 @@ + + + + @@ -1358,7 +1398,9 @@ + + @@ -1395,7 +1437,6 @@ - @@ -1423,9 +1464,6 @@ - - - @@ -1448,6 +1486,9 @@ + + + @@ -1477,6 +1518,7 @@ + @@ -1489,9 +1531,6 @@ - - - @@ -1507,9 +1546,6 @@ - - - @@ -1521,9 +1557,6 @@ - - - @@ -1663,10 +1696,14 @@ + + + + @@ -1699,16 +1736,17 @@ + - + @@ -1723,6 +1761,7 @@ + @@ -1748,9 +1787,6 @@ - - - @@ -1782,7 +1818,6 @@ - @@ -1792,6 +1827,12 @@ + + + + + + @@ -1801,6 +1842,9 @@ + + + @@ -1833,6 +1877,7 @@ + @@ -1884,6 +1929,9 @@ + + + @@ -1891,6 +1939,9 @@ + + + @@ -1899,9 +1950,6 @@ - - - @@ -1934,7 +1982,6 @@ - @@ -1952,9 +1999,6 @@ - - -