[Geoserver-devel] Request to write tutorial

Hi

For those that have seen some of my posts on the GeoServer User list
will know that over the last few months I have been writing some
documentation for INSPIRE data publishers who want to use GeoServer to
setup a compliant WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-H
ow-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf
version that could be added

Best regards

Tim

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development
Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225

www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com
<mailto:Tim.Martin@anonymised.com>

This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk

Hey Tim:

Any chance you could add that as a tutorial to our existing documentation? It is formatted in RST and we could set you up with commit access etc.

Jody

On Tue, Jul 19, 2011 at 2:50 AM, Tim Martin <Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list will know that over the last few months I have been writing some documentation for INSPIRE data publishers who want to use GeoServer to setup a compliant WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-How-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf version that could be added

Best regards

Tim

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225

www.ordnancesurvey.co.uk | Tim.Martin@ordnancesurvey.co.uk

This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
[http://www.ordnancesurvey.co.uk](http://www.ordnancesurvey.co.uk)


AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on “Lean Startup
Secrets Revealed.” This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev


Geoserver-devel mailing list
Geoserver-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

Hi Jody

Yes seems mike Pumphrey has put in a place holder last night and I have
just SVN the documentation.

Will try to look at the sphinx syntax stuff this afternoon and write it
up ASAP

Thanks for your response

T

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development
Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225

www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com
<mailto:Tim.Martin@anonymised.com>

________________________________

From: Jody Garnett [mailto:jody.garnett@anonymised.com]
Sent: 19 July 2011 01:42
To: Tim Martin
Cc: geoserver-devel@lists.sourceforge.net
Subject: Re: [Geoserver-devel] Request to write tutorial

Hey Tim:

Any chance you could add that as a tutorial to our existing
documentation? It is formatted in RST and we could set you up with
commit access etc.

Jody

On Tue, Jul 19, 2011 at 2:50 AM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list
will know that over the last few months I have been writing some
documentation for INSPIRE data publishers who want to use GeoServer to
setup a compliant WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-H
ow-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf
version that could be added

Best regards

Tim

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development
Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225 <tel:%2B44%20%280%29%C2%A07917%20550%20225>

www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com

This email is only intended for the person to whom it is addressed and
may contain confidential information. If you have received this email in
error, please notify the sender and delete this email which must not be
copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the
writer and do not represent the official view of Ordnance Survey. Nor
can any contract be formed on Ordnance Survey's behalf via email. We
reserve the right to monitor emails and attachments without prior
notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505 <tel:08456%20050505>
http://www.ordnancesurvey.co.uk

------------------------------------------------------------------------
------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk

On Mon, Jul 18, 2011 at 6:50 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list will
know that over the last few months I have been writing some documentation
for INSPIRE data publishers who want to use GeoServer to setup a compliant
WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-How-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf version
that could be added

Hi Tim,
the official GeoServer documentation is stored in svn and written in
RestructuredText, which
is then turned into HTML and PDF using Sphinx and Latex (for the PDF version).
Writing the docs this way is a bit harder to get started with, but has
the significant advantage
that various people can work on the docs at the same time, docs are
versioned along with
GeoServer and does not force anybody to own a MS Office license (a non
trivial detail
given that almost all developers work on platforms other than Windows).

As far as I can see Mike already linked your tutorials from the
GeoServer one here:
http://docs.geoserver.org/stable/en/user/community/inspire/using.html#more-information

If you are interested to merge your tutorial into the official
documentation I guess
you can get started with RestructuredText and Sphinx by reading the GeoServer
documentation guide:
http://docs.geoserver.org/latest/en/docguide/

Cheers
Andrea

--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------

Hi Andrea

Going to get started with the sphinx docs this afternoon, have already SVN'd it down and will go through the syntax structure so hopefully get it right.

Will try and get some more written too

Thanks

Tim

Tim Martin Msc Bsc(Hons)
Web Services Consultant and INSPIRE Technical Business Development Manager
Ordnance Survey
Mobile: +44 (0) 7917 550 225
www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com
-----Original Message-----
From: andrea.aime@anonymised.com [mailto:andrea.aime@anonymised.com] On Behalf Of Andrea Aime
Sent: 19 July 2011 09:38
To: Tim Martin
Cc: geoserver-devel@lists.sourceforge.net
Subject: Re: [Geoserver-devel] Request to write tutorial

On Mon, Jul 18, 2011 at 6:50 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list will
know that over the last few months I have been writing some documentation
for INSPIRE data publishers who want to use GeoServer to setup a compliant
WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-How-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf version
that could be added

Hi Tim,
the official GeoServer documentation is stored in svn and written in
RestructuredText, which
is then turned into HTML and PDF using Sphinx and Latex (for the PDF version).
Writing the docs this way is a bit harder to get started with, but has
the significant advantage
that various people can work on the docs at the same time, docs are
versioned along with
GeoServer and does not force anybody to own a MS Office license (a non
trivial detail
given that almost all developers work on platforms other than Windows).

As far as I can see Mike already linked your tutorials from the
GeoServer one here:
http://docs.geoserver.org/stable/en/user/community/inspire/using.html#more-information

If you are interested to merge your tutorial into the official
documentation I guess
you can get started with RestructuredText and Sphinx by reading the GeoServer
documentation guide:
http://docs.geoserver.org/latest/en/docguide/

Cheers
Andrea

--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------
This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk

Also, a small practical point - you can’t have a table or screenshot that spans a page break - it comes out OK in the HTML, but is truncated in the PDF document (ie. the bottom of the table/screenshot will be missing)

On Tue, Jul 19, 2011 at 6:47 PM, Tim Martin <Tim.Martin@anonymised.com> wrote:

Hi Andrea

Going to get started with the sphinx docs this afternoon, have already SVN’d it down and will go through the syntax structure so hopefully get it right.

Will try and get some more written too

Thanks

Tim

Tim Martin Msc Bsc(Hons)
Web Services Consultant and INSPIRE Technical Business Development Manager
Ordnance Survey
Mobile: +44 (0) 7917 550 225

www.ordnancesurvey.co.uk | Tim.Martin@…141…

-----Original Message-----
From: andrea.aime@anonymised.com [mailto:andrea.aime@anonymised.com] On Behalf Of Andrea Aime
Sent: 19 July 2011 09:38
To: Tim Martin
Cc: geoserver-devel@lists.sourceforge.net
Subject: Re: [Geoserver-devel] Request to write tutorial

On Mon, Jul 18, 2011 at 6:50 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list will
know that over the last few months I have been writing some documentation
for INSPIRE data publishers who want to use GeoServer to setup a compliant
WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-How-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf version
that could be added

Hi Tim,
the official GeoServer documentation is stored in svn and written in
RestructuredText, which
is then turned into HTML and PDF using Sphinx and Latex (for the PDF version).
Writing the docs this way is a bit harder to get started with, but has
the significant advantage
that various people can work on the docs at the same time, docs are
versioned along with
GeoServer and does not force anybody to own a MS Office license (a non
trivial detail
given that almost all developers work on platforms other than Windows).

As far as I can see Mike already linked your tutorials from the
GeoServer one here:
http://docs.geoserver.org/stable/en/user/community/inspire/using.html#more-information

If you are interested to merge your tutorial into the official
documentation I guess
you can get started with RestructuredText and Sphinx by reading the GeoServer
documentation guide:
http://docs.geoserver.org/latest/en/docguide/

Cheers
Andrea

Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf


This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey’s behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk


Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/


Geoserver-devel mailing list
Geoserver-devel@anonymised.comsts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

Hi jody

Forgot to ask can you allow me commit rights?

Thanks

Tim

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development
Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225

www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com
<mailto:Tim.Martin@anonymised.com>

________________________________

From: Jody Garnett [mailto:jody.garnett@anonymised.com]
Sent: 19 July 2011 01:42
To: Tim Martin
Cc: geoserver-devel@lists.sourceforge.net
Subject: Re: [Geoserver-devel] Request to write tutorial

Hey Tim:

Any chance you could add that as a tutorial to our existing
documentation? It is formatted in RST and we could set you up with
commit access etc.

Jody

On Tue, Jul 19, 2011 at 2:50 AM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi

For those that have seen some of my posts on the GeoServer User list
will know that over the last few months I have been writing some
documentation for INSPIRE data publishers who want to use GeoServer to
setup a compliant WMS service.

After much red tape the tutorial has now been placed here

http://location.defra.gov.uk/2011/07/data-publisher-how-to-guides/

The one I would like to turn into a tutorial is

http://location.defra.gov.uk/wp-content/uploads/2011/07/Data-Publisher-H
ow-To-Guide-Setting-up-GeoServer-on-a-Windows-Machine.pdf

If you think this would be useful then I have both a .doc and .pdf
version that could be added

Best regards

Tim

Tim Martin Msc Bsc(Hons)

Web Services Consultant and INSPIRE Technical Business Development
Manager

Ordnance Survey

Mobile: +44 (0) 7917 550 225 <tel:%2B44%20%280%29%C2%A07917%20550%20225>

www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com

This email is only intended for the person to whom it is addressed and
may contain confidential information. If you have received this email in
error, please notify the sender and delete this email which must not be
copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the
writer and do not represent the official view of Ordnance Survey. Nor
can any contract be formed on Ordnance Survey's behalf via email. We
reserve the right to monitor emails and attachments without prior
notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505 <tel:08456%20050505>
http://www.ordnancesurvey.co.uk

------------------------------------------------------------------------
------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk

On Tue, Jul 19, 2011 at 12:48 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi jody

Forgot to ask can you allow me commit rights?

To get commit rights you have to subscribe here:
http://xircles.codehaus.org
and then ask to become a GeoServer developer here:
http://xircles.codehaus.org/projects/geoserver/members

There is some explanation here:
http://docs.geoserver.org/latest/en/developer/policies/comitting.html

Once you're done with the request let us know, we don't get automatically
notified of your request.

Normally we also ask that a copyright assignment be signed, but I don't
think it's necessary for documentation (not sure though).
Just in case here is the document:
http://geoserver.org/download/attachments/819262/assignment_agreement.pdf?version=1

Cheers
Andrea

--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------

Hi Andrea et al

I have joined up and applied to become a developer

I will be just doing documentation as to be honest I am no coder, just a good user!

Thanks

Tim

Tim Martin Msc Bsc(Hons)
Web Services Consultant and INSPIRE Technical Business Development Manager
Ordnance Survey
Mobile: +44 (0) 7917 550 225
www.ordnancesurvey.co.uk | Tim.Martin@anonymised.com
-----Original Message-----
From: andrea.aime@anonymised.com [mailto:andrea.aime@anonymised.com] On Behalf Of Andrea Aime
Sent: 19 July 2011 13:21
To: Tim Martin
Cc: Jody Garnett; geoserver-devel@lists.sourceforge.net
Subject: Re: [Geoserver-devel] Request to write tutorial

On Tue, Jul 19, 2011 at 12:48 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi jody

Forgot to ask can you allow me commit rights?

To get commit rights you have to subscribe here:
http://xircles.codehaus.org
and then ask to become a GeoServer developer here:
http://xircles.codehaus.org/projects/geoserver/members

There is some explanation here:
http://docs.geoserver.org/latest/en/developer/policies/comitting.html

Once you're done with the request let us know, we don't get automatically
notified of your request.

Normally we also ask that a copyright assignment be signed, but I don't
think it's necessary for documentation (not sure though).
Just in case here is the document:
http://geoserver.org/download/attachments/819262/assignment_agreement.pdf?version=1

Cheers
Andrea

--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------
This email is only intended for the person to whom it is addressed and may contain confidential information. If you have received this email in error, please notify the sender and delete this email which must not be copied, distributed or disclosed to any other person.

Unless stated otherwise, the contents of this email are personal to the writer and do not represent the official view of Ordnance Survey. Nor can any contract be formed on Ordnance Survey's behalf via email. We reserve the right to monitor emails and attachments without prior notice.

Thank you for your cooperation.

Ordnance Survey
Adanac Drive
Southampton SO16 0AS
Tel: 08456 050505
http://www.ordnancesurvey.co.uk

On Tue, Jul 19, 2011 at 7:11 PM, Tim Martin
<Tim.Martin@anonymised.com> wrote:

Hi Andrea et al

I have joined up and applied to become a developer

Just accepted you. This gives you full commit access, if you are going to commit
on areas outside of the INSPIRE tutorial it would be probably good to ask on the
ml for a review, and in general to synch up with other people working in the
same area (inspire wise that would be Mike, cc'ed).

I will be just doing documentation as to be honest I am no coder, just a good user!

A user helping answers on the user mailing list and now also writing docs?
Gimme plenty of these please! :slight_smile:

Cheers
Andrea

--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy

phone: +39 0584 962313
fax: +39 0584 962313

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------