diff --git a/docs/using-dev-environment.md b/docs/using-dev-environment.md index 0c3d6a06d2..a4beedf1a4 100644 --- a/docs/using-dev-environment.md +++ b/docs/using-dev-environment.md @@ -28,7 +28,7 @@ changes take effect. The Handlebars frontend HTML templates `tools/compile-handlebars-templates` job, which runs as part of `tools/run-dev.py`. -* If you change Python code used by the the main Django/Tornado server +* If you change Python code used by the main Django/Tornado server processes, these services are run on top of Django's [manage.py runserver][django-runserver] which will automatically restart the Zulip Django and Tornado servers whenever you save changes to Python diff --git a/puppet/stdlib/spec/functions/ensure_resource_spec.rb b/puppet/stdlib/spec/functions/ensure_resource_spec.rb index 2e8aefc52d..7e45cea767 100644 --- a/puppet/stdlib/spec/functions/ensure_resource_spec.rb +++ b/puppet/stdlib/spec/functions/ensure_resource_spec.rb @@ -12,7 +12,7 @@ describe 'ensure_resource' do let :pre_condition do 'user { "dan": }' end - it "should contain the the ensured resources" do + it "should contain the ensured resources" do subject.should run.with_params('user', 'dan', {}) compiler.catalog.resource('User[dan]').to_s.should == 'User[dan]' end diff --git a/static/js/compose.js b/static/js/compose.js index b09c3ed8e0..6ae1bbc270 100644 --- a/static/js/compose.js +++ b/static/js/compose.js @@ -634,7 +634,7 @@ exports.respond_to_message = function (opts) { var pm_recipient = message.reply_to; if (opts.reply_type === "personal" && message.type === "private") { // reply_to for private messages is everyone involved, so for - // personals replies we need to set the the private message + // personals replies we need to set the private message // recipient to just the sender pm_recipient = message.sender_email; } diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html index 052aca1b34..328dcd92bd 100644 --- a/templates/zerver/integrations.html +++ b/templates/zerver/integrations.html @@ -617,7 +617,7 @@

In the next screen, provide the details. First, click Add Actions to display the rule actions. Select "Trigger an App Action" in the dropdown, and - then the name of the custom action you created earlier when the the second + then the name of the custom action you created earlier when the second dropdown appears. You can add additional "All" or "Any" conditions if desired. Also select when the rule should run (if not "Anytime") and enable it.