organicmaps/travelguide
Archived
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

[licenses] Fixed wording and formatting

Browse source
This commit is contained in:
Alexander Zolotarev 2013-12-12 20:41:56 +03:00
parent 75cde9e2b1
commit 52c3bb991e
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
android/assets/license.html
View file

@ -46,18 +46,28 @@ div {
which allows locating travel guide's places on the offline maps.</div>
<div class="tab">
If you have any ideas how we can improve the app, or you need additional information, don't
hesitate to contact us at <a href="mailto:support@guidewithme.com">support@guidewithme.com</a>.
hesitate to contact us at <a href="mailto:android@guidewithme.com">android@guidewithme.com</a>.
</div>
<div class="tab">
Please like our <a href="https://www.facebook.com/pages/GuideWithMe/402561703181164">Facebook
Please follow us on <a href="http://twitter.com/GuideWithMe">Twitter</a> and like our <a href="http://www.facebook.com/GuideWithMe">Facebook
page</a>, where we gather our friends to share travel news and tips.
</div>
<strong>Thanks for using UK GuideWithMe!</strong>
<strong>Thanks for being with us!</strong>
</p>
<hr />
<p>GuideWithMe would not be possible without the generous contributions of the following
projects:
<p>
<div class="lic_head">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"> <img
alt="Creative Commons License" style="border-width: 0"
src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"
/></a><br />Wikivoyage data is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-sa/3.0/"
>Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.
</div>
</p>
<p>
<div class="lic_head">
<a href="http://www.boost.org">Boost</a> <br /> Boost License <br /> Boost Software License
Version 1.0 August 17th, 2003
@ -138,31 +148,21 @@ div {
GmbH <br /> All rights reserved.
</div>
<div class="license">Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: * Redistributions
of source code must retain the above copyright notice, this list of conditions and the
following disclaimer. * Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the documentation and/or other
materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions
and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions
and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div>
</p>
<p>
<div class="lic_head">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"> <img
alt="Creative Commons License" style="border-width: 0"
src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"
/></a><br />Wikivoyage data is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-sa/3.0/"
>Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.
</div>
</p>
</p>
</p>
</div>
</body>

6
iOS/offlineguides/Settings.bundle/Root.plist
View file

@ -16,9 +16,9 @@ We designed the app aiming to provide you interesting and useful travel informat
Besides country information we also built in MapsWithMe offline maps API which allows locating travel guide&apos;s places on the offline maps.
If you have any ideas how we can improve the app, or you need additional information, don’t hesitate to contact us at support@guidewithme.com. Please like our Facebook page, where we gather our friends to share travel news and tips.
If you have any ideas how we can improve the app, or you need additional information, don’t hesitate to contact us at ios@guidewithme.com. Please follow us on Twitter @GuideWithMe and like our Facebook page http://www.facebook.com/GuideWithMe, where we gather our friends to share travel news and tips.
Thanks for using UK GuideWithMe!
Thanks for being with us!
=============
@ -27,7 +27,7 @@ GuideWithMe would not be possible without the generous contributions of the foll
Wikivoyage Data - http://www.wikivoyage.org/
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License (http://creativecommons.org/licenses/by-sa/3.0/)
This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License http://creativecommons.org/licenses/by-sa/3.0/
Boost - http://www.boost.org/