Update readme etc

2014-09-02 00:12:20 +02:00 · 2014-09-02 00:12:20 +02:00 · 888c7572f3
--- a/24
+++ b/24
@ -1,13 +1,13 @@
-# This is the official list of OxyPlot authors for copyright purposes.
-# This file is distinct from the CONTRIBUTORS file.
-# See the latter for an explanation.
-
-# Names should be added to this file as
-#	Name or Organization <email address>
-# The email address is not required for organizations.
-
-# Please keep the list sorted.
-# Please notify the first person on the list to be added here.
-
-Oystein Bjorke <oystein.bjorke@gmail.com>
+# This is the official list of OxyPlot authors for copyright purposes.
+# This file is distinct from the CONTRIBUTORS file.
+# See the latter for an explanation.
+
+# Names should be added to this file as
+#	Name or Organization <email address>
+# The email address is not required for organizations.
+
+# Please keep the list sorted.
+# Please notify the first person on the list to be added here.
+
+Oystein Bjorke <oystein.bjorke@gmail.com>
 LECO® Corporation
--- a/96
+++ b/96
@ -1,49 +1,49 @@
-# This is the official list of people who have contributed
-# to the OxyPlot repository.
-# The AUTHORS file lists the copyright holders; this file
-# lists people.
-
-# People submitting code should be listed in this file (by email address).
-
-# Names should be added to this file like so:
-#     Name <email address>
-
-# Please keep the list sorted.
-
-Auriou
-Bartłomiej Szypelow
-benjaminrupp
-Benoit Blanchon
-br
-brantheman
-Brannon King
-darrelbrown
-David Wong <dvkwong0@gmail.com>
-DJDAS
-Don Syme <donsyme@fastmail.fm>
-efontana2
-elliatab
-eric
-Garrett
-Gimly
-jaykul
-jezza323
-Johan20D
-julien.bataille
-Just Slon <just.slon@gmail.com>
-kenny_evoleap
-LECO® Corporation
-levi_botelho
-lsowen
-Memphisch <memphis@machzwo.de>
-methdotnet
-moes_leco
-moljac
-mroth
-Oleg Tarasov <oleg.v.tarasov@gmail.com>
-Oystein Bjorke <oystein.bjorke@gmail.com>
-Stefan Rado
-thepretender	
-tephyrnex
-tibel
+# This is the official list of people who have contributed
+# to the OxyPlot repository.
+# The AUTHORS file lists the copyright holders; this file
+# lists people.
+
+# People submitting code should be listed in this file (by email address).
+
+# Names should be added to this file like so:
+#     Name <email address>
+
+# Please keep the list sorted.
+
+Auriou
+Bartłomiej Szypelow
+benjaminrupp
+Benoit Blanchon
+br
+brantheman
+Brannon King
+darrelbrown
+David Wong <dvkwong0@gmail.com>
+DJDAS
+Don Syme <donsyme@fastmail.fm>
+efontana2
+elliatab
+eric
+Garrett
+Gimly
+jaykul
+jezza323
+Johan20D
+julien.bataille
+Just Slon <just.slon@gmail.com>
+kenny_evoleap
+LECO® Corporation
+levi_botelho
+lsowen
+Memphisch <memphis@machzwo.de>
+methdotnet
+moes_leco
+moljac
+mroth
+Oleg Tarasov <oleg.v.tarasov@gmail.com>
+Oystein Bjorke <oystein.bjorke@gmail.com>
+Stefan Rado
+thepretender	
+tephyrnex
+tibel
 Xavier
--- a/42
+++ b/42
@ -1,22 +1,22 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 OxyPlot contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+The MIT License (MIT)
+
+Copyright (c) 2014 OxyPlot contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,14 +1,22 @@
 OxyPlot is a cross-platform plotting library for .NET

-License:            The MIT License (MIT)  
-Web page:           http://oxyplot.org  
-Documentation:      http://oxyplot.org/documentation  
-Announcements:      http://oxyplot.org/announcements  
-Announcements feed: http://oxyplot.org/atom.xml  
-Discussion forum:   http://discussion.oxyplot.org  
-Source repository:  http://github.com/oxyplot/oxyplot  
-Issue tracker:      http://github.com/oxyplot/oxyplot/issues  
-StackOverflow:      http://stackoverflow.com/questions/tagged/oxyplot
+- [Web page](http://oxyplot.org)  
+- [Documentation](http://oxyplot.org/documentation)
+- [Announcements](http://oxyplot.org/announcements)
+- [Announcements feed](http://oxyplot.org/atom.xml)
+- [Discussion forum](http://discussion.oxyplot.org)
+- [Source repository](http://github.com/oxyplot/oxyplot)
+- [Issue tracker](http://github.com/oxyplot/oxyplot/issues)
+- [Stack Overflow](http://stackoverflow.com/questions/tagged/oxyplot)
+
+[![Build status](https://ci.appveyor.com/api/projects/status/mlaqnruo6ic3oe60)](https://ci.appveyor.com/project/objorke/oxyplot)
+
+#### Branches
+
+master - the release branch (stable channel)  
+develop -  the main branch with the latest development changes (pre-release channel)
+
+See '[A successful git branching model](http://nvie.com/posts/a-successful-git-branching-model/)' for more information about the branching model.

 #### Getting started

@ -17,10 +25,11 @@ StackOverflow:      http://stackoverflow.com/questions/tagged/oxyplot
 3. Create a `PlotModel` in your code
 4. Bind the `PlotModel` to the `Model` property of your `PlotView`

-#### Example
+#### Examples

-images and code
+You can find examples in the `/Source/Examples` folder in the code repository.

-#### Contributing
+#### Contribute

-Information about how to contribute to the project
+Information about how to contribute to the project can be found at
+http://oxyplot.org/documentation/contributions