Merge pull request BVLC#1034 from sergeyk/dev

[docs] default setting for layout
mitmul · Sep 4, 2014 · ddccfc5 · ddccfc5
2 parents fd76543 + 3e6953b
commit ddccfc5
Show file tree

Hide file tree

Showing 20 changed files with 9 additions and 22 deletions.
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -1 +1,7 @@
-markdown: kramdown
+defaults:
+  -
+    scope:
+      path: "" # an empty string here means all files in the project
+    values:
+      layout: "default"
+
diff --git a/docs/development.md b/docs/development.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 title: Development
 ---
 # Development

diff --git a/docs/index.md b/docs/index.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Caffe
 

diff --git a/docs/installation.md b/docs/installation.md
@@ -1,6 +1,5 @@
 ---
-layout: default
-title: Caffe
+title: Installation
 ---
 
 # Installation

diff --git a/docs/performance_hardware.md b/docs/performance_hardware.md
@@ -1,6 +1,5 @@
 ---
-layout: default
-title: Caffe
+title: Performance and Hardware Configuration
 ---
 
 # Performance and Hardware Configuration

diff --git a/docs/tutorial/convolution.md b/docs/tutorial/convolution.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Caffeinated Convolution
 

diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Data: Ins and Outs
 

diff --git a/docs/tutorial/forward_backward.md b/docs/tutorial/forward_backward.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Forward and Backward
 

diff --git a/docs/tutorial/index.md b/docs/tutorial/index.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Caffe Tutorial
 

diff --git a/docs/tutorial/interfaces.md b/docs/tutorial/interfaces.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Interfaces
 

diff --git a/docs/tutorial/layers.md b/docs/tutorial/layers.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Layers
 

diff --git a/docs/tutorial/loss.md b/docs/tutorial/loss.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Loss
 

diff --git a/docs/tutorial/net_layer_blob.md b/docs/tutorial/net_layer_blob.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Nets, Layers, and Blobs: anatomy of a Caffe model
 

diff --git a/docs/tutorial/solver.md b/docs/tutorial/solver.md
@@ -1,5 +1,4 @@
 ---
-layout: default
 ---
 # Solver
 

diff --git a/examples/cifar10/readme.md b/examples/cifar10/readme.md
@@ -3,7 +3,6 @@ title: CIFAR-10 tutorial
 category: example
 description: Train and test Caffe on CIFAR-10 data.
 include_in_docs: true
-layout: default
 priority: 5
 ---
 

diff --git a/examples/feature_extraction/readme.md b/examples/feature_extraction/readme.md
@@ -3,7 +3,6 @@ title: Feature extraction with Caffe C++ code.
 description: Extract CaffeNet / AlexNet features using the Caffe utility.
 category: example
 include_in_docs: true
-layout: default
 priority: 10
 ---
 

diff --git a/examples/finetune_flickr_style/readme.md b/examples/finetune_flickr_style/readme.md
@@ -3,7 +3,6 @@ title: Fine-tuning for style recognition
 description: Fine-tune the ImageNet-trained CaffeNet on the "Flickr Style" dataset.
 category: example
 include_in_docs: true
-layout: default
 priority: 5
 ---
 

diff --git a/examples/imagenet/readme.md b/examples/imagenet/readme.md
@@ -3,7 +3,6 @@ title: ImageNet tutorial
 description: Train and test "CaffeNet" on ImageNet challenge data.
 category: example
 include_in_docs: true
-layout: default
 priority: 1
 ---
 

diff --git a/examples/mnist/readme.md b/examples/mnist/readme.md
@@ -3,7 +3,6 @@ title: MNIST Tutorial
 description: Train and test "LeNet" on MNIST data.
 category: example
 include_in_docs: true
-layout: default
 priority: 1
 ---
 

diff --git a/examples/web_demo/readme.md b/examples/web_demo/readme.md
@@ -2,7 +2,6 @@
 title: Web demo
 description: Image classification demo running as a Flask web server.
 category: example
-layout: default
 include_in_docs: true
 priority: 10
 ---
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     ---
-    layout: default
     ---
     # Caffe
@@ Expand Down @@