Edits to team, adtos and tos md files

hasweb/pages/about/contact.md

@@ -4,7 +4,7 @@ We try to be as accessible as possible.
 
 For general enquiries, email us at [[email protected]](mailto:[email protected]). For priority support requests, use [[email protected]]([email protected]). Prefer social media? We’re [@hasgeek](https://twitter.com/hasgeek) on Twitter and [Facebook](https://www.facebook.com/HasGeek).
 
-You can also call us at [+91 7676 33 2020](tel:+917676332020). This goes straight to the mobile numbers of all team members. If all of us are unable to take a call (or you hang up before we answer), we’ll call you back as soon as we can.
+You can also call us at [+91-80-6768-4422](tel:+918067684422). This goes straight to the mobile numbers of all team members. If all of us are unable to take a call (or you hang up before we answer), we’ll call you back as soon as we can.
 
 We are unfortunately unable to take appointments for any product or service you’d like to pitch us, so please don’t call or email about that.
 

hasweb/pages/about/index.md

@@ -2,20 +2,28 @@ title: About HasGeek
 
 HasGeek creates discussion spaces for geeks.
 
-We made
-[DocType HTML5](http://www.doctypehtml5.in/),
-[AndroidCamp](https://androidcamp.hasgeek.com/),
-[Scaling PHP in the Cloud](https://phpcloud.hasgeek.com/),
-[JSFoo](https://jsfoo.in/),
-[Droidcon India](https://droidcon.in/),
-the [Cartonama Workshop](https://workshop.cartonama.com/),
-[Meta Refresh](https://metarefresh.in/) and
-[Rootconf](https://rootconf.in/).
-We host an [IRC channel](irc://irc.freenode.net/#hasgeek)
-and a [job board](https://jobs.hasgeek.com/).
-We publish [our code](https://github.com/hasgeek).
-We are on [Twitter](https://twitter.com/hasgeek) and [Facebook](https://www.facebook.com/HasGeek).
-We occasionally host a [Geekup](https://geekup.in/) with visitors to our office in Bangalore.
-We conduct [hacknights](https://hacknight.in/) alongside our events. Come to our events to meet like-minded people, learn new things, and discover new opportunities.
+Previously, we've ran editions of:
+
+* [DocType HTML5](http://www.doctypehtml5.in/),
+* [AndroidCamp](https://androidcamp.hasgeek.com/),
+* [Scaling PHP in the Cloud](https://phpcloud.hasgeek.com/),
+* the [Cartonama Workshop](https://workshop.cartonama.com/),
+* [Geekup](https://geekup.in/)
+* [hacknights](https://hacknight.in/)
+
+We currently run editions of:
+
+* [Rootconf](https://rootconf.in/).
+* [Meta Refresh](https://metarefresh.in/) and
+* [JSFoo](https://jsfoo.in/),
+* [Droidcon India](https://droidcon.in/),
 
 [See what else is coming up in the Funnel](https://funnel.hasgeek.com). [Sign up to be notified when we do an event](http://eepurl.com/duGmH).
+Come to our events to meet like-minded people, learn new things, and discover new opportunities!
+
+We also: 
+* Run a job board, [Hasjob](https://hasjob.co).
+* Publish [our code](https://github.com/hasgeek).
+
+Talk to us! we are [on Slack](http://friendsofhasgeek.slack.com), send yourself an invite at [friends.hasgeek.com](http://friends.hasgeek.com)
+We are on [Twitter](https://twitter.com/hasgeek) and [Facebook](https://www.facebook.com/HasGeek).

hasweb/pages/about/team.md

@@ -1 +1,10 @@
 title: HasGeek team
+
+Hari C M [@haricm](http://twitter.com/haricm)
+Jyothsna Madabusi 
+Karthik Balakrishnan [@karthikb351](https://twitter.com/karthikb351)
+Kiran Jonnalagadda [@jackerhack](https://twitter.com/jackerhack)
+Sindhu Sundar [@sindhu](http://twitter.com/sindhu)
+Shreyas Satish [@shreyas_satish](https://twitter.com/shreyas_satish)
+Vidya Ramakrishnan [@vidya_ramki](https://twitter.com/vidya_ramki)
+Zainab Bawa [@zainabbawa](https://twitter.com/zainabbawa)

hasweb/pages/site/adtos.md

@@ -4,6 +4,6 @@ title: Sponsorship Terms of Service
 
 I understand that my advertisement is subject to full specifications and artwork provided by me at least 72 hours before the scheduled start of such advertisement.
 
-I understand that my interactions with participants is my responsibility, and will not solicit for an illegitimate work opportunities and will not use sexist, racist or misogynist language on advertising collateral. I further assert that I am solely responsible for the content of my listing.
+I understand that my interactions with participants is my responsibility, and will not solicit for illegitimate work opportunities and will not use sexist, racist or misogynist language on advertising collateral. I further assert that I am solely responsible for the content of my listing.
 
 HasGeek may revise these terms of service or discontinue the service without prior notice at any time. If the advertising order is made and involved a payment, a credit note will be issued.

hasweb/pages/site/privacy.md → hasweb/pages/site/hjprivacy.md

@@ -1,10 +1,10 @@
-title: Privacy Policy
+## Privacy Policy
 
-This privacy policy sets out how HasGeek Media LLP (henceforth “HasGeek”, “us” or “we”) uses and protects any information that you give HasGeek when you use this website. HasGeek is committed to ensuring that your privacy is protected. Should we ask you to provide certain information by which you can be identified when using this website, then you can be assured that it will only be used in accordance with this privacy statement. HasGeek may change this policy from time to time by updating this page. You should check this page from time to time to ensure that you are happy with any changes. This policy is effective from June 1, 2012.
+This privacy policy sets out how HasGeek Learning Pvt. Ltd., (henceforth “HasGeek”, “us” or “we”) uses and protects any information that you give HasGeek when you use this website (henceforth “Hasjob“, “job board“, “services“). HasGeek is committed to ensuring that your privacy is protected. Should we ask you to provide certain information by which you can be identified when using this website, then you can be assured that it will only be used in accordance with this privacy statement. HasGeek may change this policy from time to time by updating this page. You should check this page from time to time to ensure that you are happy with any changes. This policy is effective from June 1, 2012.
 
 ## What we collect
 
-We may collect the following information:
+The information we collect from you are explicitly mentioned when you use the job board. It includes the following (but is not limited to):
 
 * Name, employer name and job title
 * Contact information including email addresses and phone numbers
@@ -13,13 +13,15 @@ We may collect the following information:
 
 ## What do we do with your information?
 
-We require the following information to understand your needs and serve you better:
+We collect information from you for the following purposes:
 
 * Internal record keeping.
 * We may use the information to improve our products and services.
 * We may periodically send promotional emails about new products, special offers or other information which we think you may find interesting using the email address you have provided.
 * From time to time, we may also use your information to contact you for market research purposes. We may contact you by email, phone or mail. We may use the information to customise the website according to your interests.
 
+We will not sell, distribute or lease your personal information to third parties unless we have your permission or are required by law to do so. We may use your personal information to send you promotional information about third parties which we think you may find interesting if you tell us that you wish this to happen.
+
 ## Security
 
 We are committed to ensuring that your information is secure. In order to prevent unauthorised access or disclosure we have put in place suitable physical, electronic and managerial procedures to safeguard and secure the information we collect online.
@@ -34,6 +36,13 @@ Overall, cookies help us provide you with a better website, by enabling us to mo
 
 You can choose to accept or decline cookies. Most web browsers automatically accept cookies, but you can usually modify your browser setting to decline cookies if you prefer. This may prevent you from taking full advantage of the website as several aspects of it require cookies to function normally.
 
+## Third party services we use
+
+We use analytics tools and other third party technologies, such as Google Analytics, to collect non-personal information in the form of various usage and user metrics when you use our services. These tools and technologies collect and analyze certain types of information, including cookies, IP addresses, device and software identifiers, referring and exit URLs, onsite behavior and usage information, feature use metrics and statistics, usage and purchase history, MAC Address, mobile unique device ID, and other similar information.
+
+The third party analytics companies who collect information on our services and other online products and/or services may combine the information collected with other information they have independently collected from other websites and/or other online or mobile products and services relating to your activities across their network of websites as well as online and/or mobile products and services. Many of these companies collect and use information under their own privacy policies.
+you may opt out of Google Analytics by visiting the Google Analytics opt-out page.
+
 ## Links to other websites
 
 Our website may contain links to other websites of interest. However, once you have used these links to leave our site, you should note that we do not have any control over that other website. Therefore, we cannot be responsible for the protection and privacy of any information which you provide whilst visiting such sites and such sites are not governed by this privacy statement. You should exercise caution and look at the privacy statement applicable to the website in question.
@@ -46,14 +55,12 @@ You may choose to restrict the collection or use of your personal information in
 
 * If you have previously agreed to us using your personal information for direct marketing purposes, you may change your mind at any time by writing to or emailing us at <[email protected]>.
 
-We will not sell, distribute or lease your personal information to third parties unless we have your permission or are required by law to do so. We may use your personal information to send you promotional information about third parties which we think you may find interesting if you tell us that you wish this to happen.
-
 ## Contacting us
 
 If there are any questions regarding this privacy policy you may contact us at:
 
 HasGeek Media LLP  
 No. 2699, 5th cross,
-19th main, Kodihalli
+19th main, Indiranagar
 Bangalore - 560008
-Email: <info@hasgeek.com>
+Email: <support@hasgeek.com>

hasweb/pages/site/hjtos.md

@@ -0,0 +1,48 @@
+title: Terms of Service
+
+Welcome to our website. If you continue to browse and use this website you are agreeing to comply with and be bound by the following terms and conditions of use, which together with our privacy policy govern HasGeek Media LLP’s relationship with you in relation to our website, events, services and products except to the extent they are overriden by special terms that we announce with respect to the respective service, website, event or product.
+
+The term “HasGeek Media LLP” or “us” or “we” refers to the owner of the website whose registered office is No 141/142, 2nd Cross, Pai Layout, Hulimavu Gate, Bannerghatta Road, Bangalore - 560 076, Karnataka, India. Our registration number is AAA-3107 and we are incorporated under the Limited Liability Partnership Act 2008 of India. 
+
+## Website, services and third party dealings 
+
+Scenario 1: We take great care to produce outstanding code, render services and/or products. But there is a great chance the code will have bugs, products will not work exactly as you expect and there is the small chance you may be unhappy with our services. 
+
+Scenario 2: Through your use of our websites, attendance at our events or use of our services, with or without our intervention or facilitation, you may engage with other individuals or companies, including, for instance, advertisers or prospective employers. Your dealings with them are your business entirely. 
+
+Scenario 3: HasGeek makes available information interfaces that expose content and functionality from HasGeek’s websites, to third party developers. If an interface is likely to expose information contributed by you, we will take your consent before enabling it. We will have rules governing the use of the API by such developers/companies/third party websites, but we cannot be held responsible for their use of the interface in a manner that is inappropriate or violates an applicable law.
+
+None of the above scenarios can be grounds to sue us in a court of law. In legal speak, this service is provided on an AS IS, WHERE IS basis. No warranties, no liability. Except of course, if the law otherwise provides.
+
+HASGEEK SHALL NOT BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND IN CONNECTION WITH THIS AGREEMENT, EVEN IF HASGEEK HAS BEEN INFORMED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
+
+## Job board Terms
+
+You agree to these terms when you post a job on our job board:
+
+* I understand that listings are valid for 30 days only, or
+* I understand the listing will be removed if:
+	* It is a position that involves adult content, or
+	* It is a illegal work opportunity, or
+	* Job information is factually incorrect, misleading, incomplete and or or inaccurate of what is being offered or advertised, or
+	* Is posted by an intermediary instead of the actual organization where the position is, or
+	* Multiple jobs are listed in one listing (four positions available, etc), or
+	* Uses sexist, racist or misogynist language
+* I further assert that I am solely responsible for the content of my listing.
+
+
+## Job board interface behaviour
+
+Listings are valid for 30 days only. They will be shown on the home page in reverse chronological order, with the most recent first. Editing a listing will not move it back to the top. Listings are automatically removed from the home page after 30 days but will continue to appear at the permanent link unless manually withdrawn or removed by a moderator as per the conditions specified above.
+
+## Breach
+
+If you violate these terms, HasGeek may discontinue providing you one or more or all services/products and/or refuse to provide you with access to the HasGeek Websites. In addition,, we still reserve the right to recover any amounts due and owing by you to HasGeek and to take strict legal action including but not limited to a referral to the appropriate police or other authorities for initiating criminal or other proceedings against you.
+
+## Indemnity
+
+You shall indemnify and hold harmless HasGeek, its owners (and partners as applicable), licensee, affiliates, subsidiaries, group companies (as applicable) and their respective officers, directors, agents, and employees, from any claim or demand, or actions including reasonable attorneys' fees, made by any third party or penalty imposed due to or arising out of your breach of this Terms of Use, privacy Policy and other Policies, or your violation of any law, rules or regulations or the rights of a third party.
+
+## Governing Law
+
+We are incorporated in India. All dealings with you are governed by, interpreted and construed in accordance with the laws of India. If we have a dispute and any party wishes to initiate legal proceedings in a court of law, the courts at Bangalore shall have exclusive jurisdiction.

hasweb/pages/site/index.md

@@ -5,7 +5,7 @@ Please see:
 1. [Terms of Service](tos)
 2. [Disclaimer](disclaimer)
 3. [Acceptable Use Guidelines](terms)
-4. [Privacy Policy](privacy)
-5. [Job Board Terms of Service](jbtos)
-6. [Sponsorship Terms of Service](adtos)
-7. [Cancellation & Refund Policy](refunds)
+4. [Cancellation & Refund Policy](refunds)
+5. [Privacy Policy](privacy)
+6. [Job Board Terms of Service](https://hasjob.co/tos)
+7. [Sponsorship Terms of Service](adtos)