← Back to team overview

fenics team mailing list archive

Re: [Branch ~fenics-core/fenics-doc/1.0] Rev 296: Removed <h2> as requested by Marie

 

On 05/31/2011 02:22 PM, Marie E. Rognes wrote:
On 05/31/2011 02:17 PM, Anders Logg wrote:
On Tue, May 31, 2011 at 02:05:46PM +0200, Marie E. Rognes wrote:
On 05/31/2011 01:49 PM, Anders Logg wrote:
On Tue, May 31, 2011 at 01:05:44PM +0200, Marie E. Rognes wrote:
On 05/31/2011 01:04 PM, Harish Narayanan wrote:
On 5/31/11 1:03 PM, Marie E. Rognes wrote:
On 05/31/2011 12:58 PM, noreply@xxxxxxxxxxxxx wrote:
------------------------------------------------------------
revno: 296
committer: Harish Narayanan<hnarayanan@xxxxxxxxx>
branch nick: fenics-doc
timestamp: Tue 2011-05-31 12:57:19 +0200
message:
Removed<h2> as requested by Marie
modified:
source/_themes/fenics/layout.html



I've merged fenics-doc/1.0 with fenics-doc as you might have
noticed ;-)

Please push there.

Done.


Great, thanks :-)

What is the motivation for the merge?


Mainly, I didn't see the point of keeping a "dead branch" as the
main branch.

ok.

Luckily the cronjob that
automatically pulls from fenics-doc and publishes it on the web page
is not running. (And I would like to keep it so until the pages are
ready for launch.)

I talked to Johannes about the cron-job before doing the merge, so I
would hardly call it luck ;-)

Aha!

As discussed last week (with either Marie or Harish, don't remember),
perhaps it is more natural now to put the web pages under fenics-web
instead of fenics-doc (now that the actual docs are located in the
projects)?

Yes!

ok. Will you make the merge/move?


Sure :-)


Done: pushed lp:fenics-doc to lp:~fenics-web-core/fenics-web/tip and made this the trunk series.

I'll go through the fenics-doc blueprints/bugs and reassign to fenics-web or dolfin (or ufc/ufl/ffc) according to relevance.

--
Marie




Follow ups

References