Skip to content

Commit

Permalink
Merge pull request #270 from devopsdays/bridget-migration
Browse files Browse the repository at this point in the history
Formatting
  • Loading branch information
bridgetkromhout committed May 7, 2016
2 parents 335da44 + 1b72a37 commit 65f218b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions content/events/2016-philadelphia/conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type = "event"

+++

##ANTI-HARASSMENT POLICY
## ANTI-HARASSMENT POLICY

DevOpsDays is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, sexual orientation, disability, physical appearance, body size, race, or religion. We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organizers.

Expand All @@ -23,7 +23,7 @@ Conference staff can be identified by distinct staff badges. Conference staff wi

We expect participants to adhere to the code of conduct at all conference venues and conference-related social events.

##CODE OF CONDUCT
## CODE OF CONDUCT

I. I am an attendee at devopsdays, learning from and sharing with other devopsdays attendees in an effort to better myself and my industry. I co-create the experience with fellow attendees. I am prepared to give my energy, presence and sensitivity to creating the best possible experience for myself and others.

Expand Down
4 changes: 2 additions & 2 deletions content/events/2016-philadelphia/contact.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ type = "event"

If you'd like to contact us by email: {{< email_organizers >}}

** Our local team**
**Our local team**

{{< list_organizers >}}

** The core devopsdays organizer group**
**The core devopsdays organizer group**

{{< list_core >}}
10 changes: 5 additions & 5 deletions yyyy-city.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ friendly: "yyyy-city" # Four digit year and the city name in lower-case. Don't f
status: "current" # Options are "past" or "current". Use "current" for upcoming.

# All dates are in unquoted YYYY-MM-DD, like this: variable: 2016-01-05
startdate: 2016-01-01 # The start date of your event. Leave blank if you don't have a venue reserved yet.
enddate: 2016-01-01 # The end date of your event. Leave blank if you don't have a venue reserved yet.
startdate: # The start date of your event. Leave blank if you don't have a venue reserved yet.
enddate: # The end date of your event. Leave blank if you don't have a venue reserved yet.
# Leave CFP dates blank if you don't know yet, or set all three at once.
cfp_date_start: 2016-01-01 # start accepting talk proposals.
cfp_date_end: 2016-01-01 # close your call for proposals.
cfp_date_announce: 2016-01-01 # inform proposers of status
cfp_date_start: # start accepting talk proposals.
cfp_date_end: # close your call for proposals.
cfp_date_announce: # inform proposers of status

# Location
#
Expand Down

0 comments on commit 65f218b

Please sign in to comment.