github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 23:13:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

normalize on H2 in FAQs, copyedits

Browse Source
This commit is contained in:
Jeff Atwood 2013-02-09 01:32:08 -08:00
parent a03676ac62
commit 91b306d159
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/static/faq.html.erb
View File

@ -3,18 +3,18 @@
<!--<nav></nav> -->
<section id="questions">
<article id="be-civilized">
<h1>This is a Civilized Place for Public Discussion</h1>
<h2>This is a Civilized Place for Public Discussion</h2>
<p>
Please treat this discussion forum with the same respect you would a public park. We’re a community resource: a place to share skills, knowledge and interests. Use these guidelines to help keep this a clean, well-lighted, civilized place for public discourse.
Please treat this discussion forum with the same respect you would a public park. We are a community resource: a place to share skills, knowledge and interests. Use these guidelines to help keep this a clean, well-lighted, civilized place for public discourse.
</p>
<div class="more">
<p>
These guidelines are <em>not</em> intended as a comprehensive list of hard and fast rules, merely as aids for the human judgment of moderators and the overall community.
Note that these guidelines are <em>not</em> intended as a comprehensive list of hard and fast rules, merely as aids for the human judgment of moderators and the overall community.
</p>
</div>
</article>
<article id="improve-stuff">
<h1>Improve the Discussion</h1>
<h2>Improve the Discussion</h2>
<p>
Help us make this a great place for discussion by always working to improve the discussion in some way. If you are not sure your post adds to the discussion or might detract from its usefulness, think over what you want to say and try again later.
</p>
@ -23,13 +23,13 @@
The topics discussed here matter to us and we want you to act as if they matter to you too. Treat the topics and the people discussing them with respect, even if you disagree with some of what is being said.
</p>
<p>
One way to improve the discussion is by searching for ones that are already happening. Please use the search function before starting a new discussion. You have a better chance of meeting others who share your interests.
One way to improve the discussion is by searching for ones that are already happening. Please use the search function before starting a new discussion, and you will have a better chance of meeting others who share your interests.
</p>
</div>
</p>
</article>
<article id="be-agreeable">
<h1>Be Agreeable, Even When You Disagree</h1>
<h2>Be Agreeable, Even When You Disagree</h2>
<p>
You may wish to respond to something by disagreeing with it. That's fine. But, remember to <em>criticize ideas, not people</em>.
Please avoid:
@ -48,7 +48,7 @@
</article>
<article id="participate">
<h1>Your Participation Counts</h1>
<h2>Your Participation Counts</h2>
<p>
The discussions here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be.
</p>
@ -63,7 +63,7 @@
</article>
<article id="flag-bad-stuff">
<h1>If You See a Problem, Flag It</h1>
<h2>If You See a Problem, Flag It</h2>
<p>
Moderators have special responsibility and authority; they are technically responsible for this forum. But so are you. Moderators should be facilitators more than janitors or police — and they can be, with your help.
</p>
@ -78,7 +78,7 @@
</article>
<article id="be-civil">
<h1>Always Be Civil</h1>
<h2>Always Be Civil</h2>
<p>
Nothing sabotages a healthy conversation like rudeness:
<ul>
@ -90,16 +90,16 @@
</p>
<div class="more">
<p>
These are not concrete terms with precise definitions — avoid even the <em>appearance</em> of any of these things. If you're searching this list to see if you are in violation, you're thinking about this the wrong way. If you're unsure, ask yourself: "How would I feel if my post was on the front page of The New York Times?"
These are not concrete terms with precise definitions — avoid even the <em>appearance</em> of any of these things. If you're unsure, ask yourself: "How would I feel if my post was on the front page of The New York Times?"
</p>
<p>
This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. Remember, your mom uses the Internet, too.
This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.
</p>
</div>
</article>
<article id="be-tidy">
<h1>Keep It Tidy</h1>
<h2>Keep It Tidy</h2>
<p>
Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:
<ul>
@ -114,13 +114,13 @@
Discourse can help keep things orderly — for example, the Like functionality lets a user increase the popularity of a post without having to make an entire post that says "+1" or "Agreed," etc. Traditional workarounds, such as "bump" and blank postings are not used here. You can even reply as a new topic.
</p>
<p>
Also, don't sign your posts — every post has your profile information and links in the header.
Also, don't sign your posts — every post has your profile information attached to it.
</p>
</div>
</article>
<article id="dont-steal">
<h1>Post Only Your Own Stuff</h1>
<h2>Post Only Your Own Stuff</h2>
<p>
You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone's intellectual property (software, video, audio, images), or for breaking any other law.
</p>
@ -129,9 +129,9 @@
</article>
<article style="border: none" id="terms">
<h1>Terms of Service</h1>
<h2>Terms of Service</h2>
<p>
Yes, legalese is boring, but we must protect ourselves (and by extension, you and your data) against unfriendly folks. So, like everyone else, we have a Terms of Service <a href="/tos">TOS</a> describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by the TOS.
Yes, legalese is boring, but we must protect ourselves (and by extension, you and your data) against unfriendly folks. We have a Terms of Service <a href="/tos">TOS</a> describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by the TOS.
</p>
<div class="more">
</div>

2
app/views/static/privacy.html.erb
View File

@ -1,5 +1,3 @@
<h1>Privacy Policy</h1>
<h2>What information do we collect?</h2>
<p>
We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.

9
app/views/static/tos.html.erb
View File

@ -1,5 +1,3 @@
<h1>Terms of Service</h1>
<p>
The following terms and conditions govern all use of the Discourse.org website and all content, services and products available at or through the website, including, but not limited to, Discourse Forum Software, Support Forums and the Discourse.org Hosting service (“Hosting”), (taken together, the Website). The Website is owned and operated by Civilized Discourse Construction Kit, Inc. (“CDCK”). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, Discourse.org’s <a href="/privacy">Privacy Policy</a> and <a href="/faq">Community Guidelines</a>) and procedures that may be published from time to time on this Site by CDCK (collectively, the “Agreement”).
</p>
@ -43,8 +41,7 @@
</p>-->
<p>
User contributions are licensed under a <a href="http://creativecommons
.org/licenses/by-nc-sa/3.0/deed.en_US">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCK’s sole discretion (i) refuse or remove any content that, in CDCK’s reasonable opinion, violates any CDCK policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in CDCK’s sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.
User contributions are licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>. Without limiting any of those representations or warranties, CDCK has the right (though not the obligation) to, in CDCK’s sole discretion (i) refuse or remove any content that, in CDCK’s reasonable opinion, violates any CDCK policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in CDCK’s sole discretion. CDCK will have no obligation to provide a refund of any amounts previously paid.
</p>
<p>
@ -62,7 +59,7 @@
<h2>5. Services</h2>
<h3>Hosting, Support Services</h3>
<p>Hosting and Support services are provided by CDCK under the terms and conditions for each such service, which are located at <a href="/hosting-tos">Discourse.org/hosting-tos</a> and <a href="/support-tos">Discourse.org/support-tos</a>, respectively. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
<p>Hosting and Support services are provided by CDCK under the terms and conditions for each such service, which are located at /hosting-tos and /support-tos, respectively. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
</p>
<h2>6. Responsibility of Website Visitors</h2>
@ -102,7 +99,7 @@
<h2>14.Disclaimer of Warranties.</h2>
<p>
The Website is provided “as is”. CDCK and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s <a href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html">a treat (or maybe a trick)</a>. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
The Website is provided “as is”. CDCK and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither CDCK nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s <a href="http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html">a treat</a>. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
</p>
<h2>15. Limitation of Liability.</h2>