Diff
Not logged in

Differences From:

File www/faq.wiki part of check-in [85c6542a16] - Update the FAQ to describe the new --private option on the commit command. by drh on 2009-08-26 18:40:07. [view]

To:

File www/faq.wiki part of check-in [d6b8b5ba73] - More FAQ updates. Add the document on "shunning". by drh on 2009-08-26 19:50:21. [view]

@@ -7,8 +7,9 @@
 <li><a href="#q2">What is the difference between a "branch" and a "fork"?</a></li>
 <li><a href="#q3">How do I create a new branch in fossil?</a></li>
 <li><a href="#q4">How do I create a private branch that won't get pushed back to the
   main repository.</a></li>
+<li><a href="#q5">How can I delete inappropriate content from my fossil repository?</a></li>
 </ol>
 <hr>
 <a name="q1"></a>
 <p><b>(1) What GUIs are available for fossil?</b></p>
@@ -78,12 +79,16 @@
 You can merge from the trunk into your private branch in order to keep
 your private branch in sync with the latest changes on the trunk.  Once
 you have everything in your private branch the way you want it, you can
 then merge your private branch back into the trunk and push.  Only the
-final merge operation will appear in other repositories.  It will appear
+final merge operation will appear in other repositories.  It will seem
 as if all the changes that occurred on your private branch occurred in
 a single check-in.
-Of course, you can also keep your private branch private forever simply
-by not merging the changes in the private branch back into the trunk.
-</blockquote></li>
+Of course, you can also keep your branch private forever simply
+by not merging the changes in the private branch back into the trunk.</blockquote></li>
+
+<a name="q5"></a>
+<p><b>(5) How can I delete inappropriate content from my fossil repository?</b></p>
+
+<blockquote>See the article on [./shunning.wiki | "shunning"] for details.</blockquote></li>
 
 </ol>