Selaa lähdekoodia

Merge pull request #1563 from moxiegirl/hugo-test-fixes

Hugo final 1.7 Documentation PR -- please read carefully
(cherry picked from commit 4e73e86d9480de0be87fa5390d915346a435ac26)

Signed-off-by: Aanand Prasad <[email protected]>
Aanand Prasad 10 vuotta sitten
vanhempi
sitoutus
c3c5d91c47
11 muutettua tiedostoa jossa 17 lisäystä ja 17 poistoa
  1. 7 7
      docs/Dockerfile
  2. 1 1
      docs/cli.md
  3. 1 1
      docs/completion.md
  4. 1 1
      docs/django.md
  5. 1 1
      docs/env.md
  6. 2 2
      docs/extends.md
  7. 0 0
      docs/index.md
  8. 1 1
      docs/install.md
  9. 1 1
      docs/rails.md
  10. 1 1
      docs/wordpress.md
  11. 1 1
      docs/yml.md

+ 7 - 7
docs/Dockerfile

@@ -8,17 +8,17 @@ COPY . /docs/content/compose/
 
 
 # Sed to process GitHub Markdown
 # Sed to process GitHub Markdown
 # 1-2 Remove comment code from metadata block
 # 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)
+# 3 Change ](/word to ](/project/ in links
+# 4 Change ](word.md) to ](/project/word)
+# 5 Remove .md extension from link text
+# 6 Change ](../ to ](/project/word) 
+# 7 Change ](../../ to ](/project/ --> not implemented
 # 
 # 
 # 
 # 
 RUN find /docs/content/compose -type f -name "*.md" -exec sed -i.old \
 RUN find /docs/content/compose -type f -name "*.md" -exec sed -i.old \
     -e '/^<!.*metadata]>/g' \
     -e '/^<!.*metadata]>/g' \
     -e '/^<!.*end-metadata.*>/g' \
     -e '/^<!.*end-metadata.*>/g' \
-    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
     -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/compose\//g' \
     -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/compose\//g' \
-    -e 's/\(\][(]\)\([A-z]*[)]\)/\]\(\/compose\/\2/g' \
+    -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/compose\/\2/g' \
+    -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
     -e 's/\(\][(]\)\(\.\.\/\)/\1\/compose\//g' {} \;
     -e 's/\(\][(]\)\(\.\.\/\)/\1\/compose\//g' {} \;

+ 1 - 1
docs/cli.md

@@ -192,7 +192,7 @@ Configures the path to the `ca.pem`, `cert.pem`, and `key.pem` files used for TL
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 1 - 1
docs/completion.md

@@ -59,7 +59,7 @@ Enjoy working with Compose faster and with less typos!
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 1 - 1
docs/django.md

@@ -125,7 +125,7 @@ example, run `docker-compose up` and in another terminal run:
 
 
 ## More Compose documentation
 ## More Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 1 - 1
docs/env.md

@@ -40,7 +40,7 @@ Fully qualified container name, e.g. `DB_1_NAME=/myapp_web_1/myapp_db_1`
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 2 - 2
docs/extends.md

@@ -86,7 +86,7 @@ For full details on how to use `extends`, refer to the [reference](#reference).
 ### Example use case
 ### Example use case
 
 
 In this example, you’ll repurpose the example app from the [quick start
 In this example, you’ll repurpose the example app from the [quick start
-guide](compose-overview.md). (If you're not familiar with Compose, it's recommended that
+guide](index.md). (If you're not familiar with Compose, it's recommended that
 you go through the quick start first.) This example assumes you want to use
 you go through the quick start first.) This example assumes you want to use
 Compose both to develop an application locally and then deploy it to a
 Compose both to develop an application locally and then deploy it to a
 production environment.
 production environment.
@@ -371,7 +371,7 @@ volumes:
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 0 - 0
docs/compose-overview.md → docs/index.md


+ 1 - 1
docs/install.md

@@ -57,7 +57,7 @@ Alternatively, if you're not worried about keeping them, you can remove them - C
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)
 - [Get started with Wordpress](wordpress.md)
 - [Get started with Wordpress](wordpress.md)

+ 1 - 1
docs/rails.md

@@ -124,7 +124,7 @@ you're using Boot2docker, `boot2docker ip` will tell you its address).
 
 
 ## More Compose documentation
 ## More Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 1 - 1
docs/wordpress.md

@@ -121,7 +121,7 @@ address).
 
 
 ## More Compose documentation
 ## More Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)

+ 1 - 1
docs/yml.md

@@ -393,7 +393,7 @@ read_only: true
 
 
 ## Compose documentation
 ## Compose documentation
 
 
-- [User guide](compose-overview.md)
+- [User guide](/)
 - [Installing Compose](install.md)
 - [Installing Compose](install.md)
 - [Get started with Django](django.md)
 - [Get started with Django](django.md)
 - [Get started with Rails](rails.md)
 - [Get started with Rails](rails.md)