www/help help.html

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       16/09/02 17:28:24

Modified files:
        help           : help.html 

Log message:
        Fix previous commits.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/help/help.html?cvsroot=www&r1=1.163&r2=1.164

Patches:
Index: help.html
===================================================================
RCS file: /web/www/www/help/help.html,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- help.html   2 Sep 2016 16:12:57 -0000       1.163
+++ help.html   2 Sep 2016 17:28:24 -0000       1.164
@@ -157,37 +157,6 @@
 
 </ul>
 
-<h3 id="movement">Work for the Free Software Movement</h3>
-<p>
-This list is ordered roughly with the more urgent items near the top.
-Please note that many things on this list link to larger, expanded lists.
-</p>
-<ul>
-    <li>Organize a new Free Software Activist Group to promote use of
-    free software in your country, region or city.  Get started by
-    listing your group
-    at <a href="http://libreplanet.org/wiki/LibrePlanet:Local_Teams/New";>
-    libreplanet.org</a>.</li>
-
-    <li><a
-    href="http://directory.fsf.org/wiki/Free_Software_Directory:Participate";>
-    Help maintain the Free Software Directory</a>.</li>
-
-    <li>Volunteer as a &ldquo;Freedom Verifier&rdquo; to check
-    whether a given distribution contains only
-    free software, so it can be included on the
-    <a href="/distros/free-distros.html">list
-    of free distributions</a>.</li>
-
-    <li>Set an example by switching to a <em>completely</em> <a
-    href="/philosophy/free-sw.html">free software</a> operating system.
-    The easiest way to do that is to install and use one of the <a
-    href="/distros/free-distros.html"> free GNU/Linux
-    distributions</a>.</li>
-</ul>
-
-=======
->>>>>>> 1.160
 <h3 id="helpgnu">Help support GNU development and use</h3>
 <p>
 This list is ordered roughly with the more urgent items near the top.
@@ -262,65 +231,6 @@
     href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</li>
 </ul>
 
-<<<<<<< help.html
-<h3 id="funds">Help the FSF raise funds</h3>
-<p>
-This list is ordered roughly with the more urgent items near the top.
-Please note that many things on this list link to larger, expanded lists.
-</p>
-<ul>
-    <li>
-    Become an <a href="http://member.fsf.org/";>Associate Member</a>
-    of the FSF.
-    </li>
-
-    <li>
-     Make a donation,
-     either <a href="http://donate.fsf.org/";>directly to the FSF</a>
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
-Flattr</a>.
-    </li>
-
-    <li>
-    <a href="http://order.fsf.org/";>Order</a> manuals,
-    t-shirts, stickers and gear from the FSF.
-    </li>
-
-    <li>
-    Convince your office to <a href="http://order.fsf.org/";>order</a>
-    manuals and t-shirts from the FSF.
-    </li>
-
-    <li>
-    <a href="/philosophy/selling.html">Sell free
-    software</a> and donate a part of the proceeds to
-    the <a href="/fsf/fsf.html">Free Software
-    Foundation</a> or some other free software development
-    project. By funding development, you can advance the
-    world of free software.
-    <p>
-    <strong>Distributing free software is an opportunity to raise
-    funds for development.  Don't waste it!</strong>
-    </p></li>
-</ul>
-
-<h3 id="graphics">Contribute graphic designs</h3>
-
-<p>
-We are looking for new graphic designs for t-shirts and other GNU and
-FSF items to offer in our shop. If you are interested in contributing
-some good-quality art to help raise free software awareness, please
-contact <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-Please dont send us files over 2 Megabytes, instead upload the file and
-send us a link.
-</p>
-
-<p>
-Here are some <a 
href="http://libreplanet.org/wiki/Group:Free_Software_Foundation/Ideas#Store_suggestions";>ideas
 on how we can use artwork</a>.
-</p>
-
-=======
->>>>>>> 1.160
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -379,7 +289,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/09/02 16:12:57 $
+$Date: 2016/09/02 17:28:24 $
 <!-- timestamp end -->
 </p>
 </div>