From bb5058fd7fb79ff5bb1d1efa3a0d6af914610381 Mon Sep 17 00:00:00 2001
From: nfnty <git@nfnty.se>
Date: Thu, 16 Feb 2017 18:14:13 +0100
Subject: [PATCH] Update links

---
 README.rst        | 15 +++++----------
 syntax/python.vim | 16 ++++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/README.rst b/README.rst
index f9cd20d..2ea9fa9 100644
--- a/README.rst
+++ b/README.rst
@@ -11,13 +11,8 @@ Enhanced version of the original Python syntax highlighting script. Based on
 ca). Check also `python.vim page on vim.org
 <http://www.vim.org/scripts/script.php?script_id=790>`_.
 
-Please use the following channels for reporting bugs, offering suggestions or
-feedback:
-
-- python.vim issue tracker: https://github.com/hdima/python-syntax/issues
-- Email: Dmitry Vasiliev (dima at hlabs.org)
-- Send a message or follow me for updates on Twitter: `@hdima
-  <https://twitter.com/hdima>`__
+Please report bugs and feature requests to our issue tracker over at:
+https://github.com/vim-python/python-syntax/issues
 
 Features
 --------
@@ -52,13 +47,13 @@ How to install
 --------------
 
 The easiest installation method is to place `syntax/python.vim
-<https://github.com/hdima/python-syntax/blob/master/syntax/python.vim>`_ script
+<https://github.com/vim-python/python-syntax/blob/master/syntax/python.vim>`_ script
 into your ``~/.vim/syntax/`` directory.
 
 You can also use `Pathogen <https://github.com/tpope/vim-pathogen>`_ or `Vundle
 <https://github.com/gmarik/vundle>`_ plugin managers in which case you can
-install the whole `python.vim repository
-<https://github.com/hdima/python-syntax>`_ into the corresponding plugins
+install the whole `repository
+<https://github.com/vim-python/python-syntax>`_ into the corresponding plugins
 directory.
 
 Script options
diff --git a/syntax/python.vim b/syntax/python.vim
index 752ce01..07a78f9 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,8 +1,7 @@
 " Vim syntax file
 " Language:             Python
-" Current Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
-" Previous Maintainer:  Neil Schemenauer <nas at python dot ca>
-" URL:                  https://github.com/hdima/python-syntax
+" Current Maintainer:   vim-python organization on GitHub
+" URL:                  https://github.com/vim-python/python-syntax
 " Last Change:          2015-11-01
 " Filenames:            *.py
 " Version:              3.6.0
@@ -10,13 +9,8 @@
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
 "
-" Please use the following channels for reporting bugs, offering suggestions or
-" feedback:
-
-" - python.vim issue tracker: https://github.com/hdima/python-syntax/issues
-" - Email: Dmitry Vasiliev (dima at hlabs.org)
-" - Send a message or follow me for updates on Twitter: `@hdima
-"   <https://twitter.com/hdima>`__
+" Please report bugs and feature requests to our issue tracker over at:
+" https://github.com/vim-python/python-syntax/issues
 "
 " Contributors
 " ============
@@ -33,7 +27,9 @@
 "   Jeroen Ruigrok van der Werven
 "   John Eikenberry
 "   Joongi Kim
+"   lilydjwg
 "   Marc Weber
+"   Michael Doronin
 "   Pedro Algarvio
 "   Victor Salgado
 "   Will Gray