Merged from trunk 8123:8140

   Merged from trunk 8123:8140

   | 8124    | Add a note to clarify os.walk() behavior with respect to     |
   | zmedico | symlinks to directories.                                     |

   | 8125    | Sort the modes in the repoman --help output.                 |
   | zmedico |                                                              |

   | 8126    | Document the "manifest" mode.                                |
   | zmedico |                                                              |

   | 8128    | remove unused tmpfs variable                                 |
   | genone  |                                                              |

   | 8129    | Bug #195949 - Use a different diff_command sanity check when |
   | zmedico | using_editor is true.                                        |

   | 8130    | Bug #195949 - Add one more using_editor conditional for      |
   | zmedico | diff_command.                                                |

   | 8136    | Update NOTE_2 to document proper use of the using_editor     |
   | zmedico | config option.                                               |

   | 8138    | Update emacs and vim docs to reference NOTE_2.               |
   | zmedico |                                                              |

   | 8140    | Fix --help summary so that "commit" mode shows.              |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=8203