Merge 8bcf78e into 7f22d7d

docs/Makefile

@@ -94,9 +94,9 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/proj4.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/proj.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/proj4.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/proj.qhc"
 
 .PHONY: applehelp
 applehelp:
@@ -113,8 +113,8 @@ devhelp:
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/proj4"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/proj4"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/proj"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/proj"
 	@echo "# devhelp"
 
 .PHONY: epub

docs/source/conf.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# PROJ.4 documentation build configuration file, created by
+# PROJ documentation build configuration file, created by
 # sphinx-quickstart on Wed Feb 24 10:47:15 2016.
 #
 # This file is execfile()d with the current directory set to its
@@ -48,10 +48,11 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'PROJ.4'
+project = u'PROJ'
+title = 'PROJ coordinate transformation software library'
+author = 'PROJ contributors'
 now = datetime.datetime.now()
 copyright = u'1983-{0}'.format(now.year)
-author = u'Gerald Evenden, Frank Warmerdam, and others'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -211,12 +212,15 @@
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'proj4doc'
+htmlhelp_basename = 'projdoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
 
 preamble = r"""
+\ifdefined\DeclareUnicodeCharacter
+  \DeclareUnicodeCharacter{2032}{$'$}% prime
+\fi
 """
 
 latex_elements = {
@@ -228,7 +232,7 @@
 
 # Additional stuff for the LaTeX preamble.
 'preamble': preamble,
-'inputenc':'\usepackage[utf8x]{inputenc}'
+'inputenc':'\usepackage[utf8]{inputenc}'
 
 # Latex figure (float) alignment
 #'figure_align': 'htbp',
@@ -238,8 +242,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'proj4.tex', u'PROJ.4 Documentation',
-     u'Gerald Evenden', 'manual'),
+    (master_doc, 'proj.tex', title, author, 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -315,8 +318,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'proj4', u'PROJ.4 Documentation',
-     author, 'proj4', 'One line description of project.',
+    (master_doc, 'proj', title, author, 'proj',
+     'Cartographic projections software library.',
      'Miscellaneous'),
 ]
 

docs/source/geodesic.rst

@@ -10,8 +10,8 @@ Geodesic calculations
 Introduction
 ------------
 
-Consider a ellipsoid of revolution with equatorial radius :math:`a`, polar
-semi-axis :math:`b`, and flattening :math:`f=(a−b)/a`.  Points on
+Consider an ellipsoid of revolution with equatorial radius :math:`a`, polar
+semi-axis :math:`b`, and flattening :math:`f=(a-b)/a`.  Points on
 the surface of the ellipsoid are characterized by their latitude :math:`\phi`
 and longitude :math:`\lambda`.  (Note that latitude here means the
 *geographical latitude*, the angle between the normal to the ellipsoid

docs/source/index.rst

@@ -9,24 +9,27 @@ and latitude coordinates into cartesian coordinates (and vice versa), and it is
 a C API for software developers to include coordinate transformation in their
 own software. PROJ is maintained on `GitHub <http://github.com/OSGeo/proj.4/>`_.
 
+.. only:: html
 
-=============  ================================================================
- Platform                Test Status and Coverage
-=============  ================================================================
-Travis         |travis|
-AppVeyor       |appveyor|
-Coverage       |coverals|
-=============  ================================================================
-
-.. |travis| image:: https://travis-ci.org/OSGeo/proj.4.svg?branch=master
-                    :target:  https://travis-ci.org/OSGeo/proj.4
-.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/584j49uguwoo5evi?svg=true
-                    :target: https://ci.appveyor.com/project/OSGeo/proj-4
-.. |coverals| image:: https://coveralls.io/repos/OSGeo/proj.4/badge.svg?branch=master
-                    :target: https://coveralls.io/r/OSGeo/proj.4?branch=master
-
-Full documentation is available as a single PDF at
-https://raw.githubusercontent.com/OSGeo/proj.4/gh-pages/proj4.pdf
+   =============  ================================================================
+    Platform                Test Status and Coverage
+   =============  ================================================================
+   Travis         |travis|
+   AppVeyor       |appveyor|
+   Coverage       |coverals|
+   =============  ================================================================
+
+   .. |travis| image:: https://travis-ci.org/OSGeo/proj.4.svg?branch=master
+                       :target:  https://travis-ci.org/OSGeo/proj.4
+   .. |appveyor| image:: https://ci.appveyor.com/api/projects/status/584j49uguwoo5evi?svg=true
+                       :target: https://ci.appveyor.com/project/OSGeo/proj-4
+   .. |coverals| image:: https://coveralls.io/repos/OSGeo/proj.4/badge.svg?branch=master
+                       :target: https://coveralls.io/r/OSGeo/proj.4?branch=master
+
+.. only:: not latex
+
+   Full documentation is available as a single PDF at
+   https://raw.githubusercontent.com/OSGeo/proj.4/gh-pages/proj.pdf
 
 Documentation
 =================

docs/source/operations/projections/nsper.rst

@@ -18,7 +18,7 @@ The near-sided perspective projection simulates a view from a height
 +---------------------+-------------------------------------------------------------+
 | `+h`                | Height of the view point above the Earth and must be in     |
 |                     | the same units as the radius of the sphere. Required.       |
-+---------------------+-------------------------------------------------------------|
++---------------------+-------------------------------------------------------------+
 | `+lat_0`            | Latitude (in degrees) of the view position. Defaults to 0.  |
 +---------------------+-------------------------------------------------------------+
 | `+lon_0`            | Longitude (in degrees) of the view position. Defaults to 0. |