diff --git a/docs/Dockerfile b/docs/Dockerfile index 6338fb4296..a11620b4e5 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -6,10 +6,10 @@ COPY . /src COPY . /docs/content/notary/ +RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose -RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/docker RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials -RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content +RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/opensource diff --git a/docs/cli.md b/docs/cli.md index 53ee87ebae..6fdf9ff966 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -5,7 +5,6 @@ description = "Description of the Notary CLI" keywords = ["docker, notary, trust, image, signing, repository, cli"] [menu.main] parent="mn_notary" -weight=4 +++ diff --git a/docs/overview.md b/docs/overview.md index 3074b55cc6..827fa86037 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -5,8 +5,8 @@ description = "Overview of Docker Notary" keywords = ["docker, notary, trust, image, signing, repository"] [menu.main] parent="mn_notary" -weight=4 +weight=-99 +++ -# Overview of Docker Notary \ No newline at end of file +# Overview of Docker Notary diff --git a/docs/pre-process.sh b/docs/pre-process.sh deleted file mode 100755 index 75e9611f2f..0000000000 --- a/docs/pre-process.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -e - -# Populate an array with just docker dirs and one with content dirs -docker_dir=(`ls -d /docs/content/docker/*`) -content_dir=(`ls -d /docs/content/*`) - -# Loop content not of docker/ -# -# Sed to process GitHub Markdown -# 1-2 Remove comment code from metadata block -# 3 Remove .md extension from link text -# 4 Change ](/ to ](/project/ in links -# 5 Change ](word) to ](/project/word) -# 6 Change ](../../ to ](/project/ -# 7 Change ](../ to ](/project/word) -# -for i in "${content_dir[@]}" -do - : - case $i in - "/docs/content/windows") - ;; - "/docs/content/mac") - ;; - "/docs/content/linux") - ;; - "/docs/content/docker") - y=${i##*/} - find $i -type f -name "*.md" -exec sed -i.old \ - -e '/^/g' \ - -e '/^/g' {} \; - ;; - *) - y=${i##*/} - find $i -type f -name "*.md" -exec sed -i.old \ - -e '/^/g' \ - -e '/^/g' \ - -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \ - -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \ - -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \ - -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \ - -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \ - -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \; - ;; - esac -done - -# -# Move docker directories to content -# -for i in "${docker_dir[@]}" -do - : - if [ -d $i ] - then - mv $i /docs/content/ - fi -done - -rm -rf /docs/content/docker -