Skip to content

Commit

Permalink
docs: Refer to 'Patchwork' consistently
Browse files Browse the repository at this point in the history
The docs referred to both 'patchwork' and 'Patchwork'. Use the title
case variant consistently.

Signed-off-by: Stephen Finucane <[email protected]>
  • Loading branch information
stephenfin committed Mar 29, 2016
1 parent 144558e commit 8320efc
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 95 deletions.
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Check feature, which can be used to report the status of tests
- Automatic delegation of patches based on file path
- Automated documentation for the XML-RPC API. This can be found at the
'/xmlrpc' in most patchwork deployments
'/xmlrpc' in most Patchwork deployments
- Selenium-based UI tests
- Vagrant support for developers
- Assorted cleanup tasks and bug fixes

### Changed

- Patches can now be delegated to any patchwork user
- Patches can now be delegated to any Patchwork user
- Significant updates to the documentation

## [1.0.0] - 2015-10-26
Expand All @@ -40,15 +40,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Support for Django Migrations. This will be the chosen method of making
database changes going forward. See below for more information
- Support for tox
- Django management commands, which replace the existing patchwork cron scripts
- Django management commands, which replace the existing Patchwork cron scripts
- CHANGELOG.md and UPGRADING.md docs

### Changed

- Static files are now gather and served using the `django.contrib.staticfiles`
module, per Django best practices
- Restructured directory per modern Django standards. The `apps` directory no
longer exists and patchwork source has instead been moved to the top level
longer exists and Patchwork source has instead been moved to the top level
directory
- Rewrote documentation to reflect changes in development and deployment best
practices over the past few years
Expand All @@ -70,7 +70,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [0.9.0] - 2015-03-22

**NOTE:** 1.0.0 was the first release of patchwork adopting semantic versioning.
**NOTE:** 1.0.0 was the first release of Patchwork adopting semantic versioning.
For information on *"0.9.0"* and before, please refer to Git logs.

[Unreleased]: https://github.com/getpatchwork/patchwork/compare/v1.1.0...HEAD
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# patchwork
# Patchwork

[![Requirements Status][badge-req-img]][badge-req-ref]
[![Docs Status][badge-doc-img]][badge-doc-ref]
[![Stories in Ready][badge-waffle-img]][badge-waffle-ref]

**patchwork** is a patch tracking system for community-based projects. It is
**Patchwork** is a patch tracking system for community-based projects. It is
intended to make the patch management process easier for both the project's
contributors and maintainers, leaving time for the more important (and more
interesting) stuff.
Expand All @@ -15,7 +15,7 @@ to the patch page too. The project's maintainer can then scan through the list
of patches, marking each with a certain state, such as Accepted, Rejected or
Under Review. Old patches can be sent to the archive or deleted.

Currently, patchwork is being used for a number of open-source projects, mostly
Currently, Patchwork is being used for a number of open-source projects, mostly
subsystems of the Linux kernel. Although Patchwork has been developed with the
kernel workflow in mind, the aim is to be flexible enough to suit the majority
of community projects.
Expand Down Expand Up @@ -45,7 +45,7 @@ For further information, please refer to the [docs][docs].
# Contact

For bug reports, patch submissions or other questions, please use the
[patchwork mailing list][pw-ml].
[Patchwork mailing list][pw-ml].

[badge-doc-ref]: https://patchwork.readthedocs.org/en/latest/
[badge-doc-img]: https://readthedocs.org/projects/patchwork/badge/?version=latest
Expand Down
8 changes: 4 additions & 4 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ little to no changes.

## 0.9.0 to 1.0.0

Version 1.0.0 changes a few admin-visible components of patchwork so
Version 1.0.0 changes a few admin-visible components of Patchwork so
upgrading involves a few steps.

### Database Migrations
Expand Down Expand Up @@ -37,7 +37,7 @@ Merge your previous settings (from `apps/local_settings.py`) into this file.

### Fixup external references to `apps/`

The `apps/` directory is gone; the patchwork module is now in the top-level
The `apps/` directory is gone; the Patchwork module is now in the top-level
directory. If you have scripts that run anything from `apps/` (e.g. incoming
mail parsers that call `parsemail.sh`, and cron scripts), then remove the
`apps/` directory from those:
Expand All @@ -59,7 +59,7 @@ too.

Static content should now be located in the folder indicated by `STATIC_ROOT`.
This should point somewhere sensible (e.g. the absolute path of `htdocs/static`
in the patchwork tree).
in the Patchwork tree).

You'll need to set the `STATIC_ROOT` setting in your settings file.

