Permalink
Browse files

Converts two-space sequences to one at sentence end

  • Loading branch information...
1 parent d268219 commit 6c2edca6f07d69b96c87e795ca42e5b9a96eae72 @willkg willkg committed Sep 7, 2011
Showing with 45 additions and 45 deletions.
  1. +3 −3 bugzilla.rst
  2. +10 −10 coding.rst
  3. +2 −2 data.rst
  4. +4 −4 devprocess.rst
  5. +13 −13 git.rst
  6. +2 −2 irc.rst
  7. +3 −3 jenkins.rst
  8. +5 −5 l10n.rst
  9. +1 −1 packaging.rst
  10. +2 −2 servers.rst
View
@@ -6,7 +6,7 @@ Bugzilla
========
Almost all webdev tasks take place in
-Bugzilla_. See :ref:`bug-life`.
+Bugzilla_. See :ref:`bug-life`.
.. _Bugzilla: https://bugzilla.mozilla.org
@@ -33,15 +33,15 @@ be assured they get you.
IT Requests
-----------
-`IT requests`_ are a special type of bug that the IT team can follow up. You
+`IT requests`_ are a special type of bug that the IT team can follow up. You
can file a request for Website pushes as well as Desktop support.
.. _`IT requests`: https://bugzilla.mozilla.org/enter_bug.cgi?product=mozilla.org&format=itrequest
Searches
--------
-Searches in Bugzilla_ can be saved. You can also share searches with others
+Searches in Bugzilla_ can be saved. You can also share searches with others
and you can keep other people's shared searches in your Bugzilla view.
.. _bugzilla-api:
View
@@ -13,12 +13,12 @@ General Guidelines
* *Style matters*
How code is aligned matters, because code is reviewed, edited, and
- public. Code that is uneasy to read does not align with the spirit
+ public. Code that is uneasy to read does not align with the spirit
of open source.
* *Be consistent*
- If you do something a certain way, be able to justify it. Don't mix
+ If you do something a certain way, be able to justify it. Don't mix
`camelCase` with `underscore_words` unless you have good reason.
* *Follow code around you*
@@ -42,12 +42,12 @@ Go for 80% or more coverage, especially in the following areas:
* re-opened bugs
Tests last longer than code, as they tend to define the products'
-functionality. They are valuable because they allow us to quickly
+functionality. They are valuable because they allow us to quickly
make changes without fear of hindering functionality.
-The other half of testing is continuous integration. We should be
+The other half of testing is continuous integration. We should be
running our tests at every check in and be able to say with certainty
-that the code is correct to the best of our knowledge. See
+that the code is correct to the best of our knowledge. See
:ref:`ci-chapter`.
@@ -94,12 +94,12 @@ Use single quotes unless you need double (or triple) quotes::
Django
------
-Follow :ref:`python`. There are a few things in Django that will make
+Follow :ref:`python`. There are a few things in Django that will make
your life easier:
Use ``resolve('myurl')`` and ``{{ url('myurl') }}`` when linking to
-internal URLs. This will handle hosts, relative host names, changed
-end points for you. It will also noticeably break so dead-links don't
+internal URLs. This will handle hosts, relative host names, changed
+end points for you. It will also noticeably break so dead-links don't
linger in your code.
.. highlight:: jinja
@@ -117,7 +117,7 @@ Playdoh
~~~~~~~
New web-apps should be spawned from Playdoh_ and existing ones should
-follow the spirit of Playdoh_. Playdoh_ collects lessons that several
+follow the spirit of Playdoh_. Playdoh_ collects lessons that several
Mozilla Django projects have learned and wraps them into a single
Django project template.
@@ -134,7 +134,7 @@ See :ref:`packaging`.
Javascript
----------
-* Use JSHint_ — it's like JSLint_ but a bit more reasonable. JSHint
+* Use JSHint_ — it's like JSLint_ but a bit more reasonable. JSHint
has options for assuming jQuery, node.js, and other options of use
to web developers writing JavaScript.
* Write QUnit tests when possible.
View
@@ -1,7 +1,7 @@
Data storage and retrieval
==========================
-Most sites have fairly simple data-layers. The notable exception is Socorro.
+Most sites have fairly simple data-layers. The notable exception is Socorro.
Typically we use some form of mysql with master-slave replication.
@@ -59,5 +59,5 @@ Be sure to replace ``username`` with your actual LDAP username.
Webdev Database Cluster
~~~~~~~~~~~~~~~~~~~~~~~
Alternately, many production databases have copies running on
-`cm-webdev01-master01` and `cm-webdev01-slave01`. You can connect directly to
+`cm-webdev01-master01` and `cm-webdev01-slave01`. You can connect directly to
these servers.
View
@@ -14,7 +14,7 @@ This document outlines the development process for most projects.
Release Cycles
--------------
-Teams work on 1, 2 or 3-week release cycles. Ultimately teams want a
+Teams work on 1, 2 or 3-week release cycles. Ultimately teams want a
continuous development process, where code can be developed and placed
in production immediately.
@@ -66,11 +66,11 @@ A Bugs Life
QA
--
-QA will verify that bugs are fixed. If you are working on a bug that
+QA will verify that bugs are fixed. If you are working on a bug that
does not need QA verification mark it with ``[qa-]`` in the whiteboard
status.
-QA will re-open a bug if they feel it's not complete. They will file
+QA will re-open a bug if they feel it's not complete. They will file
new bugs if regressions are found within the current milestone.
@@ -79,7 +79,7 @@ new bugs if regressions are found within the current milestone.
Deployment
----------
-Deployment varies heavily by product. A typical flux project will
+Deployment varies heavily by product. A typical flux project will
branch ``master`` into ``prod`` and tag the release with the
milestone.
View
26 git.rst
@@ -7,8 +7,8 @@ Git and Github
==============
Unless you have a good reason you should be using ``git`` and GitHub_
-for version control. One notable exception is many of our projects
-rely on SVN for localizers. We'll be attempting to phase that out.
+for version control. One notable exception is many of our projects
+rely on SVN for localizers. We'll be attempting to phase that out.
Git Resources
-------------
@@ -53,7 +53,7 @@ New projects for Mozilla websites should start in the `Mozilla
account`_.
Contact ``jbalogh`` or ``jsocol`` to be added to individual projects
-you want to have your way with. They hang out in **#webdev** on IRC,
+you want to have your way with. They hang out in **#webdev** on IRC,
which is a fine place to ask for access when you start at Mozilla.
.. _`Mozilla account`: https://github.com/mozilla
@@ -84,12 +84,12 @@ Commit Messages
Keeping master in sync
~~~~~~~~~~~~~~~~~~~~~~
-You will want to keep your local ``master`` branch in sync. Typically
+You will want to keep your local ``master`` branch in sync. Typically
you will rebase your branches with your ``master`` and ultimately you
will push your ``master`` to ``origin/master``.
Let's assume you've defined your ``origin`` remote properly in github.
-E.g. for Zamboni_. ::
+E.g. for Zamboni_. ::
origin git@github.com:jbalogh/zamboni.git
@@ -110,7 +110,7 @@ Git Tools
~~~~~~~~~
In order to make life easier we maintain a repository_ of
-``git-tools``. These are shell scripts or python scripts that commit
+``git-tools``. These are shell scripts or python scripts that commit
all kinds of magic.
.. _repository: https://github.com/davedash/git-tools
@@ -120,7 +120,7 @@ Here's a sampling:
* ``git here`` will tell you the name of your branch, this is an excellent
building block
* ``git bugbranch $BUGNUM`` will copy your current branch to an
- appropriately named bug branch. This uses the :ref:`Bugzilla API
+ appropriately named bug branch. This uses the :ref:`Bugzilla API
<bugzilla-api>`.
* ``git compare`` with the appropriate ``git.config`` settings will
give you a Github_ compare URL for your branch (you'll need to push
@@ -135,10 +135,10 @@ Oh My Zsh
`Oh My Zsh <https://github.com/robbyrussell/oh-my-zsh>` is an
excellent collection of zshell scripts that can make your `zsh`
-environment amazing. It includes a collection of plugins, including
+environment amazing. It includes a collection of plugins, including
ones for ``git`` and Github_.
-Some of these overlap with ``git-tools``. Additionally by using Oh My
+Some of these overlap with ``git-tools``. Additionally by using Oh My
Zsh you can easily display your current branch and it's dirtiness on
your prompt.
@@ -163,7 +163,7 @@ See :ref:`bug-life`
Looking at someone's code
~~~~~~~~~~~~~~~~~~~~~~~~~
-Sometimes you need to run someone else's code locally. If they've
+Sometimes you need to run someone else's code locally. If they've
given you a pull request, or a commit hash this is what you need to do
to see there code::
@@ -174,10 +174,10 @@ to see there code::
Note:
* The above assumes that someone else was me.
-* The first line defines a "remote". A remote is simply an alias to a
+* The first line defines a "remote". A remote is simply an alias to a
repository.
* The second line fetches all my commit hashes that you don't already
- have. Usually this is just branches, and commits, but in theory it
+ have. Usually this is just branches, and commits, but in theory it
can be anything.
-* In the third line I can check out your branch. If you just gave me
+* In the third line I can check out your branch. If you just gave me
a commit hash I would do ``git co $COMMIT_HASH``.
View
@@ -5,7 +5,7 @@
IRC
===
-There's a Mozilla IRC server at ``irc.mozilla.org``. The `Mozilla IRC
+There's a Mozilla IRC server at ``irc.mozilla.org``. The `Mozilla IRC
server`_ page on the wiki talks about how to connect, how to ask
questions, and other things.
@@ -25,7 +25,7 @@ Also of interest:
.. todo::
- Add other useful channels here. Is there one for HTML5?
+ Add other useful channels here. Is there one for HTML5?
.. _`Mozilla IRC server`: https://wiki.mozilla.org/IRC
View
@@ -5,9 +5,9 @@
Jenkins: Continuous Integration
===============================
-We have a public instance of Jenkins_ (formerly Hudson). For most
-projects it runs their python test suite. Optionally we use it to do
+We have a public instance of Jenkins_ (formerly Hudson). For most
+projects it runs their python test suite. Optionally we use it to do
JS testing as well as any menial tasks that need to be done regularly,
-like packaging. If you break things you will be warned in IRC.
+like packaging. If you break things you will be warned in IRC.
.. _jenkins: https://jenkins.mozilla.org/
View
@@ -4,7 +4,7 @@
Localization (l10n)
===================
-Most web apps at Mozilla are localized. We make use of ``gettext``.
+Most web apps at Mozilla are localized. We make use of ``gettext``.
See :ref:`playdoh:l10n` in Playdoh
@@ -15,7 +15,7 @@ SVN
---
By convention Mozilla puts locales in `locale/` and that folder is a working
-copy from SVN. This allows localizers to use tools like Verbatim_ to add new
+copy from SVN. This allows localizers to use tools like Verbatim_ to add new
localized content.
You can create an empty subdirectory off of
@@ -28,7 +28,7 @@ https://svn.mozilla.org/projects/l10n-misc/trunk/ to store your `.po` files::
Where ``$MYPROJECTNAME`` is the name of your project.
You'll also want to add ``*.mo`` to the list of ``global-ignores`` in your
-``~/.subversion/config`` file. ``.mo`` files can be compiled at deploy time.
+``~/.subversion/config`` file. ``.mo`` files can be compiled at deploy time.
.. warning::
@@ -52,8 +52,8 @@ need to commit them back to SVN::
Make this better
----------------
-This process is merely a suggestion. If you think localization can be improved
-or perhaps automated, by all means... **DO IT!** If your improvement takes off
+This process is merely a suggestion. If you think localization can be improved
+or perhaps automated, by all means... **DO IT!** If your improvement takes off
update this, so others can benefit.
View
@@ -27,7 +27,7 @@ directory.
-e git://github.com/django/django@1.2.5#egg=django
-So we're on Django 1.2.5. We want to go to Django 1.3. We edit
+So we're on Django 1.2.5. We want to go to Django 1.3. We edit
``prod.txt``::
-e git://github.com/django/django@1.3#egg=django
View
@@ -3,12 +3,12 @@ Servers
We have a number of servers that you'll regularly encounter as a web dev.
-**khan** is a development server. If you choose not to develop locally, this
+**khan** is a development server. If you choose not to develop locally, this
option is available.
**\*.allizom.org**: all our staging servers share this domain.
-**cm-webdev01-master01** is the webdev mysql server. See :ref:`db-cluster`.
+**cm-webdev01-master01** is the webdev mysql server. See :ref:`db-cluster`.
**cm-vpn01** is where our server logs are copied. Note that you need to file
a bug to get access to this server.

0 comments on commit 6c2edca

Please sign in to comment.