Make a lot of progress towards merging basic and full docs