gnucash-htdocs master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-htdocs/commit/d23d2712 (commit)
	 via  https://github.com/Gnucash/gnucash-htdocs/commit/40bc9e4f (commit)
	from  https://github.com/Gnucash/gnucash-htdocs/commit/aec87069 (commit)



commit d23d27129becf1936b4dfc2b1ca4b76a2a712370
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Feb 13 16:05:48 2014 +0100

    Announce successful gnucash-htdocs regeneration

diff --git a/news/140203-Gnucash-htdocs-Regeneration.news b/news/140203-Gnucash-htdocs-Regeneration.news
index 16c8aa1..9735a40 100644
--- a/news/140203-Gnucash-htdocs-Regeneration.news
+++ b/news/140203-Gnucash-htdocs-Regeneration.news
@@ -1,34 +1,23 @@
-<b>Announcement:</b> Gnucash-htdocs Repository Will Be Regenerated Next Week
-2014-02-03
+<b>Announcement:</b> Gnucash-htdocs Repository Regeneration Complete
+2014-02-13
 
-<h2>Gnucash-htdocs Repository Will Be Regenerated Next Week</h2>
+<h2>Gnucash-htdocs Repository Regeneration Complete</h2>
 
-<p>The gnucash-htdocs repository is growing rather large fairly rapidly.
-This turns out to be due to the compiled docs that are included in it.
-To remedy this we will move the compiled documentation into its own
-repository and rebuild the gnucash-htdocs repository without the
-compiled docs. This will reduce the repository from over 800Mb to
-less than 30Mb.</p>
+<p>The gnucash-htdocs repository has been successfully split
+into gnucash-htdocs and gnucash-htdocs-docs. The first is to be
+used by anyone that wants to alter the content of the website,
+the second will only be used by the documentation release manager
+to update our binary versions of the GnuCash guide and help manuals.</p>
 
-<p>At the same time we will also deprecate the use of the "trunk"
-branch as main branch in that repository and instead use the "master"
-branch which is a more common habit in the git world.</p>
+<p>As said before if you have a clone of the gnucash-htdocs directory
+from before February 13th you will have to reclone the new repository.
+If you still have commits that had not yet been pushed upstream you
+can follow <a href="http://wiki.gnucash.org/wiki/Git#Conversion_Notice">
+these instructions</a> to move them over to the new repository.</p>
 
-<p>The side effect is that existing clones of gnucash-htdocs will
-no longer match with the history in the new gnucash-htdocs.
-<em>If you have a clone or fork of the
-current repository you will need to delete it and re-clone from the
-new one. </em> If you have local branches which you want to transfer
-to the new repository, it's fairly easy, and instructions have already
-been added to <a
-href="http://wiki.gnucash.org/wiki/Git#Conversion_Notice">the
-Gnucash-Git Wiki page</a>. <em>You can make the process much easier by
-keeping your clone/fork current with the base repository this week.</em></p>
-
-<p><em>Timing:</em>the rebuild is planned for next Thursday, February 13th
-around 6-8am PT (9-11am ET, 2-4pm UTC). During that time the gnucash-htdocs
-repos on both code.gnucash.org and github.com will be unstable. So avoid
-that time frame to push or pull any changes.</p>
+<p>Also remember that the primary branch is "master" from now on.
+The "trunk" branch has completely been removed. Please don't push
+to that branch anymore.</p>
 
 <h3>About the Program</h3> <p>GnuCash is a free, open source
 accounting program released under the GNU General Public License (GPL)

commit 40bc9e4ffe5fb879b74121210fdfc9c59a0ad7f7
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Feb 13 15:55:51 2014 +0100

    Revert "Add dummy comment to trigger live website update"
    
    This reverts commit aec87069c881d9bd914bf78282933fec9fc761aa.

diff --git a/index.phtml b/index.phtml
index 1cfd1ad..92d8711 100644
--- a/index.phtml
+++ b/index.phtml
@@ -7,7 +7,6 @@ include("externals/header.phtml");
 include("externals/menu.phtml"); 
 ?>
 
-<!-- Dummy comment to trigger github sync -->
 <div id="content">
 
 <h1><?php echo T_("Welcome to GnuCash.org")?></h1>



Summary of changes:
 index.phtml                                  |  1 -
 news/140203-Gnucash-htdocs-Regeneration.news | 43 +++++++++++-----------------
 2 files changed, 16 insertions(+), 28 deletions(-)