Commits

Romain Pelisse committed c05663b Merge

merge with Bryan

Comments (0)

Files changed (2)

it/web/index-home.html.in

 
   <p>Mercurial è un progetto membro della <a href="http://conservancy.softwarefreedom.org/">Software Freedom Conservancy</a> (SFC), una meravigliosa organizzazione no-profit che offre ai progetti membro un supporto legale e amministrativo.</p>
 
-  <p>Bryan O\&#8217;Sullivan, ha deciso di donare le proprie royalty sulle vendite di questo libro alla Software Freedom Conservancy e incoraggia anche i lettori a supportare il lavoro di questa organizzazione.</p>
+  <p>Bryan O\&#8217;Sullivan ha deciso di donare le proprie royalty sulle vendite di questo libro alla Software Freedom Conservancy e incoraggia anche i lettori a supportare il lavoro di questa organizzazione.</p>
 
   <p>La SFC può <a href="http://conservancy.softwarefreedom.org/?donate">accettare donazioni</a> (esenti dalle tasse secondo la disposizione IRS 501(c)(3), all\&#8217;interno degli Stati Uniti) per conto dei suoi progetti membro. Se volete supportare Mercurial direttamente, considerate la possibilità di fare una donazione alla SFC per destinarla al progetto.</p>
 

web/index.html.in

 
   <p>This is the online home of the book &#8220;Mercurial: The
     Definitive Guide&#8221;.  
-    It will be published in 2009 by O'Reilly Media.</p>
+    It was published in 2009 by O'Reilly Media.</p>
 
-  <p>I make the content <a href="/read/">freely available
-      online</a>.  If you like it, please make a note to buy a copy!</p>
+  <p><a href="http://www.selenic.com/mercurial">Mercurial</a> is a
+    fast, lightweight source control management system
+    designed for easy and efficient handling of very large distributed
+    projects.  My book tells you what it is, why you should care, and
+    how you can use it effectively.</p>
+
+  <h2>Read it online</h2>
+
+  <p>I make the content freely available online: you
+    can <a href="/read/"><i>read it here</i></a>.  If you like it,
+    please <a href="#buy">buy a copy</a>!</p>
 
   <p>For news updates, please
-    visit <a href="http://www.serpentine.com/blog/">my blog</a>.</p>
+    visit <a href="http://www.serpentine.com/blog/">my blog</a>.  You
+    should follow me on
+    Twitter <a href="http://twitter.com/bos31337">here</a>.</p>
 
-  <h2>You can contribute!</h2>
+  <h2><a name="#buy">How</a> to buy</h2>
+
+  <p>If you like the book, please support the work of the Software
+    Freedom Conservancy (<a href="#sfc">see below</a>) by buying a
+    copy.</p>
+
+  <ul>
+    <li><a href="http://www.amazon.com/gp/product/0596800673?ie=UTF8&tag=reaworhas-20&linkCode=as2&camp=1789&creative=390957&creativeASIN=0596800673">Amazon.com</a><img src="http://www.assoc-amazon.com/e/ir?t=reaworhas-20&l=as2&o=1&a=0596800673" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" /></li>
+    <li><a href="http://oreilly.com/catalog/9780596800673/">O'Reilly Media</a></li>
+  </ul>
+
+  <h2>You should contribute!</h2>
 
   <p>I publish the source code for this book
-    as <a href="http://hg.serpentine.com/mercurial/book">a
+    as <a href="http://bitbucket.org/bos/hgbook">a
       Mercurial repository</a>.  Please feel
     welcome to clone it, make modifications to your copy, and send me
     changes.  Getting a copy of the source takes just a few seconds if
     you have Mercurial installed:</p>
 
-  <pre class="screen">hg clone http://hg.serpentine.com/mercurial/book</pre>
+  <pre class="screen">hg clone http://bitbucket.org/bos/hgbook</pre>
 
   <p>The online version of the book includes a comment system
     that you can use to send feedback involving errors, omissions, and
     publishing project of your own, the source for the web application
     is included with the book source at the link above.)</p>
 
-  <h2>What is Mercurial?</h2>
-
-  <p><a href="http://www.selenic.com/mercurial">Mercurial</a> is a
-    fast, lightweight source control management system
-    designed for easy and efficient handling of very large distributed
-    projects.</p>
-
-  <h2>How I help Mercurial and free software, and you can too</h2>
+  <h2><a name="sfc">How</a> I help Mercurial and free software, and
+    you can too</h2>
 
   <p>Mercurial is a member of the <a href="http://conservancy.softwarefreedom.org/">Software Freedom Conservancy</a>, a
     wonderful non-profit organisation that offers its member projects
     legal and administrative advice.</p>
 
-  <p>I am donating my royalties from the sales of this book (once it is
-    published) to the Software Freedom Conservancy, and I encourage
-    you to support their work, too.</p>
+  <p>I donate my royalties from the sales of this book to the
+    Software Freedom Conservancy, and I encourage you to support their
+    work, too.</p>
 
   <p>The SFC can
     accept <a href="http://conservancy.softwarefreedom.org/?donate">accept
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.