diff options
| author |   Stephane Desneux <stephane.desneux@iot.bzh> | 2016-11-08 17:34:17 +0100 |
|---|---|---|
| committer | Stephane Desneux <stephane.desneux@iot.bzh> | 2016-11-10 14:53:01 +0100 |
| commit | f6fc6e5c28255a60c7d2628c0d814e4f12185b16 (patch) | |
| tree | c1bdbd1e6b033de3f80441566e41669f83b1def6 | |
| parent | c530e84843444a40804e0c2b038c2ec53fe411b2 (diff) | |
webdocs: fix config paths and merging
Change-Id: Iadb970fba5f5af6ebee10722218ddeb8da717110
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
| -rw-r--r-- | conf/AppDefaults.js | 6 | ||||
| -rw-r--r-- | conf/_release.yml | 1 | ||||
| -rw-r--r-- | site/_data/redirects.yml | 8 | ||||
| -rw-r--r-- | site/_data/showcase-apps.yml | 6 | ||||
| -rw-r--r-- | site/_data/tools.yml | 6 |
5 files changed, 11 insertions, 16 deletions
diff --git a/conf/AppDefaults.js b/conf/AppDefaults.js index 5d96ecf..38cd2ad 100644 --- a/conf/AppDefaults.js +++ b/conf/AppDefaults.js @@ -14,20 +14,16 @@ * limitations under the License. */ -var path= require("path"); - // Default config will be: // - completed with default from DOCS_TOOLS/conf/AppDefault.js // - superseaded by ProjectRoot/.config-???.js $HOME/.config-???.js /etc/default/config-???.js + config = { DST_PROD : "build-prod", DST_DEVL : "build-dev", VER_CURRENT: "2.x", - SITE_DIR : "site", - DOCS_TOOLS : "../doctools/webdocs", - PUSH_DEST : "apache@some.sample.server:/srv/www/docs/", CRAWL_PROD : "http://some.sample.server/", diff --git a/conf/_release.yml b/conf/_release.yml deleted file mode 100644 index b490702..0000000 --- a/conf/_release.yml +++ /dev/null @@ -1 +0,0 @@ -latest_docs_version: 2.x diff --git a/site/_data/redirects.yml b/site/_data/redirects.yml index bddcfc0..3f10f41 100644 --- a/site/_data/redirects.yml +++ b/site/_data/redirects.yml @@ -5,10 +5,10 @@ version-renames: "master": "dev" "1.0": "1.x" - "2.0": "2.x" - "2.0.1": "2.x" - "2.0.2": "2.x" - "2.0.3": "2.x" + "2.0": "2.x" + "2.0.1": "2.x" + "2.0.2": "2.x" + "2.0.3": "2.x" # 302 (temporary) renames of languages #language-renames: diff --git a/site/_data/showcase-apps.yml b/site/_data/showcase-apps.yml index fbe90d7..e67d751 100644 --- a/site/_data/showcase-apps.yml +++ b/site/_data/showcase-apps.yml @@ -10,12 +10,12 @@ url: https://myapp1.com description: > Lorem ipsum dolor sit amet, consectetur adipiscing elit.a - Sed sem odio, tincidunt in odio ac, cursus vestibulum arcu. + Sed sem odio, tincidunt in odio ac, cursus vestibulum arcu. - name: MyApp2 - The second application image: app2.png url: https://myapp2.com description: > - Donec felis mauris, placerat quis sollicitudin ac, vehicula eget mi. - Nullam suscipit elementum euismod. Duis et convallis ex, at congue risus. + Donec felis mauris, placerat quis sollicitudin ac, vehicula eget mi. + Nullam suscipit elementum euismod. Duis et convallis ex, at congue risus. diff --git a/site/_data/tools.yml b/site/_data/tools.yml index 4fdf6e0..e4f55d0 100644 --- a/site/_data/tools.yml +++ b/site/_data/tools.yml @@ -10,12 +10,12 @@ url: https://mytool1.com description: > Lorem ipsum dolor sit amet, consectetur adipiscing elit.a - Sed sem odio, tincidunt in odio ac, cursus vestibulum arcu. + Sed sem odio, tincidunt in odio ac, cursus vestibulum arcu. - name: MyTool2 - The second application image: tool2.png url: https://mytool2.com description: > - Donec felis mauris, placerat quis sollicitudin ac, vehicula eget mi. - Nullam suscipit elementum euismod. Duis et convallis ex, at congue risus. + Donec felis mauris, placerat quis sollicitudin ac, vehicula eget mi. + Nullam suscipit elementum euismod. Duis et convallis ex, at congue risus. |