[mynewt-documentation] branch master updated: Fix location of nimble docs

[ut...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

utzig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-documentation.git


The following commit(s) were added to refs/heads/master by this push:
     new dbe6650  Fix location of nimble docs
dbe6650 is described below

commit dbe66506ce669a36d06813b7f7d6cf6626008ef8
Author: Fabio Utzig <ut...@apache.org>
AuthorDate: Tue Dec 3 08:29:44 2019 -0300

    Fix location of nimble docs
    
    When building the site add Nimble docs under _scratch/network, instead
    of _scratch/network/docs, which was causing the edit_on_github macro to
    add and extra `docs` entry to the path. Adjust the toc accordingly.
---
 Makefile       | 5 ++---
 docs/index.rst | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index bb9b3be..2610fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,10 @@ _scratch:
 	mkdir _scratch
 	cp -a docs/* _scratch
 	# Copy in docs/ from each of the mynewt-* projects.
-	# NOTE: paths here nead to match edit_on_github in conf.py
+	# NOTE: paths here need to match edit_on_github in conf.py
 	cp -a ../mynewt-core/docs/os _scratch/os
 	#
-	mkdir _scratch/network
-	cp -a ../mynewt-nimble/docs _scratch/network/
+	cp -a ../mynewt-nimble/docs _scratch/network
 	#
 	cp -a ../mynewt-newt/docs _scratch/newt
 	#
diff --git a/docs/index.rst b/docs/index.rst
index c375070..b252e08 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,7 +13,7 @@ Introduction
    tutorials/tutorials
    external_links
    os/os_user_guide
-   network/docs/index
+   network/index
    newt/index
    newtmgr/index
    mynewt_faq/index