Main rename (#55)

README

@@ -2,12 +2,12 @@
 iiif
 ====
 
-.. image:: https://travis-ci.org/zimeon/iiif.png?branch=master
-  :target: https://travis-ci.org/zimeon/iiif?branch=master
+.. image:: https://travis-ci.org/zimeon/iiif.png?branch=main
+  :target: https://travis-ci.org/zimeon/iiif?branch=main
   :alt: Build status
 
-.. image:: https://coveralls.io/repos/zimeon/iiif/badge.png?branch=master
-  :target: https://coveralls.io/r/zimeon/iiif?branch=master
+.. image:: https://coveralls.io/repos/zimeon/iiif/badge.png?branch=main
+  :target: https://coveralls.io/r/zimeon/iiif?branch=main
   :alt: Test coverage
 
 *iiif* - IIIF Image API reference implementation and Python library.
@@ -79,12 +79,23 @@ appropriate places within your python setup using::
 The source code is maintained on `Github
 <https://github.com/zimeon/iiif>`_
 
+Contributing
+------------
+
+Bug reports welcome as `github issues
+<https://github.com/zimeon/iiif/issues>`_.
+
+See `CONTRIBUTING.md
+<https://github.com/zimeon/iiif/blob/main/CONTRIBUTING.md>`_
+for guidelines for contributing, and the `list of contributors
+<https://github.com/zimeon/iiif/graphs/contributors>`_
+
 See also
 --------
 
 - https://github.com/zimeon/iiif -- git repository
-- https://github.com/zimeon/iiif/tree/master/demo-static -- Static File Demo with OpenSeadragon
-- https://github.com/zimeon/iiif/tree/master/demo-auth -- IIIF Authentication API Demo
+- https://github.com/zimeon/iiif/tree/main/demo-static -- Static File Demo with OpenSeadragon
+- https://github.com/zimeon/iiif/tree/main/demo-auth -- IIIF Authentication API Demo
 
 Copyright and License
 ---------------------

demo-auth/index.html

@@ -9,7 +9,7 @@ <h1>IIIF Authentication API Demo</h1>
 
 <h2>Test links running entirely on local machine</h2>
 
-<p>These tests expect the image server on port 8001, see <a href="https://github.com/zimeon/iiif/tree/master/demo-auth">https://github.com/zimeon/iiif/tree/master/demo-auth</a>.</p>
+<p>These tests expect the image server on port 8001, see <a href="https://github.com/zimeon/iiif/tree/main/demo-auth">https://github.com/zimeon/iiif/tree/main/demo-auth</a>.</p>
 
 <ul>
 <li><a href="local_osd_pil_gauth.html">Server run locally on port 8001 using PIL & Google auth</a></li>

pypi_upload.md

@@ -4,16 +4,16 @@ Updating iiif on pypi
 
   Notes to remind @zimeon...
 
-    * master copy of code is https://github.com/zimeon/iiif
-    * on PyPi iiif is at <https://pypi.org/project/iiif>
+    * Code is https://github.com/zimeon/iiif
+    * On PyPi iiif is at <https://pypi.org/project/iiif>
 
 Putting up a new version
 ------------------------
 
     0. Check version number working branch in `iiif/_version.py`
     1. Check all tests good (`python setup.py test; ./run_validate.sh -n`)
-    2. Check code is up-to-date with master github version
-    3. Check out master and merge in working branch
+    2. Check code is up-to-date with main github version
+    3. Check out `main` and merge in working branch
     4. Check all tests good (`python setup.py test; ./run_validate.sh -n`)
     5. Check branches are as expected (`git branch -a`)
     6. Check local build and version reported OK (`python setup.py build; python setup.py install`)
@@ -27,10 +27,9 @@ Putting up a new version
       git push --tags
 
       pip install --upgrade setuptools wheel twine
-      python setup.py sdist bdist_wheel
-      ls dist
-      twine upload dist/*
+      python setup.py sdist bdist_wheel; ls dist
+      twine upload dist/*1.X.X*
       ```
 
     9. Check on PyPI at <https://pypi.org/project/iiif>
-    10. Finally, back on `develop branch start new version number by editing `iiif/_version.py` and `CHANGES.md`
+    10. Finally, back on `develop` branch start new version number by editing `iiif/_version.py` and `CHANGES.md`