Skip to content

Commit

Permalink
templates: Clean up formatting of FAQ content.
Browse files Browse the repository at this point in the history
This adds some paragraph splits and curly quotes.
  • Loading branch information
timabbott committed May 8, 2018
1 parent 0904a32 commit d4d2685
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
23 changes: 12 additions & 11 deletions templates/zerver/faq.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="faqs">
<div class="padded-content">
<header>
<h1>Frequently asked questions</h1>
<h1>Frequently Asked Questions</h1>
</header>
<div class="faq-box">
<div class="faq">
Expand All @@ -16,9 +16,10 @@ <h1>Frequently asked questions</h1>
entities. We also often offer steep discounts to
educational institutions, and in other scenarios where
users are not being paid a salary. Just contact
[email protected] and we'd be happy to discuss your
[email protected] and we&rsquo;d be happy to discuss your
situation!

</p>
<p class="answer">
You may also be interested in
<a href="/for/open-source">Zulip for open source
projects</a> or
Expand All @@ -35,11 +36,10 @@ <h1>Frequently asked questions</h1>
of users, including Fortune 500 companies like Akamai,
and open source communities like
<a href="https://www.recurse.com/blog/112-how-rc-uses-zulip">The
Recurse Center</a>. If you'd like to see a large Zulip
Recurse Center</a>. If you'd like to see a large Zulip
in action, the
<a href="https://chat.zulip.org">Zulip
community server</a> has thousands of accounts and hundreds of
weekly active users, and is run on a single machine with 8GB of RAM.
community server</a> has thousands of accounts and hundreds of weekly active users, and is run on a single machine with 8GB of RAM.
</p>
</div>
<div class="faq">
Expand All @@ -53,14 +53,15 @@ <h1>Frequently asked questions</h1>
</div>
<div class="faq">
<div class="question">
Do you prorate accounts that aren't being actively used?
Do you prorate accounts that aren&rsquo;t being actively used?
</div>
<p class="answer">
Yes! We don't want to charge you for a service you
Yes! We don&rsquo;t want to charge you for a service you
aren't actually using. We prorate by the day, and only
charge for a user if they have logged on in the last two
weeks, even if they haven't explictly been deactivated.

weeks, even if they haven&rsquo;t explictly been deactivated.
</p>
<p class="answer">
If you start on the Premium plan and drop to Free, we
will credit your account for the time you have left,
that you can use when reactivating your Premium plan in
Expand All @@ -74,7 +75,7 @@ <h1>Frequently asked questions</h1>
<p class="answer">
Yes! Our high quality export and import tools ensure you
can always move from our hosting to yours (and back). If
you'd like to do a migration, email
you&rsquo;d like to do a migration, email
[email protected] and we'll get you started!
</p>
</div>
Expand Down
14 changes: 7 additions & 7 deletions templates/zerver/why-zulip.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Zulip is not just a “better Slack”, in the same way that iPods were not just
“better CD players”. Zulip’s topic-based threading changes what is possible
in chat. If you haven’t seen Zulip in action, log on to our developers’
server at <https://chat.zulip.org>, or check out our short screencast
(coming soon) on topics and threading.
server at [chat.zulip.org](https://chat.zulip.org),
or check out our short screencast (coming soon) on topics and threading.

## Zulip vs. Slack

Expand All @@ -19,13 +19,13 @@ In Slack (or Hipchat, Mattermost, or many others), if Bob starts a
conversation in a busy channel at 10am, and Ada swings by sometime in
the evening, there is no way for Ada to effectively participate in
that conversation. If Ada is a manager who spends most of her days in
meetings, or is a remote engineer living 8 time zones away, she won't
meetings, or is a remote engineer living 8 time zones away, she wont
be able to participate in most conversations at all. This means that
in an organization that has adopted Slack, the vast majority of Ada's
in an organization that has adopted Slack, the vast majority of Adas
conversations will still be over email, during meetings, or over Slack
direct messages.

By contrast, Zulip's lightweight threading model allows busy team
By contrast, Zulips lightweight threading model allows busy team
members and remote workers to fully participate, even if they are
reading messages hours after they are sent (or the next day!). This
enables conversation that would otherwise happen over meetings or
Expand All @@ -50,10 +50,10 @@ The Zulip project has over 30 core team members, working from over 10
different time zones and 25 different locations. Outside of one-on-one
conversations, Zulip doesn’t have a single phone or video-based
meeting. Zulip also has 0 internal mailing lists, and 0 internal email
discussions. By contrast, even Slack doesn't rely on Slack for remote
discussions. By contrast, even Slack doesnt rely on Slack for remote
work; their
[careers page](https://slack.com/careers/location/all-locations/dept/all-departments)
doesn't list a single position where you could work from anywhere.
doesnt list a single position where you could work from anywhere.

Threaded conversations mean that all stakeholders can see and respond to
every message, just like in meetings and email. But unlike meetings, Zulip
Expand Down

0 comments on commit d4d2685

Please sign in to comment.