Merge "Document -n option on intent specification." into pi-dev