nuttx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gn...@apache.org
Subject [incubator-nuttx-apps] branch master updated: Update the disclaimer to note that some ASF files don't have correct ASF header (#203)
Date Sat, 25 Apr 2020 19:32:39 GMT
This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new 09c11d9  Update the disclaimer to note that some ASF files don't have correct ASF
header (#203)
09c11d9 is described below

commit 09c11d93025b47c16a7a052f49de60ab6139b652
Author: Abdelatif Guettouche <abdelatif.guettouche@gmail.com>
AuthorDate: Sat Apr 25 20:32:32 2020 +0100

    Update the disclaimer to note that some ASF files don't have correct ASF header (#203)
    
    * Update the disclaimer to note that some ASF files don't have correct ASF header
---
 DISCLAIMER-WIP | 1 +
 README.txt     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP
index 418fd6f..d772605 100644
--- a/DISCLAIMER-WIP
+++ b/DISCLAIMER-WIP
@@ -11,6 +11,7 @@ a list of known issues the project is currently aware of (note that this
list, b
 is likely to be incomplete): 
 
  * Releases may have incomplete licensing conditions.
+ * Some ASF files still have BSD headers.  Most of the top contributors have signed an ICLA
and we are working on updating the headers and getting approvals from other copyright holders.
 
 If you are planning to incorporate this work into your product/project, please be aware that
 you will need to conduct a thorough licensing review to determine the overall implications
of 
diff --git a/README.txt b/README.txt
index 8dfaf10..3af3771 100644
--- a/README.txt
+++ b/README.txt
@@ -23,7 +23,7 @@ part of the configuration that you may choose to use or not.
 Directory Location
 ------------------
 The default application directory used by the NuttX build should be named
-apps/ (or apps-x.y/ where x.y is the NuttX version number).  This apps/
+apps/ (or apps-x.y.z/ where x.y.z is the NuttX version number).  This apps/
 directory should appear in the directory tree at the same level as the
 NuttX directory.  Like:
 
@@ -155,8 +155,8 @@ A: Here are three:
    1) There is a make target called 'make export'. It will build
       NuttX, then bundle all of the header files, libraries, startup
       objects, and other build components into a .zip file. You
-      can can move that .zip file into any build environment you
-      want. You even build NuttX under a DOS CMD window.
+      can move that .zip file into any build environment you
+      want. You can even build NuttX under a DOS CMD window.
 
       This make target is documented in the top level nuttx/README.txt.
 


Mime
View raw message