Merge remote-tracking branch 'origin/master'

PDAL · Aug 30, 2016 · f72c7bf · f72c7bf
2 parents 0173b1f + 00fa031
commit f72c7bf
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 19 deletions.
diff --git a/doc/apps/pipeline.rst b/doc/apps/pipeline.rst
@@ -13,21 +13,25 @@ The ``pipeline`` command is used to execute :ref:`pipeline` JSON. See
 
 ::
 
-    --input [-i] arg  Non-positional argument to specify input file name.
-    --pipeline-serialization arg
-                      Write input pipeline along with all metadata and created by the
-                      pipeline to the specified file.
-    --validate        Validate the pipeline (including serialization), but do not execute
-                      writing of points
+    --developer-debug         Enable developer debug (don't trap exceptions)
+    --label                   A string to label the process with
+    --driver                  Override reader driver
+    --input, -i               input file name
+    --pipeline-serialization  Output file for pipeline serialization
+    --validate                Validate the pipeline (including serialization), but do not write
+                              points
+    --progress                Name of file or FIFO to which stages should write progress
+                              information. The file/FIFO must exist. PDAL will not create the progress file.
+    --stdin, -s               Read pipeline from standard input
 
 .. note::
 
-    The ``pipeline`` command can accept option substitutions, but they
-    do not replace existing options that are specified in the input JSON
-    pipeline.  For example, to set the output and input LAS files for a
-    pipeline that does a translation, construct JSON that does not contain
-    ``filename`` for reader and writer and issue the command with the
-    following arguments:
+    The ``pipeline`` command can accept option substitutions, and they replace
+    existing options that are specified in the input JSON pipeline.  If
+    multiple stages of the same name exist in the pipeline, `all` stages would
+    be overridden. For example, to set the output and input LAS files for a
+    pipeline that does a translation, the ``filename`` for the reader and the
+    writer can be overridden:
 
     ::
 

diff --git a/doc/download.rst b/doc/download.rst
@@ -29,6 +29,7 @@ Past Releases
 * **2015-11-25** `PDAL-1.1.0-src.tar.gz`_ `Release Notes`_
 
 
+.. _`PDAL-1.2.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.2.0-src.tar.gz
 .. _`PDAL-1.1.0-src.tar.gz`: http://download.osgeo.org/pdal/PDAL-1.1.0-src.tar.gz
 
 

diff --git a/doc/index.rst b/doc/index.rst
@@ -46,6 +46,22 @@ Download
 
    download
 
+Quickstart
+--------------------------------------------------------------------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   quickstart
+
+Applications
+--------------------------------------------------------------------------------
+
+.. toctree::
+   :maxdepth: 2
+
+   apps/index
+
 Community
 --------------------------------------------------------------------------------
 
@@ -54,19 +70,25 @@ Community
 
    community
 
-Usage
+Drivers
 --------------------------------------------------------------------------------
 
 .. toctree::
    :maxdepth: 2
    :glob:
 
-   apps/index
-   quickstart
+   pipeline
    stages/readers
    stages/writers
    stages/filters
-   pipeline
+
+Tutorials
+--------------------------------------------------------------------------------
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
    tutorial/index
 
 Workshop

diff --git a/doc/stages/readers.qfit.rst b/doc/stages/readers.qfit.rst
@@ -1,7 +1,8 @@
 .. _readers.qfit:
 
+******************************************************************************
 readers.qfit
-============
+******************************************************************************
 
 The **QFIT reader** read from files in the `QFIT format`_ originated for the
 Airborne Topographic Mapper (ATM) project at NASA Goddard Space Flight Center.

diff --git a/doc/stages/readers.rst b/doc/stages/readers.rst
@@ -3,8 +3,8 @@
 Readers
 =======
 
-Readers provide data to :ref:`pipeline` operations. Readers might be a simple
-file type, like :ref:`readers.las`, a complex database like :ref:`readers.oci`, or
+Readers are data providers to :ref:`pipeline` operations. A reader might provide a simple
+file type, like :ref:`readers.text`, a complex database like :ref:`readers.oci`, or
 a network service like :ref:`readers.greyhound`.
 
 .. note::