Expand All @@ -79,7 +79,7 @@ will be:

### Use new management console

The patchwork cron script (`bin/patchwork-cron.py`) has been moved to a
The Patchwork cron script (`bin/patchwork-cron.py`) has been moved to a
`manage.py` command. Instead of running `patchwork-cron.py`, you should now
run:

Expand Down
6 changes: 3 additions & 3 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ You can find this at the following URL:

http://patchwork.example.com/xmlrpc/

Where `patchwork.example.com` refers to the URL of your patchwork instance.
Where `patchwork.example.com` refers to the URL of your Patchwork instance.

**NOTE:** Automatic documentation generation for the patchwork API was
**NOTE:** Automatic documentation generation for the Patchwork API was
introduced in Patchwork v1.1. Prior versions of Patchwork do not offer this
functionality.

## Developing Your Own Client

You need to connect to the server. Some methods require authentication (via
HTTP Basic Auth) while others do not. Authentication uses your patchwork
HTTP Basic Auth) while others do not. Authentication uses your Patchwork
account and the on-server documention will indicate where it is necessary.
We will only cover the unauthenticated method here for brevity - please
consult the [`xmlrpclib`] documentation for more detailed examples:
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ below for more information on usage of this tool.

## Testing

patchwork includes a [tox][ref-tox] script to automate testing. This requires
Patchwork includes a [tox][ref-tox] script to automate testing. This requires
a functional database and some Python requirements like `tox`. Please refer
to the [development guide][doc-development] for information on how to configure
these.

Assuming these requirements are met, actually testing patchwork is quite easy
Assuming these requirements are met, actually testing Patchwork is quite easy
to do. To start, you can show the default targets like so:

$ tox --list
Expand All @@ -36,7 +36,7 @@ command:

$ tox -e py27-django18 patchwork.tests.SubjectCleanUpTest

Because patchwork support multiple versions of Django, it's very important
Because Patchwork support multiple versions of Django, it's very important
that you test against all supported versions. When run without argument, tox
will do this:

Expand Down
44 changes: 22 additions & 22 deletions docs/deployment.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Deployment

This document describes the necessary steps to configure patchwork in a
This document describes the necessary steps to configure Patchwork in a
production environment. This requires a significantly "harder" deployment than
the one used for development. If you are interested in developing patchwork,
the one used for development. If you are interested in developing Patchwork,
please refer to [the development guide][doc-development] instead.

This document describes a two-node installation of patchwork, consisting of
This document describes a two-node installation of Patchwork, consisting of
a database sever and an application server. It should be possible to combine
these machines for smaller patchwork instances. It should also be possible to
these machines for smaller Patchwork instances. It should also be possible to
configure high availability deployment through use of additional database and
application machines, though this is out of the scope of this document.

## Deployment Guides, Provisioning Tools and Platform-as-a-Service

Before continuing, it's worth noting that patchwork is a Django application.
Before continuing, it's worth noting that Patchwork is a Django application.
With the exception of the handling of incoming mail (described below), it
can be deployed like any other Django application. This means there are tens,
if not hundreds, of existing articles and blogs detailing how to deploy an
Expand Down Expand Up @@ -46,8 +46,8 @@ For the purpose of this guide, we will assume the following machines:
| application | 10.1.1.2 |

We will use the database server to, ostensibly enough, host the database for
the patchwork instance. The application server, on the other hand, will host
the patchwork instance along with the required reverse proxy and WSGI HTTP
the Patchwork instance. The application server, on the other hand, will host
the Patchwork instance along with the required reverse proxy and WSGI HTTP
servers.

We expect a Ubuntu 15.04 installation on each of these hosts: commands,
Expand All @@ -71,7 +71,7 @@ should be exported on all systems:
<dt>PW_DB_NAME=patchwork</dt>
<dd>Name of the database</dd>
<dt>PW_DB_USER=www-data</dt>
<dd>Username that the patchwork app will access the database with</dd>
<dd>Username that the Patchwork app will access the database with</dd>
</dl>

## Database
Expand All @@ -91,7 +91,7 @@ different RDBMS. Install the required packages.
### Configure Database

PostgreSQL created a user account called `postgres`; you will need to run
commands as this user. Use this account to create the database that patchwork
commands as this user. Use this account to create the database that Patchwork
will use, using the credentials we configured earlier.

$ sudo -u postgres createdb $PW_DB_NAME
Expand All @@ -109,7 +109,7 @@ These steps should be run on the application server.

### Install Packages

The first requirement is patchwork itself. It can be downloaded like so:
The first requirement is Patchwork itself. It can be downloaded like so:

