You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2017/04/26 00:54:39 UTC
[1/2] incubator-mynewt-site git commit: removed references to develop
branch on the main pages of site
Repository: incubator-mynewt-site
Updated Branches:
refs/heads/master e236b4ade -> 690d31307
removed references to develop branch on the main pages of site
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/2a94d2ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/2a94d2ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/2a94d2ce
Branch: refs/heads/master
Commit: 2a94d2ceacf69cdb5492cf7d55a365c10d7ffbba
Parents: e236b4a
Author: aditihilbert <ad...@runtime.io>
Authored: Tue Apr 25 17:19:51 2017 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Tue Apr 25 17:19:51 2017 -0700
----------------------------------------------------------------------
docs/download.md | 22 ++++++----------------
docs/os/get_started/get_started.md | 6 +++---
2 files changed, 9 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2a94d2ce/docs/download.md
----------------------------------------------------------------------
diff --git a/docs/download.md b/docs/download.md
index c020c9c..98129dd 100644
--- a/docs/download.md
+++ b/docs/download.md
@@ -23,26 +23,16 @@ $ newt upgrade
While the use of one of the official releases listed above is generally recommended, you may be interested in seeing work in progress.
-The most recent code resides in the `develop` branch of the Mynewt git repository. You may view or fork the repositories for Mynewt OS and Newt Tool from the Apache mirror on github.com.
+The most recent code that is fairly stable over the full OS resides in the `master` branch of the Mynewt git repository. You may view or fork the repositories for Mynewt OS and Newt Tool from the Apache mirror on github.com.
-* [Apache Mynewt OS mirror on github.com](https://github.com/apache/incubator-mynewt-core/tree/develop)
-* [Apache Newt Tool mirror on github.com](https://github.com/apache/incubator-mynewt-newt/tree/develop)
+* [Apache Mynewt OS mirror on github.com](https://github.com/apache/incubator-mynewt-core/tree/master)
+* [Apache Newt Tool mirror on github.com](https://github.com/apache/incubator-mynewt-newt/tree/master)
-Alternatively, you can clone the desired branch using git:
+The most recent code to support a major feature (e.g. Bluetooth 5) can be found in a long-lived feature branch dedicated to that feature (bluetooth5, in the example for Bluetooth 5) and not the master. If you are interested in seeing the latest code for that feature, you can clone the desired branch using git:
```
-$ git clone git://github.com/apache/incubator-mynewt-core.git -b develop
-$ git clone git://github.com/apache/incubator-mynewt-newt.git -b develop
-```
-
-<br>
-
-A relatively stable version of code in progress can be found in the `master` branch of the Mynewt git repository.
-You may access the code for Mynewt OS and Newt Tool from the 'master` branch of the Apache mirror on github.com or clone it using git:
-
-```
-$ git clone git://github.com/apache/incubator-mynewt-core.git
-$ git clone git://github.com/apache/incubator-mynewt-newt.git
+$ git clone git://github.com/apache/incubator-mynewt-core.git -b <feature-branch-name>
+$ git clone git://github.com/apache/incubator-mynewt-newt.git -b <feature-branch-name>
```
<br>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/2a94d2ce/docs/os/get_started/get_started.md
----------------------------------------------------------------------
diff --git a/docs/os/get_started/get_started.md b/docs/os/get_started/get_started.md
index caf895f..81f3d47 100644
--- a/docs/os/get_started/get_started.md
+++ b/docs/os/get_started/get_started.md
@@ -4,14 +4,14 @@ If you are curious about Mynewt and want to get a quick feel for the project, yo
<br>
-**Option 1** is the quick and easy way to get up and running with Mynewt. The Newt tool and build toolchains are all available in a single [All-in-one Docker Container](docker.md) that you can install on your laptop or computer.
+**Option 1** allows you to install the Newt tool, instances of the Mynewt OS (for simulated targets), and toolchains for developing embedded software (e.g. GNU toolchain) natively on your laptop or computer. You may want this if you are already familiar with such environments or are concerned about performance on your machine. Follow the instructions to [install native tools](native_tools.md) and [install cross tools for ARM](cross_tools.md) if you prefer this option.
-<br>
-**Option 2** allows you to install the Newt tool, instances of the Mynewt OS (for simulated targets), and toolchains for developing embedded software (e.g. GNU toolchain) natively on your laptop or computer. You may want this if you are already familiar with such environments or are concerned about performance on your machine. Follow the instructions to [install native tools](native_tools.md) and [install cross tools for ARM](cross_tools.md) if you prefer this option.
+**Option 2** is a bundled option to get up and running with Mynewt for a quick look at the OS. The Newt tool and build toolchains are all available in a single [All-in-one Docker Container](docker.md) that you can install on your laptop or computer.
<br>
+
You can then proceed with the instructions on how to
* [Create Your First Project](project_create.md) - on simulated hardware.
[2/2] incubator-mynewt-site git commit: swapped the docker and native
install versions in Quick Start This closes #169.
Posted by ad...@apache.org.
swapped the docker and native install versions in Quick Start
This closes #169.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/690d3130
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/690d3130
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/690d3130
Branch: refs/heads/master
Commit: 690d313073b22662fbf04e9752667399af262bf1
Parents: 2a94d2c
Author: aditihilbert <ad...@runtime.io>
Authored: Tue Apr 25 17:45:39 2017 -0700
Committer: aditihilbert <ad...@runtime.io>
Committed: Tue Apr 25 17:54:16 2017 -0700
----------------------------------------------------------------------
docs/quick-start.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/690d3130/docs/quick-start.md
----------------------------------------------------------------------
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 002c487..dc72e6f 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -4,9 +4,10 @@ Apache Mynewt currently offers two ways to quickly get set up, each appealing to
<br>
-* **Option 1:** All-in-one docker container that bundles Newt tool, developer toolchains and libraries. For this option, go to [Docker instructions](/DOCSLINK/os/get_started/docker/)
+* **Option 1:** Step-by-step instructions to install the Newt tool, developer toolchains and libraries natively on your computer. This is the recommended option. For this option, go to [Native Setup](/DOCSLINK/os/get_started/native_tools/)
+
+* **Option 2:** All-in-one docker container that bundles Newt tool, developer toolchains and libraries. This option is only for a quick look at the project. For this option, go to [Docker instructions](/DOCSLINK/os/get_started/docker/)
-* **Option 2:** Step-by-step instructions to install the Newt tool, developer toolchains and libraries natively on your computer. For this option, go to [Native Setup](/DOCSLINK/os/get_started/native_tools/)
<br>