> Am 29.10.2015 um 20:20 schrieb John Hewson <[email protected]>: > > >> On 29 Oct 2015, at 12:00, Maruan Sahyoun <[email protected]> wrote: >> >>> >>> Am 29.10.2015 um 19:44 schrieb John Hewson <[email protected] >>> <mailto:[email protected]>>: >>> >>> >>>> On 29 Oct 2015, at 02:47, Maruan Sahyoun <[email protected] >>>> <mailto:[email protected]>> wrote: >>>> >>>> Hi, >>>> >>>> I've done all the changes to be able to build locally using jekyll. Shall >>>> we merge the branch jekyll-migration back to trunk or what are the >>>> proposed next steps? >>> >>> I’m confused, why would we want jekyll-migration to be in trunk? That’s >>> where our source code lives, not our website. Did you mean something else, >>> e.g. merging back into the cmssite branch? >> >> for clarity >> >> merge >> >> https://svn.apache.org/repos/asf/pdfbox/cmssite/branches/jekyll-migration/ >> <https://svn.apache.org/repos/asf/pdfbox/cmssite/branches/jekyll-migration/> >> >> into >> >> https://svn.apache.org/repos/asf/pdfbox/cmssite/trunk/ >> <https://svn.apache.org/repos/asf/pdfbox/cmssite/trunk/> > > Ok, great, that makes sense. Yes I’d like to see that get merged in.
We'd need to first remove the Apache CMS build from the …/cmssite/trunk/ as a merge would trigger a rebuild which is not compliant. > >> BR >> Maruan >> >>> >>>> We could also use the jekyll-migration branch as a base for pdfbox-docs >>>> (git), build from there and after that remove the cmssite svn repo >>>> completely. Would be my preference. >>> >>> That depends on what you mean above… I’ll wait for the explanation. Also >>> cmssite is a branch, not a repo. > > Building from SVN is far simpler. But I’d be interested in removing ApacheCMS > from the equation. Building from SVN is far simpler because … ? BR Maruan > > — John > >>>> After having done that I'll do some more changes to the website but wanted >>>> to complete the infrastructure related topics first. >>>> >>>> BR >>>> Maruan >>>> --------------------------------------------------------------------- >>>> To unsubscribe, e-mail: [email protected] >>>> For additional commands, e-mail: [email protected] >>>> >>> >>> >>> --------------------------------------------------------------------- >>> To unsubscribe, e-mail: [email protected] >>> <mailto:[email protected]> >>> For additional commands, e-mail: [email protected] >>> <mailto:[email protected]> >>> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> <mailto:[email protected]> >> For additional commands, e-mail: [email protected] >> <mailto:[email protected]> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