$ wget https://github.com/getpatchwork/patchwork/archive/v1.1.0.tar.gz

Expand All @@ -124,7 +124,7 @@ that people may be able to view your code over the Web. This is a security
risk.

Next we require Python. If not already installed, then you should do so now.
patchwork supports both Python 2.7 and Python 3.3+, though we would suggest
Patchwork supports both Python 2.7 and Python 3.3+, though we would suggest
using the latter to ease future upgrades:

$ sudo apt-get install python3 # or 'python' if using Python 2.7
Expand All @@ -141,11 +141,11 @@ corresponding distro package for each of these requirements. For example:
**NOTE:** The [pkgs.org][ref-pkgs] website provides a great reference for
identifying the name of these dependencies.

### Configure patchwork
### Configure Patchwork

You will also need to configure a [settings][ref-django-settings] file for
Django. A sample settings file is provided that defines default settings for
patchwork. You'll need to configure settings for your own setup and save this
Patchwork. You'll need to configure settings for your own setup and save this
as `production.py`.

$ cp patchwork/settings/production.example.py \
Expand Down Expand Up @@ -248,7 +248,7 @@ These steps should be run on the application server.

### Install Packages

We will use nginx and uWSGI to deploy patchwork, acting as reverse proxy server
We will use nginx and uWSGI to deploy Patchwork, acting as reverse proxy server
and WSGI HTTP server respectively. Other options are available, such as
Apache+mod_wsgi or nginx+Gunicorn. While we don't document these, sample
configuration files for the former case are provided in `lib/apache2/`.
Expand All @@ -258,7 +258,7 @@ configuration files for the former case are provided in `lib/apache2/`.
### Configure nginx and uWSGI

Configuration files for nginx and uWSGI are provided in the `lib` subdirectory
of the patchwork source code. These can be modified as necessary, but for now
of the Patchwork source code. These can be modified as necessary, but for now
we will simply copy them.

First, let's load the provided configuration for nginx:
Expand Down Expand Up @@ -321,7 +321,7 @@ Next up, restart the nginx service:
$ sudo systemctl nginx restart
$ sudo systemctl nginx status

patchwork uses a cron script to clean up expired registrations and send
Patchwork uses a cron script to clean up expired registrations and send
notifications of patch changes (for projects with this enabled). Something like
this in your crontab should work.

Expand All @@ -338,7 +338,7 @@ website address (in the Sites section of the admin console, found at `/admin`).

## Incoming Email

patchwork is designed to parse incoming mails which means you need an address
Patchwork is designed to parse incoming mails which means you need an address
to receive email at. This is a problem that has been solved for many webapps,
thus there are many ways to go about this. Some of these ways are discussed
below.
Expand All @@ -347,9 +347,9 @@ below.

The most flexible option is to configure our own mail transfer agent (MTA) and
Postfix is as good a choice as any. While we don't cover setting up Postfix
here (it's complicated and there are many guides already available), patchwork
here (it's complicated and there are many guides already available), Patchwork
does include a script to take received mails and create the relevant entries
in patchwork for you. To use this, you should configure your system to forward
in Patchwork for you. To use this, you should configure your system to forward
all emails to a given localpart (the bit before the `@`) to this script. Using
the `patchwork` localpart (e.g. `[email protected]`) you can do this like
so:
Expand Down Expand Up @@ -378,7 +378,7 @@ One could also use an email account provided by a run-of-the-mill email
provider and retrieve mail using IMAP or POP3. This may be suitable for
low-volume mailing lists but be warned: this will introduce a significant lag
between when a patch is submitted to a mailing list and when it appears in
patchwork.
Patchwork.

### Use a Email-as-a-Service Provider

Expand All @@ -388,14 +388,14 @@ are a variety of web services available that offer "Email-as-as-Service".
These services typically convert received emails into HTTP POST requests to
your endpoint of choice, allowing you to sidestep configuration issues. We
don't cover this here, but a simple wrapper script coupled with one of these
services can be more than to get email into patchwork.
services can be more than to get email into Patchwork.

You can also create such as service yourself using a PaaS provider that
supports incoming mail and writing a little web app.

## (Optional) Configure your VCS to Automatically Update Patches

The `tools` directory of the patchwork distribution contains a file named
The `tools` directory of the Patchwork distribution contains a file named
`post-receive.hook` which is a sample git hook that can be used to
automatically update patches to the `Accepted` state when corresponding
commits are pushed via git.
Expand Down
Loading

0 comments on commit 8320efc

Please sign in to comment.