| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,3 +40,4 @@ distribute/* | |||
| 40 | 40 | ||
| 41 | 41 | # user's specified config | |
| 42 | 42 | Makefile.config | |
| 43 | + docs/_site | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,7 +1,7 @@ | |||
| 1 | 1 | [Caffe: Convolutional Architecture for Fast Feature Extraction](http://caffe.berkeleyvision.org) | |
| 2 | 2 | ||
| 3 | - Created by Yangqing Jia, Department of EECS, University of California, Berkeley. | ||
| 4 | - Maintained by the Berkeley Vision and Learning Center (BVLC). | ||
| 3 | + Created by [Yangqing Jia](http://daggerfs.com), UC Berkeley EECS department. | ||
| 4 | + In active development by the Berkeley Vision and Learning Center ([BVLC](http://bvlc.eecs.berkeley.edu/)). | ||
| 5 | 5 | ||
| 6 | 6 | ## Introduction | |
| 7 | 7 | ||
@@ -48,22 +48,24 @@ Please kindly cite Caffe in your publications if it helps your research: | |||
| 48 | 48 | Howpublished = {\url{http://caffe.berkeleyvision.org/} | |
| 49 | 49 | } | |
| 50 | 50 | ||
| 51 | - ## Contributing | ||
| 51 | + ## Building documentation | ||
| 52 | + | ||
| 53 | + Tutorials and general documentation is written in Markdown format in the `docs/` folder. | ||
| 54 | + While the format is quite easy to read directly, you may prefer to view the whole thing as a website. | ||
| 55 | + To do so, simply run `jekyll serve -s docs` and view the documentation website at `http://0.0.0.0:4000` (to get jekyll, you must have ruby and do `gem install jekyll`). | ||
| 52 | 56 | ||
| 53 | - Caffe is developed with the community by the [Berkeley Vision and Learning | ||
| 54 | - Center](http://bvlc.eecs.berkeley.edu/). We welcome contributions! | ||
| 57 | + We strive to provide provide lots of usage examples, and to document all code in docstrings. | ||
| 58 | + We'd appreciate your contribution to this effort! | ||
| 59 | + | ||
| 60 | + ## Contributing | ||
| 55 | 61 | ||
| 56 | - To join in, please note this policy: | ||
| 62 | + Caffe is developed with active participation of the community by the [Berkeley Vision and Learning Center](http://bvlc.eecs.berkeley.edu/). | ||
| 63 | + We welcome all contributions! | ||
| 57 | 64 | ||
| 58 | - - Do your work in [feature | ||
| 59 | - branches](https://www.atlassian.com/git/workflows#!workflow-feature-branch). | ||
| 60 | - - Bring your work up-to-date by | ||
| 61 | - [rebasing](http://git-scm.com/book/en/Git-Branching-Rebasing) onto the latest | ||
| 62 | - `dev`. Polish your changes by [interactive | ||
| 63 | - rebase](https://help.github.com/articles/interactive-rebase) if you like too. | ||
| 64 | - - [Pull request](https://help.github.com/articles/using-pull-requests) your | ||
| 65 | - contribution to BVLC/caffe's `dev` branch for discussion and review. | ||
| 66 | - - `dev` is for new development, community contributions, and testing. | ||
| 67 | - - `master` is handled by BVLC, which will integrate changes from `dev`. | ||
| 65 | + Our workflow is this: | ||
| 68 | 66 | ||
| 69 | - Expect a more detailed contributing guide soon. Thank you. | ||
| 67 | + - The `dev` branch is for new development, community contributions, and testing. | ||
| 68 | + - The `master` branch is handled by BVLC, which will integrate changes from `dev` on a roughly monthly schedule. | ||
| 69 | + - Do new development in [feature branches](https://www.atlassian.com/git/workflows#!workflow-feature-branch) with decriptive names. | ||
| 70 | + - Bring your work up-to-date by [rebasing](http://git-scm.com/book/en/Git-Branching-Rebasing) onto the latest `dev`. (Polish your changes by [interactive rebase](https://help.github.com/articles/interactive-rebase), if you'd like.) | ||
| 71 | + - [Pull request](https://help.github.com/articles/using-pull-requests) your contribution to BVLC/caffe's `dev` branch for discussion and review. | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6,19 +6,23 @@ ORIGIN=`git config --get remote.origin.url` | |||
| 6 | 6 | BRANCH=`git rev-parse --abbrev-ref HEAD` | |
| 7 | 7 | MSG=`git log --oneline -1` | |
| 8 | 8 | ||
| 9 | - if [ $BRANCH='master' ]; then | ||
| 9 | + if [ $BRANCH = 'master' ]; then | ||
| 10 | 10 | # Make sure that docs/_site tracks remote:gh-pages. | |
| 11 | 11 | # If not, then we make a new repo and check out just that branch. | |
| 12 | 12 | mkdir docs/_site | |
| 13 | 13 | cd docs/_site | |
| 14 | 14 | SITE_ORIGIN=`git config --get remote.origin.url` | |
| 15 | 15 | SITE_BRANCH=`git rev-parse --abbrev-ref HEAD` | |
| 16 | 16 | ||
| 17 | - if [ $SITE_ORIGIN=$ORIGIN ] && [ $SITE_BRANCH='gh-pages' ]; then | ||
| 17 | + echo $SITE_ORIGIN | ||
| 18 | + echo $SITE_BRANCH | ||
| 19 | + echo `pwd` | ||
| 20 | + | ||
| 21 | + if [[ ( $SITE_ORIGIN == $ORIGIN ) && ( $SITE_BRANCH = 'gh-pages' ) ]]; then | ||
| 18 | 22 | echo "Confirmed that docs/_site has same origin as main repo, and is on gh-pages." | |
| 19 | 23 | else | |
| 20 | - echo "Checking out origin:gh-pages into docs/_site." | ||
| 21 | - git init | ||
| 24 | + echo "Checking out origin:gh-pages into docs/_site (will take a little time)." | ||
| 25 | + git init . | ||
| 22 | 26 | git remote add -t gh-pages -f origin $ORIGIN | |
| 23 | 27 | git co gh-pages | |
| 24 | 28 | fi | |
| Back | FazBrowse Home | New Git URL |
0 commit comments