Repository: couchdb Updated Branches: refs/heads/master 08d25e979 -> 7221f7036
Fauxton: fix build Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7221f703 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7221f703 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7221f703 Branch: refs/heads/master Commit: 7221f7036d0b6e574020679381f0c142302af159 Parents: 08d25e9 Author: Robert Kowalski <[email protected]> Authored: Wed Jul 2 16:38:14 2014 +0200 Committer: Robert Kowalski <[email protected]> Committed: Wed Jul 2 16:38:14 2014 +0200 ---------------------------------------------------------------------- .gitignore | 1 - src/Makefile.am | 1 - src/fauxton/readme.md | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7221f703/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 4b12bf7..0e39c34 100644 --- a/.gitignore +++ b/.gitignore @@ -110,7 +110,6 @@ src/fauxton/app/addons/* !src/fauxton/app/addons/styletests src/fauxton/settings.json* !src/fauxton/settings.json.default -!src/fauxton/settings.json.dev !src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf src/ibrowse/ibrowse.app src/ibrowse/ibrowse.app http://git-wip-us.apache.org/repos/asf/couchdb/blob/7221f703/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index d7cea21..6b5a5dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -324,7 +324,6 @@ FAUXTON_FILES = \ fauxton/package.json \ fauxton/readme.md \ fauxton/settings.json.default \ - fauxton/settings.json.dev \ fauxton/settings.json.sample_external \ fauxton/tasks/addon/rename.json \ fauxton/tasks/addon/root/base.js.underscore \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/7221f703/src/fauxton/readme.md ---------------------------------------------------------------------- diff --git a/src/fauxton/readme.md b/src/fauxton/readme.md index dc36a17..4db17a0 100644 --- a/src/fauxton/readme.md +++ b/src/fauxton/readme.md @@ -21,8 +21,7 @@ A recent of [node.js](http://nodejs.org/) and npm is required. ### Dev Server Using the dev server is the easiest way to use fauxton, specially when -developing for it. Copy or symlink the `settings.json.default` (or the -`settings.json.dev` file if you'd like to see the `styletests` addon). +developing for it. Copy or symlink the `settings.json.default` file if you'd like to see the `styletests` addon). And then...
