search

boostorg / boostbook

Boost.org boostbook module
http://boost.org/tools/boostbook
11 stars 31 forks source link

Update Jamfile.v2 #2

Closed jzmaddock closed 10 years ago

jzmaddock commented 10 years ago

There can be only one project named boost/doc and we have that already under /doc/ Change to something unique. Fixes PDF doc build.

danieljames commented 10 years ago

What's with the duplicate pull requests?

ericniebler commented 10 years ago

Looks like John made separate pull requests for the master and develop branches. It's generally better to merge into develop, and then merge that into master. That way, you also merge into master the merge commit. So one pull request into develop should do (assuming develop can be safely merged into master, which should be true).

jzmaddock commented 10 years ago

Correct, I made one for master and one for develop - basically because I really don't want to have to go through this patching process again next release. However, I don't mind how you merge them as long as the patch goes into master ;-)