FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Updated README with doc info · 2php/CaffeOnACL@27a8315 · GitHub

Repository navigation

Commit 27a8315

Browse files
committed
Updated README with doc info
1 parent aea53c7 commit 27a8315

3 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ distribute/*
4040

4141
# user's specified config
4242
Makefile.config
43+
docs/_site

‎README.md‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Caffe: Convolutional Architecture for Fast Feature Extraction](http://caffe.berkeleyvision.org)
22

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/)).
55

66
## Introduction
77

@@ -48,22 +48,24 @@ Please kindly cite Caffe in your publications if it helps your research:
4848
Howpublished = {\url{http://caffe.berkeleyvision.org/}
4949
}
5050

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`).
5256

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
5561

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!
5764

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:
6866

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.
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@ ORIGIN=`git config --get remote.origin.url`
66
BRANCH=`git rev-parse --abbrev-ref HEAD`
77
MSG=`git log --oneline -1`
88

9-
if [ $BRANCH='master' ]; then
9+
if [ $BRANCH = 'master' ]; then
1010
# Make sure that docs/_site tracks remote:gh-pages.
1111
# If not, then we make a new repo and check out just that branch.
1212
mkdir docs/_site
1313
cd docs/_site
1414
SITE_ORIGIN=`git config --get remote.origin.url`
1515
SITE_BRANCH=`git rev-parse --abbrev-ref HEAD`
1616

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
1822
echo "Confirmed that docs/_site has same origin as main repo, and is on gh-pages."
1923
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 .
2226
git remote add -t gh-pages -f origin $ORIGIN
2327
git co gh-pages
2428
fi

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL