Skip to content

Commit 46f4a26

Browse files
committed
Merge pull request #169 from marshallshen/create_markdown
Create markdown
2 parents d25c492 + 8507c4c commit 46f4a26

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

History.markdown

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## HEAD
2+
3+
### Major Enhancements
4+
5+
### Minor Enahncements
6+
* Add `drafts` folder support (#167)
7+
* Add `excerpt` support (#168)
8+
* Create History.markdown to help project management (#169)
9+
10+
### Bug Fixes
11+
12+
### Site Enhancements
13+

README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@ For all usage and documentation please see: <http://jekyllbootstrap.com>
1414
However, the actual API has not changed at all.
1515
You might want to run 0.3.0 in a branch to make sure you are ok with the theme design changes.
1616

17-
## Contributing
17+
## Contributing
1818

1919
This repository tracks 2 projects:
2020

21-
- **Jekyll-Bootstrap Framework.**
21+
- **Jekyll-Bootstrap Framework.**
2222
The framework for which users should clone and build their blog on top of is available in the master branch.
23-
23+
2424
To contribute to the framework please make sure to checkout your branch based on `jb-development`!!
2525
This is very important as it allows me to accept your pull request without having to publish a public version release.
26-
27-
Small, atomic Features, bugs, etc.
28-
Use the `jb-development` branch but note it will likely change fast as pull requests are accepted.
29-
Please rebase as often as possible when working.
26+
27+
Small, atomic Features, bugs, etc.
28+
Use the `jb-development` branch but note it will likely change fast as pull requests are accepted.
29+
Please rebase as often as possible when working.
3030
Work on small, atomic features/bugs to avoid upstream commits affecting/breaking your development work.
31-
32-
For Big Features or major API extensions/edits:
31+
32+
For Big Features or major API extensions/edits:
3333
This is the one case where I'll accept pull-requests based off the master branch.
3434
This allows you to work in isolation but it means I'll have to manually merge your work into the next public release.
3535
Translation : it might take a bit longer so please be patient! (but sincerely thank you).
36-
37-
- **Jekyll-Bootstrap Documentation Website.**
36+
37+
- **Jekyll-Bootstrap Documentation Website.**
3838
The documentation website at <http://jekyllbootstrap.com> is maintained in the gh-pages branch.
3939
Please fork and contribute documentation additions to this branch only.
4040

0 commit comments

Comments
 (0)