[multiboot-guide] master: use the prompt tag (31b3324)
immanetize at fedoraproject.org
immanetize at fedoraproject.org
Wed Oct 1 00:45:43 UTC 2014
Repository : http://git.fedorahosted.org/cgit/docs/multiboot-guide.git
On branch : master
>---------------------------------------------------------------
commit 31b332438d736a33ff0f316b68b4fc79d84911fb
Author: Pete Travis <immanetize at fedoraproject.org>
Date: Tue Sep 30 18:33:54 2014 -0600
use the prompt tag
>---------------------------------------------------------------
en-US/Free_Space.xml | 33 +++++++++++++++++----------------
en-US/GRUB-configuration.xml | 6 +++---
en-US/GRUB-reinstalling.xml | 8 +++-----
en-US/GRUB-runtime.xml | 4 ++--
en-US/Introduction.xml | 2 +-
5 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/en-US/Free_Space.xml b/en-US/Free_Space.xml
index 5d93658..1e7535c 100644
--- a/en-US/Free_Space.xml
+++ b/en-US/Free_Space.xml
@@ -14,15 +14,16 @@
<para>
The Fedora installer provides a guided graphical method for resizing partitions and reclaiming space. This method is simpler and easier than the others discussed in this section. For most simple dual boot situations, using the installer to reclaim space will be the most expedient and foolproof method.
</para>
+ <remark>Check this link!</remark>
<para>
- Resizing partitions with the Fedora installer is covered in the <ulink url="http://docs.fedoraproject.org/en-US/Fedora/19/html/Installation_Guide/reclaim_space-x86.html">Fedora Installation Guide</ulink>
+ Resizing partitions with the Fedora installer is covered in the <ulink url="http://docs.fedoraproject.org/en-US/Fedora/20/html/Installation_Guide/reclaim_space-x86.html">Fedora Installation Guide</ulink>
</para>
<!-- "An introduction to Disk Partitions"
http://docs.fedoraproject.org/en-US/Fedora/19/html/Installation_Guide/ch-partitions-x86.html
-->
</section>
- <section>
+ <section id="freespace-ntfs">
<title>Resizing an NTFS filesystem the command line</title>
<para>
This section explains using tools provided by Fedora to resize an NTFS partition. A terminal window from a liveCD can be used.
@@ -36,7 +37,7 @@ http://docs.fedoraproject.org/en-US/Fedora/19/html/Installation_Guide/ch-partiti
<para>
Show available filesystems:
<screen>
-# <command>blkid</command>
+ <prompt>#</prompt> <command>blkid</command>
/dev/sda1: SEC_TYPE="msdos" UUID="32AE-E651" TYPE="vfat" PARTLABEL="EFI System Partition" PARTUUID="0315942d-8c2c-414f-a560-cfa499494a72"
/dev/sda2: UUID="593153ae-2b67-4a5b-9efa-fa3954953abd" TYPE="ext4" PARTUUID="68cadad8-6de2-4ef7-96ff-f58e5114fdcc"
/dev/sda3: UUID="P2xKTQ-aQWG-z2Uv-jSw5-kkUK-SN5Q-cNf3PI" TYPE="LVM2_member" PARTUUID="7ba7ed40-b43f-4e71-b83e-51629bf7db47"
@@ -49,7 +50,7 @@ http://docs.fedoraproject.org/en-US/Fedora/19/html/Installation_Guide/ch-partiti
<para>
<systemitem class="filesystem">ntfs</systemitem> partitions indicate the existing Windows installation. Examine the partitions on the <filename>/dev/sda</filename> drive.
<screen>
-# <command>parted /dev/sda print</command>
+ <prompt>#</prompt> <command>parted /dev/sda print</command>
Model: ATA ST9320328CS (scsi)
Disk /dev/sda: 320GB
Sector size (logical/physical): 512B/512B
@@ -70,7 +71,7 @@ Number Start End Size File system Name Flags
<para>
Partition number 5 is a large filesystem, and probably has some free space to share. Check how much of that space is in use.
<screen>
-# <command>ntfsresize --info /dev/sda5</command>
+ <prompt>#</prompt> <command>ntfsresize --info /dev/sda5</command>
ntfsresize v2013.1.13 (libntfs-3g)
Device name : /dev/sda5
NTFS volume version: 3.1
@@ -91,7 +92,7 @@ Please make a test run using both the -n and -s options before real resizing!
<para>
Resize the filesystem. Make sure to balance the available space, despite the suggestion from <application>ntfsresize</application> to shrink to the bare minimum. A very full filesystem can cause problems for any operating system.
<screen>
-# <command>ntfsresize --size 40G /dev/sda5</command>
+ <prompt>#</prompt> <command>ntfsresize --size 40G /dev/sda5</command>
ntfsresize v2013.1.13 (libntfs-3g)
Device name : /dev/sda5
NTFS volume version: 3.1
@@ -136,7 +137,7 @@ can recover the partition table by TestDisk or Parted's rescue mode.
<para>
To make sure that the partition is recreated accurately, work using sectors as units instead of bytes. The first figure we need is the sector the filesystem starts on.
<screen>
-# <command>parted /dev/sda unit s print</command>
+ <prompt>#</prompt> <command>parted /dev/sda unit s print</command>
Model: ATA ST9320328CS (scsi)
Disk /dev/sda: 625142448s
Sector size (logical/physical): 512B/512B
@@ -166,7 +167,7 @@ Number Start End Size File system Name
<para>
After resizing, the filesystem is marked as <emphasis>dirty</emphasis> so it will be checked on the next Windows boot. Clear this flag so that we can run further commands.
<screen>
-# <command>ntfsfix -d /dev/sda5</command>
+ <prompt>#</prompt><command>ntfsfix -d /dev/sda5</command>
Mounting volume... OK
Processing of $MFT and $MFTMirr completed successfully.
Checking the alternate boot sector... OK
@@ -178,7 +179,7 @@ NTFS partition /dev/sda5 was processed successfully.
<listitem>
<para>Find the cluster size and number of clusters.
<screen>
-# <command>ntfsinfo -m /dev/sda5|grep Cluster</command>
+ <prompt>#</prompt> <command>ntfsinfo -m /dev/sda5|grep Cluster</command>
Cluster Size: 4096
Volume Size in Clusters: 9765624
Compression Block Clusters: 0
@@ -219,18 +220,18 @@ NTFS partition /dev/sda5 was processed successfully.
<para>
Use parted to resize the <systemitem class="filesystem">ntfs</systemitem> filesystem on <filename>/dev/sda</filename>. Using the <literal>s</literal> after the number ensures <command>parted</command> uses sectors as the unit.
<screen>
- <command># parted /dev/sda</command>
+ <prompt>#</prompt> <command>parted /dev/sda</command>
GNU Parted 3.1
Using /dev/sda
Welcome to GNU Parted! Type 'help' to view a list of commands.
-(parted)
-(parted) rm 5
-(parted) mkpart
+<prompt>(parted)</prompt>
+<prompt>(parted)</prompt> rm 5
+<prompt>(parted)</prompt> mkpart
Partition name? []? windowsdisk
File system type? [ext2]? ntfs
Start? 232384512s
End? 310509504s
-(parted) quit
+<prompt>(parted)</prompt> quit
</screen>
</para>
</step>
@@ -238,7 +239,7 @@ End? 310509504s
<para>
Check the partition table to confirm the free space is available, and exit <command>parted</command>.
<screen>
-(parted) print free
+ <prompt>(parted)</prompt> print free
Model: ATA ST9320328CS (scsi)
Disk /dev/sda: 320GB
Sector size (logical/physical): 512B/512B
@@ -254,7 +255,7 @@ Number Start End Size File system Name Flags
5 119GB 159GB 40.0GB ntfs
159GB 215GB 56.2GB Free Space
-(parted) quit
+ <prompt>(parted)</prompt> quit
</screen>
</para>
</step>
diff --git a/en-US/GRUB-configuration.xml b/en-US/GRUB-configuration.xml
index 386f57b..34d606f 100644
--- a/en-US/GRUB-configuration.xml
+++ b/en-US/GRUB-configuration.xml
@@ -58,7 +58,7 @@
<para>
With root permissions, open the file <filename>/etc/default/grub</filename>.
<screen>
- <command>nano /etc/default/grub</command>
+ <prompt>#</prompt> <command>nano /etc/default/grub</command>
<computeroutput>
GRUB_TIMEOUT=0
GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)"
@@ -96,7 +96,7 @@
<para>
For BIOS systems:
<screen>
- <command>grub2-mkconfig -o /boot/grub/grub2.cfg</command>
+ <prompt>#</prompt> <command>grub2-mkconfig -o /boot/grub/grub2.cfg</command>
</screen>
</para>
</step>
@@ -104,7 +104,7 @@
<para>
For UEFI systems:
<screen>
- <command>grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg</command>
+ <prompt>#</prompt> <command>grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg</command>
</screen>
</para>
</step>
diff --git a/en-US/GRUB-reinstalling.xml b/en-US/GRUB-reinstalling.xml
index 7f599c0..0a82071 100644
--- a/en-US/GRUB-reinstalling.xml
+++ b/en-US/GRUB-reinstalling.xml
@@ -21,7 +21,7 @@
</member>
</simplelist>
</para>
- <section id="GRUB-reinstalling-mkconfig">
+ <section id="GRUB-mkconfig">
<title>Refreshing GRUB configuration</title>
<para>
To recreate the GRUB configuration from a booted system, use the <command>grub2-mkconfig</command> utility. The program will scan your system and create menu entries for what it finds. You should also use <command>grub2-mkconfig</command> after customizing menu entries, a process described in <xref linkend="GRUB-configuration" />
@@ -29,15 +29,13 @@
<para>
Refresh GRUB configuration on a BIOS system:
<screen>
- <command>grub2-mkconfig -o /boot/grub2/grub.cfg</command>
+ <prompt>#</prompt> <command>grub2-mkconfig -o /boot/grub2/grub.cfg</command>
</screen>
</para>
<para>
Refresh GRUB configuration on UEFI systems:
<screen>
- <command>
- grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
- </command>
+ <prompt>#</prompt><command>grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg</command>
</screen>
</para>
</section>
diff --git a/en-US/GRUB-runtime.xml b/en-US/GRUB-runtime.xml
index 22689c9..d28854f 100644
--- a/en-US/GRUB-runtime.xml
+++ b/en-US/GRUB-runtime.xml
@@ -21,9 +21,9 @@
One of the default menu entries for Fedora is a <literal>rescue</literal> entry. This will load the same Fedora environment as the other entries, but loads a full <systemitem class="filesystem">initramfs</systemitem>.
</para>
<para>
- The rescue option is useful if you have problems after adding new hardware. You can use the rescue option to regenerate the <systemitem class="filesystem">initramfs</systemitem> for all boot entries using this command, executed with root privileges:
+ The rescue option is useful if you have problems after adding new hardware. You can use the rescue option to regenerate the <systemitem class="filesystem">initramfs</systemitem> for all boot entries using this command:
<screen>
- <command>dracut --regenerate-all --force</command>
+ <prompt>#</prompt> <command>dracut --regenerate-all --force</command>
</screen>
</para>
</note>
diff --git a/en-US/Introduction.xml b/en-US/Introduction.xml
index b937bab..383c249 100644
--- a/en-US/Introduction.xml
+++ b/en-US/Introduction.xml
@@ -48,7 +48,7 @@
</screen>
</para>
<para>
- The <literal>root prompt</literal> is always a hash ( # ) and a normal user prompt is always a dollar sign ( $ ).
+ The <literal>root prompt</literal> is always a hash ( # ) and a normal user prompt is always a dollar sign ( $ ). Example commands in this guide will include one of these prompts to show the privileges required for the action.
</para>
<para>
<emphasis>To keep your system healthy and safe, do not execute user applications as root or log into a desktop environment as root.
More information about the docs-commits
mailing list