Preparations for 2.0.0 release.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1951 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 54 insertions, 9 deletions

diff --git a/docs/Doxyfile b/docs/Doxyfile
index 704f13b35..efef02712 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.7
+PROJECT_NUMBER         = 1.5.8
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/docs/src/credits.dox b/docs/src/credits.dox
index 28343dc14..bb65a625e 100644
--- a/docs/src/credits.dox
+++ b/docs/src/credits.dox
@@ -18,9 +18,50 @@
 */

 

 /**

- * @page credits Credits

- * @brief Contributors

+ * @page credits Copyright and Credits

+ * @brief Copyright and Credits

  *

+ * <h2>Copyright Statement</h2>

+@verbatim

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+@endverbatim

+ *

+ * <h2>Contributions and Copyright Assignment</h2>

+ * Contributing to the ChibiOS/RT project requires assigning the copyright

+ * on the contributed code to myself (Giovanni Di Sirio).<br>

+ * There are several reasons for this requirement:

+ * - ChibiOS/RT will probably become also a commercial product and I could not

+ *   re-license the code without ownership. Note that the commercial product

+ *   would not be a different or better product, just the same GPL product

+ *   made available, on request, under a different license. The code will

+ *   always be available to you under the current licensing terms.

+ * - I need ownership when changing the licensing terms and this happens

+ *   each time the project goes from development/unstable to stable and

+ *   back because the addition/removal of the GPL linking exception.

+ * - It will be easier for the project adopters to have a single ownership

+ *   point in case of licensing issues (both GPL or commercial).

+ * - Losing the ownership on the code could preclude me the opportunity to

+ *   make this project a full time job as I hope.

+ * - I definitely don't want to have to sort out copyright related issues

+ *   in the future so better be clear than sorry.

+ * .

+ * Note that contributions will always be welcome even without such copyright

+ * assignment, the difference is that the contributed code would not be

+ * merged into the main line, it will still made available as contributed

+ * code with the contributor(s) copyright notice intact.<br>

+ * Submissions of code with copyright notice should only happen through

+ * email, please do not commit code with copyright notices directly on

+ * the repository.<br>

+ * When submitting code please <b>state clearly your intention to keep the

+ * copyright</b> on your work by adding your own copyright notice within the

+ * source code and by clearly mentioning your intentions in the message. Code

+ * contributed without copyright notice will be considered donated.<br>

+ * If in doubt with licensing issues please don't hesitate to contact me

+ * in order to sort out any problem you may have.<br>

+ * Of course the copyright assignment does not mean you would not be

+ * recognized for your hard work, see the following section.

+ *

+ * <h2>Credits</h2>

  * I want to thank to all the people that directly or indirectly contributed

  * to the project, I beg pardon if someone is missing:

  * - <b>Adamo Reggiani</b>, working on the Fujitsu port.

diff --git a/docs/src/licfaq.dox b/docs/src/licfaq.dox
index ff8ccae0d..f2563134c 100644
--- a/docs/src/licfaq.dox
+++ b/docs/src/licfaq.dox
@@ -47,8 +47,8 @@
  *   .

  * - <b>Is the exception applicable to any ChibiOS/RT version ?</b><br>

  *   The exception is valid only for ChibiOS/RT releases marked as @e stable.

- *   Beta or unstable versions are covered by the GPL3 alone because are meant

- *   for testing only.

+ *   Beta, unstable or development versions are covered by the GPL3 alone

+ *   because are meant for testing only.

  * - <b>I don't want to be bound by any of the above restriction, is this

  *   possible?</b><br>

  *   You may contact us about a commercial license.

@@ -90,7 +90,7 @@ in this paragraph.
    -# The files of Non-GPL Code may link to the unmodified ChibiOS/RT

       distribution files contained under:

         - ./os/kernel/src

-        - ./os/hal/sec

+        - ./os/hal/src

         - ./os/hal/platforms

         - ./os/various

         .

@@ -116,4 +116,4 @@ Program code and other code used in conjunction with the Program except the
 Non-GPL Code covered by this exception.

  *

  */

- 

+

diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 28ba3b284..9198edd75 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -39,7 +39,7 @@
 /**

  * @brief   Kernel version string.

  */

-#define CH_KERNEL_VERSION       "1.5.7unstable"

+#define CH_KERNEL_VERSION       "1.5.8unstable"

 

 /**

  * @brief   Kernel version major number.

@@ -54,7 +54,7 @@
 /**

  * @brief   Kernel version patch number.

  */

-#define CH_KERNEL_PATCH         7

+#define CH_KERNEL_PATCH         8

 

 /*

  * Common values.

diff --git a/readme.txt b/readme.txt
index 029aaec6a..75d5eed58 100644
--- a/readme.txt
+++ b/readme.txt
@@ -58,6 +58,10 @@
 *** Releases                                                              ***

 *****************************************************************************

 

+*** 1.5.8 ***

+- Added notes about copyright attribution to the documentation. Fixed some

+  problems in the licensing FAQ page.

+

 *** 1.5.7 ***

 - FIX: Fixed missing SPI driver reinitialization in the MMC driver (bug

   3005628)(backported in 1.4.4).