diff --git a/.gitmodules b/.gitmodules index 024b0fead3..ece9d0f3d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ url = https://github.com/go-yaml/yaml.git branch = a5b47d31c556af34a302ce5d659e6fea44d90de0 +[submodule "samples/library"] + path = samples/library + url = https://github.com/docker-library/docs.git diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 47b5ccb24c..a821454158 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -177,14 +177,13 @@ Machine: | *Also known as : docker-machine* namespace: | - A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html){: target="_blank" class="_"} + A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html) is a Linux kernel feature that isolates and vitualizes system resources. Processes which restricted to a namespace can only interact with resources or processes that are part of the same namespace. Namespaces are an important part of Docker's isolation model. Namespaces exist for each type of resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control), and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run.md) - and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine){ :target="_blank" class="_" }. - + and [Introduction to user namespaces](https://success.docker.com/KBase/Introduction_to_User_Namespaces_in_Docker_Engine). node: | A [node](/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual machine running an instance of the Docker Engine in swarm mode. diff --git a/_data/toc.yaml b/_data/toc.yaml index 5966423831..d59d33ba3f 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1187,6 +1187,9 @@ reference: samples: - path: /samples/#tutorial-labs title: Tutorial labs +- sectiontitle: Library references + section: + - generateTOC: library - sectiontitle: Sample applications section: - path: /samples/ diff --git a/_includes/generateTOC.html b/_includes/generateTOC.html new file mode 100644 index 0000000000..c2b317548c --- /dev/null +++ b/_includes/generateTOC.html @@ -0,0 +1,3 @@ +{% if include.tocToGenerate=="library"%}{% for thisPage in site.pages %}{% if thisPage.url contains "/samples/" and thisPage.url != "/samples/" %} +
  • {{ thisPage.title }}
    • +{% endif %}{% endfor %}{% endif %} diff --git a/_includes/tree.html b/_includes/tree.html index ace5f8e132..d7852aa2cd 100644 --- a/_includes/tree.html +++ b/_includes/tree.html @@ -1,9 +1,10 @@ {% assign foundBranch="false" %} {% for item in tree %} +{% if item.generateTOC %}{% include generateTOC.html tocToGenerate=item.generateTOC %}{% else %} {% if item.sectiontitle %}{% if foundBranch=="false" %}{% capture treeString %}{{ item.section | downcase }}{% endcapture %}{% capture pageURLString %}"{{ page.url }}"{% endcapture %}{% else %}{% assign treeString="" %}{% endif %}
    • {% else %}
  • {{ item.title }}
    • -{% endif %}{% endfor %} +{% endif %}{% endif %}{% endfor %} diff --git a/_layouts/docs.html b/_layouts/docs.html index ff8af32e66..7cdb1d4ee6 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -33,7 +33,7 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor % display: block; } - +