Changeset View
Changeset View
Standalone View
Standalone View
head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
| Show First 20 Lines • Show All 1,698 Lines • ▼ Show 20 Lines | &prompt.root; <userinput>make installworld</userinput></screen> | ||||
| prompt. If the user chooses to skip a file, it will be | prompt. If the user chooses to skip a file, it will be | ||||
| presented again after all other files have been dealt | presented again after all other files have been dealt | ||||
| with.</para> | with.</para> | ||||
| <para>Choosing to install the unmodified temporary file will | <para>Choosing to install the unmodified temporary file will | ||||
| replace the current file with the new one. For most | replace the current file with the new one. For most | ||||
| unmodified files, this is the best option.</para> | unmodified files, this is the best option.</para> | ||||
| <para>Choosing to merge the file will present a text editor, and | <para>Choosing to merge the file will present a text editor with | ||||
| the contents of both files. The files can be merged by | the contents of both files open. The files can be merged by | ||||
| reviewing both files side by side on the screen, and choosing | reviewing both files side by side on the screen and choosing | ||||
| parts from both to create a finished product. When the files | parts from both to create a finished product. When the files | ||||
| are compared side by side, <keycap>l</keycap> selects the left | are compared side by side, <keycap>l</keycap> selects the left | ||||
| contents and <keycap>r</keycap> selects contents from the | contents and <keycap>r</keycap> selects contents from the | ||||
| right. The final output will be a file consisting of both | right. The final output will be a file consisting of both | ||||
| parts, which can then be installed. This option is | parts, which can then be installed. This option is | ||||
| customarily used for files where settings have been modified | customarily used for files where settings have been modified | ||||
| by the user.</para> | by the user.</para> | ||||
| ▲ Show 20 Lines • Show All 488 Lines • Show Last 20 Lines | |||||